Skip to content

Commit bd3d5cf

Browse files
authored
Advanced Clowning Module (space-wizards#35797)
* pAIs can now accept keys, but can't talk in said channels * added dummy module * added adv clown module alongside projector * holopeel & projector sprite added, it's destroyable too * added experimental pie cannon * exp pie thrower throws pies, added tool icon, added bananium horn * removed the weird pAI changes, my bad! * okay NOW the pAI stuff is all gone * added icon, recipe, renamed tech for unlocking * removed bananium horn * Added in-hand sprites, credited to TiniestShark. Changed holopeel projector description to let the user know it recharges over time.
1 parent 577c10d commit bd3d5cf

File tree

17 files changed

+248
-2
lines changed

17 files changed

+248
-2
lines changed

Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,27 @@
5252
disableEject: true
5353
swap: false
5454

55+
- type: entity
56+
parent: Holoprojector
57+
id: HoloprojectorClownBorg
58+
name: holopeel projector
59+
description: A holopeel projector that creates a slippery, hard light banana peel. It recharges, so that the fun never ends!
60+
suffix: borg
61+
components:
62+
- type: HolosignProjector
63+
signProto: HoloPeel
64+
chargeUse: 240
65+
- type: Sprite
66+
sprite: Objects/Devices/Holoprojectors/peel.rsi
67+
state: icon
68+
- type: ItemSlots
69+
slots:
70+
cell_slot:
71+
name: power-cell-slot-component-slot-name-default
72+
startingItem: PowerCellMicroreactor
73+
disableEject: true
74+
swap: false
75+
5576
- type: entity
5677
parent: Holoprojector
5778
id: HolofanProjector
@@ -89,7 +110,7 @@
89110
parent: HolofanProjector
90111
id: HolofanProjectorBorg
91112
name: integrated holofan
92-
description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it recharges over time.
113+
description: Stops idiots from causing more crew harm during atmospheric emergencies. Installed directly into an engineering cyborg, it recharges over time.
93114
components:
94115
- type: ItemSlots
95116
slots:

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,26 @@
899899
- type: BorgModuleIcon
900900
icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
901901

902+
- type: entity
903+
id: BorgModuleAdvancedClowning
904+
parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
905+
name: advanced clowning cyborg module
906+
description: Advanced service module for only the silliest cyborgs! Comes with a built-in oven that bakes pies automatically over time, a holopeel projector, and a push horn.
907+
components:
908+
- type: Sprite
909+
layers:
910+
- state: service
911+
- state: icon-clown-adv
912+
- type: ItemBorgModule
913+
items:
914+
- HoloprojectorClownBorg
915+
- BorgLauncherCreamPie
916+
- ClownRecorder
917+
- PushHorn
918+
- BikeHornInstrument
919+
- type: BorgModuleIcon
920+
icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-clowning-module }
921+
902922
#syndicate modules
903923
- type: entity
904924
id: BorgModuleSyndicateWeapon

Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,40 @@
103103
containers:
104104
storagebase: !type:Container
105105
ents: []
106+
107+
- type: entity
108+
name: experimental pie cannon
109+
parent: BaseWeaponBattery
110+
id: BorgLauncherCreamPie
111+
description: Deliver a generous portion of cream directly to the crew! Automatically bakes pies over time.
112+
components:
113+
- type: Sprite
114+
sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
115+
layers:
116+
- state: piecannon
117+
- type: Gun
118+
fireRate: 2
119+
selectedMode: SemiAuto
120+
availableModes:
121+
- SemiAuto
122+
- FullAuto
123+
soundGunshot:
124+
path: /Audio/Effects/thunk.ogg
125+
soundEmpty:
126+
path: /Audio/Items/hiss.ogg
127+
clumsyProof: true
128+
- type: ProjectileBatteryAmmoProvider
129+
proto: FoodPieBananaCream
130+
fireCost: 30
131+
- type: Battery
132+
maxCharge: 90
133+
startingCharge: 90
134+
- type: BatterySelfRecharger
135+
autoRecharge: true
136+
autoRechargeRate: 1
137+
- type: AmmoCounter
138+
- type: Item
139+
size: Normal
106140

107141
- type: entity
108142
name: syringe gun

Resources/Prototypes/Entities/Structures/Holographic/projections.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,44 @@
4646
- type: Airtight
4747
noAirWhenFullyAirBlocked: false
4848

49+
- type: entity
50+
id: HoloPeel
51+
parent: HolosignWetFloor
52+
name: holopeel
53+
description: A banana peel made of slippery hard light, watch your step!
54+
components:
55+
- type: Sprite
56+
sprite: Structures/Holo/peel.rsi
57+
state: icon
58+
- type: Physics
59+
bodyType: Static
60+
canCollide: true
61+
- type: Slippery
62+
- type: StepTrigger
63+
intersectRatio: 0.2
64+
- type: CollisionWake
65+
enabled: false
66+
- type: Fixtures
67+
fixtures:
68+
slips:
69+
shape:
70+
!type:PhysShapeAabb
71+
bounds: "-0.2,-0.2,0.2,0.2"
72+
hard: false
73+
layer:
74+
- SlipLayer
75+
- type: TimedDespawn
76+
lifetime: 30
77+
- type: Clickable
78+
- type: Destructible
79+
thresholds:
80+
- trigger:
81+
!type:DamageTrigger
82+
damage: 10
83+
behaviors:
84+
- !type:DoActsBehavior
85+
acts: [ "Destruction" ]
86+
4987
- type: entity
5088
id: HolosignSecurity
5189
parent: HolosignWetFloor

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
recipes:
3838
- BorgModuleAdvancedCleaning
3939
- BorgModuleAdvancedTool
40+
- BorgModuleAdvancedClowning
4041
- BorgModuleAdvancedChemical
4142
- BorgModuleAdvancedMining
4243

Resources/Prototypes/Recipes/Lathes/robot_modules.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,13 @@
6868
# Science Modules
6969

7070
# Service Modules
71+
72+
- type: latheRecipe
73+
parent: BaseGoldBorgModuleRecipe
74+
id: BorgModuleAdvancedClowning
75+
result: BorgModuleAdvancedClowning
76+
materials:
77+
Steel: 500
78+
Glass: 500
79+
Plastic: 250
80+
Bananium: 375

Resources/Prototypes/Research/civilianservices.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
cost: 4000
200200
recipeUnlocks:
201201
- PushHorn
202+
- BorgModuleAdvancedClowning
202203

203204
# Tier 3
204205

815 Bytes
Loading

Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 1,
33
"license": "CC-BY-SA-3.0",
4-
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github)",
4+
"copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/cdbcb1e858b11f083994a7a269ed67ef5b452ce9, Module actions by Scarky0. chem, adv-chem, and adv-mining by mubururu_, xenoborg actions by Samuka-C (github), advclown by ThatGuyUSA",
55
"size": {
66
"x": 32,
77
"y": 32
@@ -97,6 +97,9 @@
9797
{
9898
"name":"clowning-module"
9999
},
100+
{
101+
"name":"adv-clowning-module"
102+
},
100103
{
101104
"name":"syndicate-weapon-module"
102105
},
652 Bytes
Loading

0 commit comments

Comments
 (0)