Skip to content

Commit 2b20f1f

Browse files
Borg Module Party! (funky-station#157)
* module * modules! * Update robotics.yml * Update uplink_catalog.yml * fix * comment * updaet * longer recharge
1 parent aae85d9 commit 2b20f1f

20 files changed

Lines changed: 311 additions & 5 deletions

File tree

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
borg-slot-paperwork-empty = Paperwork
2+
borg-slot-foam-grenade-empty = Foam Grenade

Resources/Locale/en-US/_Funkystation/store/uplink-catalog.ftl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Utility
2+
uplink-syndicate-hacking-module-name = Hacker Cyborg Module
3+
uplink-syndicate-hacking-module-desc = For when you need a borg commander for your borg squad.
4+
15
# Weapons
26
uplink-pistol-wyvern-name = Wyvern
37
uplink-pistol-wyvern-desc = A heavy pistol sold in few numbers to both NT and the Syndicate, chambered in .50 AE. Comes loaded with uranium rounds.
@@ -13,4 +17,4 @@ uplink-rifle-magazine-50-name = rifle magazine (.50 AE)
1317
uplink-rifle-magazine-50-desc = .50 AE magazine compatible with the estoc.
1418
1519
uplink-rifle-magazine-50-incendiary-name = rifle magazine (.50 AE Incendiary)
16-
uplink-rifle-magazine-50-incendiary-desc = .50 AE magazine compatible with the estoc. Burn them all down.
20+
uplink-rifle-magazine-50-incendiary-desc = .50 AE magazine compatible with the estoc. Burn them all down.

Resources/Prototypes/Entities/Objects/Fun/crayons.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
color: Red
110110
selectableColor: true
111111
- type: AutoRecharge
112-
rechargeDuration: 5
112+
rechargeDuration: 2 #Funky
113113

114114
# monocolor crayons
115115

Resources/Prototypes/Entities/Objects/Weapons/Throwable/scattering_grenades.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,6 @@
180180
sound:
181181
path: "/Audio/Weapons/Guns/Gunshots/batrifle.ogg"
182182
positional: true
183+
- type: Tag
184+
tags:
185+
- FoamGrenade #Funky

Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
- BorgModuleFireExtinguisher
1515
- BorgModuleInflatable
1616
- BorgModuleArtistry
17+
- BorgModulePaperwork #Funky
18+
- BorgModuleMedicalBasic #Funky
19+
- BorgModuleChemicalBasic #Funky
1720

1821
- type: latheRecipePack
1922
id: BorgLimbsStatic
@@ -40,6 +43,7 @@
4043
- BorgModuleAdvancedClowning
4144
- BorgModuleAdvancedTopical
4245
- BorgModuleAdvancedMining
46+
- BorgModuleAnomalyAdvanced #Funky
4347

4448
- type: latheRecipePack
4549
id: MechParts

Resources/Prototypes/Research/experimental.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
- WeaponPistolCHIMP
105105
- AnomalySynchronizerCircuitboard
106106
- AnomalyVesselExperimentalCircuitboard
107+
- BorgModuleAnomalyAdvanced #Funky
107108
technologyPrerequisites:
108109
- BasicAnomalousResearch
109110

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
- type: entity
2+
parent: [ BaseItem, BaseToyGun ]
3+
id: FoamCrossbowBorg
4+
name: bluespace foam crossbow
5+
description: Contains a bluespace ammunition generation device for maximum foam-induced destruction.
6+
components:
7+
- type: Sprite
8+
sprite: Objects/Fun/Foam/foam_crossbow.rsi
9+
state: icon
10+
- type: Item
11+
size: Normal
12+
sprite: Objects/Fun/Foam/foam_crossbow.rsi
13+
- type: Gun
14+
fireRate: 0.5
15+
selectedMode: SemiAuto
16+
availableModes:
17+
- SemiAuto
18+
soundGunshot:
19+
path: /Audio/Weapons/Guns/Gunshots/energycrossbow_shoot.ogg
20+
- type: BasicEntityAmmoProvider
21+
proto: BulletFoam
22+
capacity: 5
23+
count: 5
24+
- type: PacifismAllowedGun
25+
- type: AmmoCounter
26+
- type: RechargeBasicEntityAmmo
27+
rechargeCooldown: 3
Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
- type: entity
2+
id: BorgModulePaperwork
3+
parent: [ BaseBorgModule, BaseProviderBorgModule ]
4+
name: paperwork cyborg module
5+
description: A module that comes with all that is needed to handle, file, write and stamp paperwork.
6+
components:
7+
- type: Sprite
8+
layers:
9+
- state: generic
10+
- state: icon-paperwork
11+
- type: ItemBorgModule
12+
hands:
13+
- item: Pen
14+
- item: BoxFolderClipboardThreePapers
15+
- item: Paper
16+
hand:
17+
emptyLabel: borg-slot-paperwork-empty
18+
emptyRepresentative: Paper
19+
whitelist:
20+
tags:
21+
- Document
22+
- Paper
23+
- item: RubberStampApproved
24+
- item: RubberStampDenied
25+
- item: HandLabeler
26+
- type: BorgModuleIcon
27+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: paperwork-module }
28+
29+
- type: entity
30+
parent: [ BaseBorgModule, BaseProviderBorgModule, BaseSyndicateContraband ]
31+
id: BorgModuleSyndicateHacking
32+
name: hacker cyborg module
33+
description: A module that comes with an emag, for all your hacking needs.
34+
components:
35+
- type: Sprite
36+
layers:
37+
- state: syndicate
38+
- state: icon-syndicate
39+
- type: ItemBorgModule
40+
hands:
41+
- item: Emag
42+
- type: BorgModuleIcon
43+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
44+
45+
- type: entity
46+
id: BorgModuleAnomalyAdvanced
47+
parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
48+
name: advanced anomaly cyborg module
49+
components:
50+
- type: Sprite
51+
layers:
52+
- state: science
53+
- state: icon-anomalies-advanced
54+
- type: ItemBorgModule
55+
hands:
56+
- item: AnomalyScanner
57+
- item: AnomalyLocatorUnpowered
58+
- item: AnomalyLocatorWideUnpowered
59+
- item: WeaponPistolCHIMPCyborg
60+
- hand:
61+
emptyRepresentative: SheetRGlass
62+
emptyLabel: borg-slot-construction-empty
63+
whitelist:
64+
tags:
65+
- ConstructionMaterial
66+
- hand:
67+
emptyRepresentative: SheetRPGlass
68+
emptyLabel: borg-slot-construction-empty
69+
whitelist:
70+
tags:
71+
- ConstructionMaterial
72+
- item: Wrench
73+
- type: BorgModuleIcon
74+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-anomaly-module }
75+
76+
- type: entity
77+
id: BorgModuleMedicalBasic
78+
parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
79+
name: basic topicals cyborg module
80+
description: A generic borg module that allows for basic healing. Only fits on generic borgs.
81+
components:
82+
- type: Sprite
83+
layers:
84+
- state: generic
85+
- state: icon-treatment
86+
- type: ItemBorgModule
87+
hands:
88+
- item: Gauze
89+
hand:
90+
emptyLabel: borg-slot-topicals-empty
91+
emptyRepresentative: Gauze
92+
whitelist:
93+
components:
94+
- Healing
95+
- item: Brutepack
96+
hand:
97+
emptyLabel: borg-slot-topicals-empty
98+
emptyRepresentative: Brutepack
99+
whitelist:
100+
components:
101+
- Healing
102+
- item: Ointment
103+
hand:
104+
emptyLabel: borg-slot-topicals-empty
105+
emptyRepresentative: Ointment
106+
whitelist:
107+
components:
108+
- Healing
109+
- type: BorgModuleIcon
110+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
111+
112+
- type: entity
113+
id: BorgModuleChemicalBasic
114+
parent: [ BaseBorgModuleScience, BaseProviderBorgModule ]
115+
name: basic chemicals cyborg module
116+
description: A generic borg module that allows for basic liquid handling. Only fits on generic borgs.
117+
components:
118+
- type: Sprite
119+
layers:
120+
- state: generic
121+
- state: icon-chemist
122+
- type: ItemBorgModule
123+
hands:
124+
- item: Dropper
125+
- item: Beaker
126+
hand:
127+
emptyLabel: borg-slot-chemical-containers-empty
128+
emptyRepresentative: Beaker
129+
whitelist:
130+
components:
131+
- FitsInDispenser
132+
tags:
133+
- ChemDispensable
134+
- type: BorgModuleIcon
135+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: chem-module }
136+
137+
- type: entity
138+
id: BorgModuleFoam
139+
suffix: do not map
140+
parent: [ BaseBorgModule, BaseProviderBorgModule ]
141+
name: foam warrior cyborg module
142+
description: For NT's strongest cyber warriors.
143+
components:
144+
- type: Sprite
145+
layers:
146+
- state: generic
147+
- state: icon-foam
148+
- type: ItemBorgModule
149+
hands:
150+
- item: ToySword
151+
- item: FoamCrossbowBorg
152+
- item: GrenadeFoamDart
153+
hand:
154+
emptyLabel: borg-slot-foam-grenade-empty
155+
emptyRepresentative: GrenadeFoamDart
156+
whitelist:
157+
tags:
158+
- FoamGrenade
159+
160+
- type: BorgModuleIcon
161+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: foam-module }
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
- type: entity
2+
name: cyborg C.H.I.M.P. handcannon
3+
parent: [BaseWeaponBatterySmall, BaseScienceContraband]
4+
id: WeaponPistolCHIMPCyborg
5+
description: Just because it's a little C.H.I.M.P. doesn't mean it can't punch like an A.P.E. Comes with a self-recharging battery!
6+
components:
7+
- type: Sprite
8+
sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
9+
layers:
10+
- state: base
11+
map: ["enum.GunVisualLayers.Base"]
12+
- state: mag-unshaded-1
13+
visible: false
14+
map: ["enum.GunVisualLayers.MagUnshaded"]
15+
shader: unshaded
16+
- type: Item
17+
storedOffset: 0,-6
18+
- type: Appearance
19+
- type: MagazineVisuals
20+
magState: mag
21+
steps: 3
22+
zeroVisible: false
23+
- type: Clothing
24+
sprite: Objects/Weapons/Guns/Revolvers/chimp.rsi
25+
- type: Gun
26+
projectileSpeed: 10
27+
fireRate: 1.5
28+
soundGunshot:
29+
path: /Audio/Weapons/Guns/Gunshots/taser2.ogg
30+
- type: BatteryAmmoProvider
31+
proto: AnomalousParticleDeltaStrong
32+
fireCost: 100
33+
- type: BatteryWeaponFireModes
34+
fireModes:
35+
- proto: AnomalousParticleDeltaStrong
36+
fireCost: 100
37+
- proto: AnomalousParticleEpsilonStrong
38+
fireCost: 100
39+
- proto: AnomalousParticleZetaStrong
40+
fireCost: 100
41+
- proto: AnomalousParticleSigmaStrong
42+
fireCost: 100
43+
- type: BatterySelfRecharger
44+
autoRechargeRate: 10
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
- type: latheRecipe
2+
parent: BaseBorgModuleRecipe
3+
id: BorgModulePaperwork
4+
result: BorgModulePaperwork
5+
6+
- type: latheRecipe
7+
parent: BaseGoldBorgModuleRecipe
8+
id: BorgModuleAnomalyAdvanced
9+
result: BorgModuleAnomalyAdvanced
10+
11+
- type: latheRecipe
12+
parent: BaseBorgModuleRecipe
13+
id: BorgModuleMedicalBasic
14+
result: BorgModuleMedicalBasic
15+
16+
- type: latheRecipe
17+
parent: BaseBorgModuleRecipe
18+
id: BorgModuleChemicalBasic
19+
result: BorgModuleChemicalBasic
20+
21+
- type: latheRecipe
22+
parent: BaseBorgModuleRecipe
23+
id: BorgModuleFoam
24+
result: BorgModuleFoam

0 commit comments

Comments
 (0)