Advanced Clowning Module (#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.
This commit is contained in:
@@ -52,6 +52,27 @@
|
|||||||
disableEject: true
|
disableEject: true
|
||||||
swap: false
|
swap: false
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: Holoprojector
|
||||||
|
id: HoloprojectorClownBorg
|
||||||
|
name: holopeel projector
|
||||||
|
description: A holopeel projector that creates a slippery, hard light banana peel. It recharges, so that the fun never ends!
|
||||||
|
suffix: borg
|
||||||
|
components:
|
||||||
|
- type: HolosignProjector
|
||||||
|
signProto: HoloPeel
|
||||||
|
chargeUse: 240
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Objects/Devices/Holoprojectors/peel.rsi
|
||||||
|
state: icon
|
||||||
|
- type: ItemSlots
|
||||||
|
slots:
|
||||||
|
cell_slot:
|
||||||
|
name: power-cell-slot-component-slot-name-default
|
||||||
|
startingItem: PowerCellMicroreactor
|
||||||
|
disableEject: true
|
||||||
|
swap: false
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: Holoprojector
|
parent: Holoprojector
|
||||||
id: HolofanProjector
|
id: HolofanProjector
|
||||||
|
|||||||
@@ -899,6 +899,26 @@
|
|||||||
- type: BorgModuleIcon
|
- type: BorgModuleIcon
|
||||||
icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
|
icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: BorgModuleAdvancedClowning
|
||||||
|
parent: [ BaseBorgModuleService, BaseProviderBorgModule ]
|
||||||
|
name: advanced clowning cyborg module
|
||||||
|
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.
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
layers:
|
||||||
|
- state: service
|
||||||
|
- state: icon-clown-adv
|
||||||
|
- type: ItemBorgModule
|
||||||
|
items:
|
||||||
|
- HoloprojectorClownBorg
|
||||||
|
- BorgLauncherCreamPie
|
||||||
|
- ClownRecorder
|
||||||
|
- PushHorn
|
||||||
|
- BikeHornInstrument
|
||||||
|
- type: BorgModuleIcon
|
||||||
|
icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-clowning-module }
|
||||||
|
|
||||||
#syndicate modules
|
#syndicate modules
|
||||||
- type: entity
|
- type: entity
|
||||||
id: BorgModuleSyndicateWeapon
|
id: BorgModuleSyndicateWeapon
|
||||||
|
|||||||
@@ -104,6 +104,40 @@
|
|||||||
storagebase: !type:Container
|
storagebase: !type:Container
|
||||||
ents: []
|
ents: []
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
name: experimental pie cannon
|
||||||
|
parent: BaseWeaponBattery
|
||||||
|
id: BorgLauncherCreamPie
|
||||||
|
description: Deliver a generous portion of cream directly to the crew! Automatically bakes pies over time.
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Objects/Weapons/Guns/Cannons/pie_cannon.rsi
|
||||||
|
layers:
|
||||||
|
- state: piecannon
|
||||||
|
- type: Gun
|
||||||
|
fireRate: 2
|
||||||
|
selectedMode: SemiAuto
|
||||||
|
availableModes:
|
||||||
|
- SemiAuto
|
||||||
|
- FullAuto
|
||||||
|
soundGunshot:
|
||||||
|
path: /Audio/Effects/thunk.ogg
|
||||||
|
soundEmpty:
|
||||||
|
path: /Audio/Items/hiss.ogg
|
||||||
|
clumsyProof: true
|
||||||
|
- type: ProjectileBatteryAmmoProvider
|
||||||
|
proto: FoodPieBananaCream
|
||||||
|
fireCost: 30
|
||||||
|
- type: Battery
|
||||||
|
maxCharge: 90
|
||||||
|
startingCharge: 90
|
||||||
|
- type: BatterySelfRecharger
|
||||||
|
autoRecharge: true
|
||||||
|
autoRechargeRate: 1
|
||||||
|
- type: AmmoCounter
|
||||||
|
- type: Item
|
||||||
|
size: Normal
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: syringe gun
|
name: syringe gun
|
||||||
parent: BaseStorageItem
|
parent: BaseStorageItem
|
||||||
|
|||||||
@@ -46,6 +46,44 @@
|
|||||||
- type: Airtight
|
- type: Airtight
|
||||||
noAirWhenFullyAirBlocked: false
|
noAirWhenFullyAirBlocked: false
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: HoloPeel
|
||||||
|
parent: HolosignWetFloor
|
||||||
|
name: holopeel
|
||||||
|
description: A banana peel made of slippery hard light, watch your step!
|
||||||
|
components:
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Structures/Holo/peel.rsi
|
||||||
|
state: icon
|
||||||
|
- type: Physics
|
||||||
|
bodyType: Static
|
||||||
|
canCollide: true
|
||||||
|
- type: Slippery
|
||||||
|
- type: StepTrigger
|
||||||
|
intersectRatio: 0.2
|
||||||
|
- type: CollisionWake
|
||||||
|
enabled: false
|
||||||
|
- type: Fixtures
|
||||||
|
fixtures:
|
||||||
|
slips:
|
||||||
|
shape:
|
||||||
|
!type:PhysShapeAabb
|
||||||
|
bounds: "-0.2,-0.2,0.2,0.2"
|
||||||
|
hard: false
|
||||||
|
layer:
|
||||||
|
- SlipLayer
|
||||||
|
- type: TimedDespawn
|
||||||
|
lifetime: 30
|
||||||
|
- type: Clickable
|
||||||
|
- type: Destructible
|
||||||
|
thresholds:
|
||||||
|
- trigger:
|
||||||
|
!type:DamageTrigger
|
||||||
|
damage: 10
|
||||||
|
behaviors:
|
||||||
|
- !type:DoActsBehavior
|
||||||
|
acts: [ "Destruction" ]
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: HolosignSecurity
|
id: HolosignSecurity
|
||||||
parent: HolosignWetFloor
|
parent: HolosignWetFloor
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
recipes:
|
recipes:
|
||||||
- BorgModuleAdvancedCleaning
|
- BorgModuleAdvancedCleaning
|
||||||
- BorgModuleAdvancedTool
|
- BorgModuleAdvancedTool
|
||||||
|
- BorgModuleAdvancedClowning
|
||||||
- BorgModuleAdvancedChemical
|
- BorgModuleAdvancedChemical
|
||||||
- BorgModuleAdvancedMining
|
- BorgModuleAdvancedMining
|
||||||
|
|
||||||
|
|||||||
@@ -68,3 +68,13 @@
|
|||||||
# Science Modules
|
# Science Modules
|
||||||
|
|
||||||
# Service Modules
|
# Service Modules
|
||||||
|
|
||||||
|
- type: latheRecipe
|
||||||
|
parent: BaseGoldBorgModuleRecipe
|
||||||
|
id: BorgModuleAdvancedClowning
|
||||||
|
result: BorgModuleAdvancedClowning
|
||||||
|
materials:
|
||||||
|
Steel: 500
|
||||||
|
Glass: 500
|
||||||
|
Plastic: 250
|
||||||
|
Bananium: 375
|
||||||
|
|||||||
@@ -199,6 +199,7 @@
|
|||||||
cost: 4000
|
cost: 4000
|
||||||
recipeUnlocks:
|
recipeUnlocks:
|
||||||
- PushHorn
|
- PushHorn
|
||||||
|
- BorgModuleAdvancedClowning
|
||||||
|
|
||||||
# Tier 3
|
# Tier 3
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 815 B |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 1,
|
"version": 1,
|
||||||
"license": "CC-BY-SA-3.0",
|
"license": "CC-BY-SA-3.0",
|
||||||
"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)",
|
"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",
|
||||||
"size": {
|
"size": {
|
||||||
"x": 32,
|
"x": 32,
|
||||||
"y": 32
|
"y": 32
|
||||||
@@ -97,6 +97,9 @@
|
|||||||
{
|
{
|
||||||
"name":"clowning-module"
|
"name":"clowning-module"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name":"adv-clowning-module"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name":"syndicate-weapon-module"
|
"name":"syndicate-weapon-module"
|
||||||
},
|
},
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 652 B |
Binary file not shown.
|
After Width: | Height: | Size: 813 B |
Binary file not shown.
|
After Width: | Height: | Size: 821 B |
@@ -0,0 +1,82 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f4017da82ae4de7bfaf8ebdbba33d0de81c15587, and resprited by ThatGuyUSA (github). Inhands by TiniestShark (github)",
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon",
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-left",
|
||||||
|
"directions": 4,
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "inhand-right",
|
||||||
|
"directions": 4,
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
],
|
||||||
|
[
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3,
|
||||||
|
0.3
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 474 B |
@@ -37,6 +37,9 @@
|
|||||||
{
|
{
|
||||||
"name": "icon-clown"
|
"name": "icon-clown"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "icon-clown-adv"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "icon-construction"
|
"name": "icon-construction"
|
||||||
},
|
},
|
||||||
|
|||||||
BIN
Resources/Textures/Structures/Holo/peel.rsi/icon.png
Normal file
BIN
Resources/Textures/Structures/Holo/peel.rsi/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
33
Resources/Textures/Structures/Holo/peel.rsi/meta.json
Normal file
33
Resources/Textures/Structures/Holo/peel.rsi/meta.json
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Made by thatguyusa (discord) / ThatGuyUSA (github) for SS14",
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon",
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2,
|
||||||
|
0.2
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user