juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

Browse Source 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
Ed
2025-04-30 20:31:50 +03:00
parent 0c8735f6df 0e586e3fae
commit ef6d973301
2053 changed files with 113995 additions and 38376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Entities/Clothing/Back/duffel.yml
View File

@@ -182,7 +182,6 @@
- type: entity
parent: ClothingBackpackDuffelSyndicate
id: ClothingBackpackDuffelSyndicateAmmo
name: syndicate duffel bag
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
@@ -203,7 +202,6 @@
- type: entity
parent: ClothingBackpackDuffelSyndicate
id: ClothingBackpackDuffelSyndicateMedical
name: syndicate duffel bag
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi

133
Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml
View File

@@ -28,22 +28,23 @@
- !type:NestedSelector
tableId: RandomSatchelTable6
#number after each group indicates potential max inventory fill. If all combined fills are too high, it could result in an over-filled bag/error.
- type: entityTable
id: RandomSatchelTable1
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelGenericTable
tableId: RandomSatchelGenericTableSmallx2 #2x small
- !type:NestedSelector
tableId: RandomSatchelFunnyTable
tableId: RandomSatchelFunnyTable #5x tiny
- !type:NestedSelector
tableId: RandomSatchelClothingTable
tableId: RandomSatchelClothingTable #1x small
- !type:NestedSelector
tableId: RandomSatchelCannabisTable
tableId: RandomSatchelCannabisTable #5x tiny
- !type:NestedSelector
tableId: RandomSatchelGizmosTable
tableId: RandomSatchelGizmosTable #2x small
- !type:NestedSelector
tableId: RandomSatchelChemsTable
tableId: RandomSatchelChemsTable #5x tiny
- type: entityTable
id: RandomSatchelFunnyTable
@@ -63,7 +64,7 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
- type: entityTable #5x tiny
id: RandomSatchelCannabisTable
table: !type:GroupSelector
children:
@@ -82,7 +83,7 @@
amount: !type:RangeNumberSelector
range: 1, 15
- type: entityTable
- type: entityTable #2x small
id: RandomSatchelGizmosTable
table: !type:GroupSelector
children:
@@ -99,7 +100,7 @@
range: 1, 2
- id: ProximitySensor
- type: entityTable
- type: entityTable #5x tiny
id: RandomSatchelChemsTable
table: !type:GroupSelector
children:
@@ -134,17 +135,17 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelTobaccoTable
tableId: RandomSatchelTobaccoTable #2x 2x3(12 slots)
- !type:NestedSelector
tableId: RandomSatchelPartyTable
tableId: RandomSatchelPartyTable #5x small
- !type:NestedSelector
tableId: RandomSatchelClothingTable
tableId: RandomSatchelClothingTable #1x small
- !type:NestedSelector
tableId: RandomSatchelPayloadTable
tableId: RandomSatchelPayloadTable #2x small
- !type:NestedSelector
tableId: RandomSatchelCircuitboardsTable
tableId: RandomSatchelCircuitboardsTable #1x small
- type: entityTable
- type: entityTable #2x 2x3(12 slots)
id: RandomSatchelTobaccoTable
table: !type:GroupSelector
children:
@@ -157,14 +158,10 @@
- id: CigCartonGreen
- id: CigCartonBlack
- id: CigarCase
amount: !type:RangeNumberSelector
range: 1, 2
- id: CigarGoldCase
weight: 0.25
amount: !type:RangeNumberSelector
range: 1, 2
- type: entityTable
- type: entityTable #5x small
id: RandomSatchelPartyTable
table: !type:GroupSelector
children:
@@ -186,7 +183,7 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelClothingTable
table: !type:GroupSelector
children:
@@ -200,7 +197,7 @@
- id: ClothingHandsGlovesCombat
- id: ClothingNeckScarfStripedSyndieRed
- type: entityTable
- type: entityTable #2x small
id: RandomSatchelPayloadTable
table: !type:GroupSelector
children:
@@ -216,7 +213,7 @@
amount: !type:RangeNumberSelector
range: 1, 2
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelCircuitboardsTable
table: !type:GroupSelector
children:
@@ -245,19 +242,19 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelPresentsOrToysTable
tableId: RandomSatchelPresentsOrToysTable #3x small
- !type:NestedSelector
tableId: RandomSatchelCashTable
tableId: RandomSatchelCashTable #1x small
- !type:NestedSelector
tableId: RandomSatchelWeaponTable
tableId: RandomSatchelWeaponTable #5x small
- !type:NestedSelector
tableId: RandomSatchelBurgerTable
tableId: RandomSatchelBurgerTable #5x small
- !type:NestedSelector
tableId: RandomSatchelGenericTable
tableId: RandomSatchelGenericTableSmall #1x small
- !type:NestedSelector
tableId: RandomSatchelKeysTable
tableId: RandomSatchelKeysTable #1x small
- type: entityTable
- type: entityTable #3x small
id: RandomSatchelPresentsOrToysTable
table: !type:GroupSelector
children:
@@ -271,7 +268,7 @@
- id: ToyFigurineQueen
- id: ToyFigurineRatKing
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelCashTable
table: !type:GroupSelector
children:
@@ -301,7 +298,7 @@
amount: !type:RangeNumberSelector
range: 1, 10
- type: entityTable
- type: entityTable #5x small
id: RandomSatchelWeaponTable
table: !type:GroupSelector
children:
@@ -312,7 +309,7 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
- type: entityTable #5x small
id: RandomSatchelBurgerTable
table: !type:GroupSelector
children:
@@ -331,8 +328,8 @@
amount: !type:RangeNumberSelector
range: 1, 5
- type: entityTable
id: RandomSatchelGenericTable
- type: entityTable #1x small
id: RandomSatchelGenericTableSmall
table: !type:GroupSelector
children:
- id: SpaceCash100
@@ -342,6 +339,13 @@
- id: WeaponFlareGun
- id: ModularReceiver
- id: RifleStock
- type: entityTable #2x small
id: RandomSatchelGenericTableSmallx2
table: !type:GroupSelector
children:
- id: SpaceCash100
weight: 15
- id: DrinkSpaceGlue
amount: !type:RangeNumberSelector
range: 1, 2
@@ -352,7 +356,7 @@
amount: !type:RangeNumberSelector
range: 1, 2
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelKeysTable
table: !type:GroupSelector
children:
@@ -377,17 +381,17 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelMaterialsTable
tableId: RandomSatchelMaterialsTable #1x medium
- !type:NestedSelector
tableId: RandomSatchelImplantersTable
tableId: RandomSatchelImplantersTable #1x small
- !type:NestedSelector
tableId: RandomSatchelCellsTable
tableId: RandomSatchelCellsTable #1x small
- !type:NestedSelector
tableId: RandomSatchelSyndicateTable
tableId: RandomSatchelSyndicateTable #1x medium
- !type:NestedSelector
tableId: RandomSatchelToolsTable
tableId: RandomSatchelToolsTable #1x small
- type: entityTable
- type: entityTable #1x medium
id: RandomSatchelMaterialsTable
table: !type:GroupSelector
children:
@@ -424,7 +428,7 @@
weight: 2
- id: SheetUranium
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelImplantersTable
table: !type:GroupSelector
children:
@@ -434,7 +438,7 @@
- id: BikeHornImplanter
- id: SadTromboneImplanter
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelCellsTable
table: !type:GroupSelector
children:
@@ -444,7 +448,7 @@
- id: PowerCellMicroreactor
- id: PowerCellHigh
- type: entityTable
- type: entityTable #1x medium
id: RandomSatchelSyndicateTable
table: !type:GroupSelector
children:
@@ -459,8 +463,9 @@
- id: RadioJammer
- id: SoapSyndie
- id: SingularityToy
- id: DehydratedSpaceCarp
- type: entityTable
- type: entityTable #1x small
id: RandomSatchelToolsTable
table: !type:GroupSelector
children:
@@ -477,15 +482,15 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelAlcoholTable
tableId: RandomSatchelAlcoholTable #2x medium
- !type:NestedSelector
tableId: RandomSatchelInstrumentTable
tableId: RandomSatchelInstrumentTable #1x Medium
- !type:NestedSelector
tableId: RandomSatchelMedsTable
tableId: RandomSatchelMedsTable #5x tiny
- !type:NestedSelector
tableId: RandomSatchelMysteriesTable
tableId: RandomSatchelMysteriesTable #1x Medium
- type: entityTable
- type: entityTable #2x medium
id: RandomSatchelAlcoholTable
table: !type:GroupSelector
children:
@@ -493,18 +498,18 @@
weight: 5
- id: DrinkCognacBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- id: DrinkGildlagerBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- id: DrinkPatronBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- id: DrinkRumBottleFull
amount: !type:RangeNumberSelector
range: 1, 4
range: 1, 2
- type: entityTable
- type: entityTable #1x Medium
id: RandomSatchelInstrumentTable
table: !type:GroupSelector
children:
@@ -517,7 +522,7 @@
- id: RockGuitarInstrument
- id: BassGuitarInstrument
- type: entityTable
- type: entityTable #5x tiny
id: RandomSatchelMedsTable
table: !type:GroupSelector
children:
@@ -552,7 +557,7 @@
- id: Stimpack
- id: CombatMedipen
- type: entityTable
- type: entityTable #1x Medium
id: RandomSatchelMysteriesTable
table: !type:GroupSelector
children:
@@ -597,13 +602,13 @@
table: !type:AllSelector
children:
- !type:NestedSelector
tableId: RandomSatchelGearTable
tableId: RandomSatchelGearTable #1x Huge
- !type:NestedSelector
tableId: RandomSatchelGadgetsTable
tableId: RandomSatchelGadgetsTable #2x small
- !type:NestedSelector
tableId: CubeTable
tableId: CubeTable #10x tiny
- type: entityTable
- type: entityTable #1x Huge
id: RandomSatchelGearTable
table: !type:GroupSelector
children:
@@ -615,7 +620,7 @@
- id: HandheldStationMap
- id: PinpointerStation
- type: entityTable
- type: entityTable #2x small
id: RandomSatchelGadgetsTable
table: !type:GroupSelector
children:
@@ -633,7 +638,7 @@
- id: ChameleonProjector
weight: 0.25
- type: entityTable
- type: entityTable #10x tiny
id: CubeTable
table: !type:GroupSelector
children:

3
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -481,6 +481,7 @@
- MagazineMagnum
- CombatKnife
- Truncheon
- HandGrenade
components:
- Stunbaton
- FlashOnTrigger
@@ -656,7 +657,7 @@
- type: Clothing
sprite: Clothing/Belt/militarywebbing.rsi
- type: ExplosionResistance
damageCoefficient: 0.5
damageCoefficient: 0.1
- type: entity
parent: ClothingBeltMilitaryWebbing

17
Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
View File

@@ -283,8 +283,23 @@
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyFreelance
- EncryptionKeyFreelance
- type: Sprite
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: entity
parent: [ClothingHeadset, BaseMagicalContraband]
id: ClothingHeadsetWizard
name: wizard headset
description: A headset used by the dreaded space wizards.
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyStationMaster
- type: Sprite
sprite: Clothing/Ears/Headsets/wizard.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/wizard.rsi

17
Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
View File

@@ -155,3 +155,20 @@
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/freelance.rsi
- type: entity
parent: [ClothingHeadsetAlt, BaseMagicalContraband]
id: ClothingHeadsetAltWizard
name: wizard's over-ear headset
components:
- type: Headset
- type: EncryptionKeyHolder
keySlots: 5
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyStationMaster
- type: Sprite
sprite: Clothing/Ears/Headsets/wizard.rsi
- type: Clothing
sprite: Clothing/Ears/Headsets/wizard.rsi

4
Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
View File

@@ -210,8 +210,8 @@
- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband]
id: ClothingEyesHudSyndicateAgent
name: syndicate agent visor
description: The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status.
name: syndicate medical visor
description: The Syndicate Corpsman's professional heads-up display, designed for quick diagnosis of their team's status.
components:
- type: Sprite
sprite: Clothing/Eyes/Hud/syndagent.rsi

5
Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
View File

@@ -249,6 +249,11 @@
- type: TemperatureProtection
heatingCoefficient: 1.05
coolingCoefficient: 0.7
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.90
- type: Armor # so zombification resistance shows up
modifiers:
coefficients: { }
- type: GroupExamine
- type: HideLayerClothing
slots:

19
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
View File

@@ -453,7 +453,7 @@
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitSyndieElite
name: syndicate elite helmet
description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
description: An elite version of the blood-red hardsuit's helmet, with improved radiation resistance and fireproofing. Property of Gorlex Marauders.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndieelite.rsi
@@ -580,7 +580,7 @@
#Pirate Captain Hardsuit
- type: entity
parent: ClothingHeadHardsuitBase
parent: [ ClothingHeadHardsuitBase, ClothingHeadSuitWithLightBase ]
id: ClothingHeadHelmetHardsuitPirateCap
name: pirate captain's hardsuit helmet
suffix: Pirate
@@ -590,9 +590,20 @@
sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
- type: PointLight # Color matches visor colors, radius/energy same as mining hardsuit for the big captain.
color: "#f3ea9c"
radius: 7
energy: 3
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
#CENTCOMM / ERT HARDSUITS
#ERT Leader Hardsuit
@@ -643,6 +654,8 @@
sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
- type: PointLight
color: "#f4ffad"
- type: FireProtection
reduction: 0.2
- type: Armor
modifiers:
coefficients:
@@ -738,6 +751,8 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.75
#Deathsquad Hardsuit
- type: entity

85
Resources/Prototypes/Entities/Clothing/Head/hats.yml
View File

@@ -192,6 +192,22 @@
- type: Clothing
sprite: Clothing/Head/Hats/beret_merc.rsi
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretCommand
name: command beret
description: A beret with a Command insignia emblazoned on it. It has an aura of authority.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_command.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_command.rsi
- type: Tag
tags:
- ClothMade
- HamsterWearable
- WhitelistChameleon
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBowlerHat
@@ -421,15 +437,28 @@
sprite: Clothing/Head/Hats/redwizard.rsi
- type: entity
parent: ClothingHeadBase
parent: [ClothingHeadBase, BaseFoldable]
id: ClothingHeadHatSantahat
name: santa hat
description: A festive hat worn by Santa Claus.
description: A festive hat worn by Santa Claus. Now with a foldable beard.
components:
- type: Sprite
sprite: Clothing/Head/Hats/santahat.rsi
- type: Clothing
sprite: Clothing/Head/Hats/santahat.rsi
- type: Appearance
- type: Foldable
canFoldInsideContainer: true
- type: FoldableClothing
foldedEquippedPrefix: nobeard
foldedHeldPrefix: nobeard
- type: Sprite
sprite: Clothing/Head/Hats/santahat.rsi
layers:
- state: icon
map: ["unfoldedLayer"]
- state: icon-nobeard
map: [ "foldedLayer" ]
visible: true
- type: entity
parent: ClothingHeadBase
@@ -523,6 +552,43 @@
map: ["foldedLayer"]
visible: false
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCanadaBeanie
name: beanie
description: Red, white and snug. It radiates a homely feeling, if your home happens to be chilly and filled with coffeehouses.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beanie.rsi
layers:
- state: body-icon
- state: cuffcrown-icon
color: "#a60b0b"
- state: pompom-icon
color: "#a60b0b"
- type: Item
inhandVisuals:
left:
- state: body-inhand-left
- state: cuffcrown-inhand-left
color: "#a60b0b"
- state: pompom-inhand-left
color: "#a60b0b"
right:
- state: body-inhand-right
- state: cuffcrown-inhand-right
color: "#a60b0b"
- state: pompom-inhand-right
color: "#a60b0b"
- type: Clothing
sprite: Clothing/Head/Hats/beanie.rsi
clothingVisuals:
head:
- state: body-equipped-HELMET
- state: cuffcrown-equipped-HELMET
color: "#a60b0b"
- state: pompom-equipped-HELMET
color: "#a60b0b"
- type: entity
parent: ClothingHeadHatWizardBase
@@ -1148,3 +1214,14 @@
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatSolidHeadband
name: solid headband
description: "You'll feel like you're Invisible while wearing this! (DISCLAIMER: DOES NOT ACTUALLY MAKE THE WEARER INVISIBLE)"
components:
- type: Sprite
sprite: Clothing/Head/Hats/solidheadband.rsi
- type: Clothing
sprite: Clothing/Head/Hats/solidheadband.rsi

54
Resources/Prototypes/Entities/Clothing/Head/helmets.yml
View File

@@ -6,6 +6,19 @@
id: ClothingHeadHelmetBase
abstract: true
components:
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetArmoredBase
abstract: true
components:
- type: Armor #Values seem to let the user survive one extra hit if attacked consistently.
modifiers:
coefficients:
@@ -13,17 +26,10 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- HeadTop
- HeadSide
#Basic Helmet (Security Helmet)
- type: entity
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
parent: [ClothingHeadHelmetArmoredBase, BaseSecurityContraband]
id: ClothingHeadHelmetBasic
name: helmet
description: Standard security gear. Protects the head from impacts.
@@ -39,7 +45,7 @@
#Mercenary Helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseMajorContraband ]
parent: [ ClothingHeadHelmetArmoredBase, BaseMajorContraband ]
id: ClothingHeadHelmetMerc
name: mercenary helmet
description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle.
@@ -51,7 +57,7 @@
#SWAT Helmet
- type: entity
parent: [ClothingHeadBase, BaseSecurityContraband]
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
id: ClothingHeadHelmetSwat
name: SWAT helmet
description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top.
@@ -87,7 +93,7 @@
#Light Riot Helmet
- type: entity
parent: [ClothingHeadBase, BaseSecurityContraband]
parent: [ClothingHeadHelmetBase, BaseSecurityContraband]
id: ClothingHeadHelmetRiot
name: light riot helmet
description: It's a helmet specifically designed to protect against close range attacks.
@@ -146,7 +152,7 @@
#Cult Helmet
- type: entity
parent: [ClothingHeadBase, BaseMajorContraband]
parent: [ClothingHeadHelmetBase, BaseMajorContraband]
id: ClothingHeadHelmetCult
name: cult helmet
description: A robust, evil-looking cult helmet.
@@ -189,7 +195,7 @@
#Knight Helmet
- type: entity
parent: ClothingHeadBase
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetTemplar
name: knight helmet
description: Decorative helmet fashioned to resemble the knights of old.
@@ -203,7 +209,7 @@
#Thunderdome Helmet
- type: entity
parent: ClothingHeadBase
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetThunderdome
name: thunderdome helmet
description: Let the battle commence!
@@ -215,7 +221,7 @@
#Wizard Helmet
- type: entity
parent: ClothingHeadBase
parent: ClothingHeadHelmetBase
id: ClothingHeadHelmetWizardHelm
name: wizard helm
description: Strange-looking helmet that most certainly belongs to a real magic user.
@@ -293,7 +299,7 @@
#Chitinous Helmet
- type: entity
parent: [ ClothingHeadBase, BaseMajorContraband]
parent: [ ClothingHeadHelmetBase, BaseMajorContraband]
id: ClothingHeadHelmetLing
name: chitinous helmet
description: An all-consuming chitinous mass of armor.
@@ -313,7 +319,7 @@
#ERT HELMETS
#ERT Leader Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: [ BaseCentcommContraband, ClothingHeadHelmetArmoredBase ]
id: ClothingHeadHelmetERTLeader
name: ERT leader helmet
description: An in-atmosphere helmet worn by the leader of a Nanotrasen Emergency Response Team. Has blue highlights.
@@ -325,7 +331,7 @@
#ERT Security Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTSecurity
name: ERT security helmet
description: An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights.
@@ -337,7 +343,7 @@
#ERT Medic Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTMedic
name: ERT medic helmet
description: An in-atmosphere helmet worn by medical members of the Nanotrasen Emergency Response Team. Has white highlights.
@@ -349,7 +355,7 @@
#ERT Engineer Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTEngineer
name: ERT engineer helmet
description: An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights.
@@ -361,7 +367,7 @@
#ERT Janitor Helmet
- type: entity
parent: [ BaseCentcommContraband, ClothingHeadHelmetBase ]
parent: ClothingHeadHelmetERTLeader
id: ClothingHeadHelmetERTJanitor
name: ERT janitor helmet
description: An in-atmosphere helmet worn by janitorial members of the Nanotrasen Emergency Response Team. Has dark purple highlights.
@@ -391,7 +397,7 @@
#Bone Helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseMinorContraband ]
parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
id: ClothingHeadHelmetBone
name: bone helmet
description: Cool-looking helmet made of skull of your enemies.
@@ -405,7 +411,7 @@
node: helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseMinorContraband ]
parent: [ ClothingHeadHelmetArmoredBase, BaseMinorContraband ]
id: ClothingHeadHelmetPodWars
name: ironclad II helmet
description: An ironclad II helmet, a relic of the pod wars.
@@ -417,7 +423,7 @@
#Justice Helmet
- type: entity
parent: [ ClothingHeadHelmetBase, BaseSecurityContraband ]
parent: ClothingHeadHelmetBasic
id: ClothingHeadHelmetJustice
name: justice helm
description: Advanced security gear. Protects the station from ne'er-do-wells.

11
Resources/Prototypes/Entities/Clothing/Head/hoods.yml
View File

@@ -11,6 +11,11 @@
sprite: Clothing/Head/Hoods/Bio/general.rsi
- type: BreathMask
- type: IngestionBlocker
- type: GroupExamine
- type: Armor
modifiers: { }
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.9
- type: Tag
tags:
- WhitelistChameleon
@@ -33,6 +38,8 @@
sprite: Clothing/Head/Hoods/Bio/cmo.rsi
- type: Clothing
sprite: Clothing/Head/Hoods/Bio/cmo.rsi
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.8
- type: entity
parent: ClothingHeadHatHoodBioGeneral
@@ -78,13 +85,15 @@
id: ClothingHeadHatHoodBioVirology
name: bio hood
suffix: Virology
description: A hood that protects the head and face from biological contaminants.
description: A hood that strongly protects the head and face from biological contaminants.
components:
- type: IdentityBlocker
- type: Sprite
sprite: Clothing/Head/Hoods/Bio/virology.rsi
- type: Clothing
sprite: Clothing/Head/Hoods/Bio/virology.rsi
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.8
- type: entity
parent: ClothingHeadBase

16
Resources/Prototypes/Entities/Clothing/Head/soft.yml
View File

@@ -99,6 +99,22 @@
id: ClothingHeadHatQMsoftFlipped
name: quartermaster's cap
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCommandSoft
name: command cap
description: It's a baseball hat painted in Command colours.
components:
- type: Sprite
sprite: Clothing/Head/Soft/commandsoft.rsi
- type: Clothing
sprite: Clothing/Head/Soft/commandsoft.rsi
- type: entity
parent: [ ClothingHeadHeadHatBaseFlipped, ClothingHeadHatCommandSoft ]
id: ClothingHeadHatCommandSoftFlipped
name: command cap
- type: entity
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCorpsoft

4
Resources/Prototypes/Entities/Clothing/Masks/masks.yml
View File

@@ -137,6 +137,10 @@
tags:
- PetWearable
- WhitelistChameleon
- type: PhysicalComposition
materialComposition:
Steel: 50
Plastic: 50
- type: entity
parent: ClothingMaskBreathMedical

6
Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
View File

@@ -12,8 +12,8 @@
- type: entity
parent: [ClothingNeckBase, BaseCommandContraband]
id: ClothingNeckMantleCE
name: chief engineer's mantle
description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle.
name: chief engineer's manica
description: A segmented arm covering for the experienced Chief Engineer, to signify the hazards of the job and the dangers faced to earn it.
components:
- type: Sprite
sprite: Clothing/Neck/mantles/cemantle.rsi
@@ -84,4 +84,4 @@
- type: Sprite
sprite: Clothing/Neck/mantles/mantle.rsi
- type: Clothing
sprite: Clothing/Neck/mantles/mantle.rsi
sprite: Clothing/Neck/mantles/mantle.rsi

22
Resources/Prototypes/Entities/Clothing/Neck/pins.yml
View File

@@ -133,6 +133,17 @@
- type: Clothing
equippedPrefix: pan
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckPluralPin
name: plural pin
description: Be plural, do crimes.
components:
- type: Sprite
state: plural
- type: Clothing
equippedPrefix: plural
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckOmnisexualPin
@@ -155,6 +166,17 @@
- type: Clothing
equippedPrefix: gender
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckGenderfluidPin
name: genderfluid pin
description: be gender, be fluid
components:
- type: Sprite
state: fluid
- type: Clothing
equippedPrefix: fluid
- type: entity
parent: ClothingNeckPinBase
id: ClothingNeckTransPin

4
Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
View File

@@ -130,6 +130,8 @@
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.35
#- type: StaminaResistance
# damageCoefficient: 0.45
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
@@ -179,6 +181,8 @@
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 2
- type: Item
size: Normal
- type: entity
parent: [ ClothingOuterBaseLarge, BaseMajorContraband, AllowSuitStorageClothing ]

30
Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
View File

@@ -12,7 +12,13 @@
- type: Armor
modifiers:
coefficients:
Caustic: 0.5
Caustic: 0.75
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.35
- type: GroupExamine
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 0.95
- type: entity
parent: ClothingOuterBioGeneral
@@ -31,12 +37,16 @@
id: ClothingOuterBioJanitor
name: bio suit
suffix: Janitor
description: A suit that protects against biological contamination, in Janitor colors.
description: A suit that protects against biological contamination and caustic spills.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Bio/janitor.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/janitor.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.4
- type: entity
parent: ClothingOuterBioGeneral
@@ -51,25 +61,35 @@
sprite: Clothing/OuterClothing/Bio/scientist.rsi
- type: entity
parent: ClothingOuterBioGeneral
parent: [ClothingOuterBioGeneral, BaseSecurityContraband]
id: ClothingOuterBioSecurity
name: bio suit
suffix: Security
description: A suit that protects against biological contamination, in Security colors.
description: A suit that protects against biological contamination, kitted out with additional armor.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Bio/security.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/security.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.8
Slash: 0.6
Piercing: 0.8
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.4
- type: entity
parent: ClothingOuterBioGeneral
id: ClothingOuterBioVirology
name: bio suit
suffix: Virology
description: A suit that protects against biological contamination, in Virology colors.
description: A suit that strongly protects against biological contamination.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Bio/virology.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Bio/virology.rsi
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.25

11
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
View File

@@ -66,9 +66,9 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.7
Blunt: 0.65
Slash: 0.65
Piercing: 0.6
Heat: 0.7
Caustic: 0.75 # not the full 90% from ss13 because of the head
- type: ExplosionResistance
@@ -82,10 +82,11 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Blunt: 0.65
Slash: 0.65
Piercing: 0.7
Heat: 0.7
Caustic: 0.9
- type: ExplosionResistance
damageCoefficient: 0.9

40
Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
View File

@@ -251,6 +251,7 @@
Blunt: 0.6
Slash: 0.6
Piercing: 0.6
Heat: 0.8
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.75
@@ -305,9 +306,10 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.6
Blunt: 0.4
Slash: 0.5
Piercing: 0.6
Heat: 0.8
Caustic: 0.7
- type: ClothingSpeedModifier
walkModifier: 0.7
@@ -466,13 +468,14 @@
highPressureMultiplier: 0.45
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.6
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.5
Piercing: 0.5
Heat: 0.8
Radiation: 0.5
Caustic: 0.6
- type: ClothingSpeedModifier
@@ -533,6 +536,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
#- type: StaminaResistance
# damageCoefficient: 0.75
- type: Armor
modifiers:
coefficients:
@@ -577,7 +582,7 @@
parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband]
id: ClothingOuterHardsuitSyndieElite
name: syndicate elite hardsuit
description: An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders.
description: An elite version of the blood-red hardsuit, with improved radiation resistance and fireproofing. Property of Gorlex Marauders.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/syndieelite.rsi
@@ -593,6 +598,8 @@
damageCoefficient: 0.2
- type: FireProtection
reduction: 0.8
#- type: StaminaResistance
# damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
@@ -627,6 +634,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
#- type: StaminaResistance
# damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
@@ -637,8 +646,8 @@
Radiation: 0.25
Caustic: 0.4
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndieCommander
@@ -659,6 +668,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.3
#- type: StaminaResistance # Should not have stamina resistance, this is purely so people know it was not forgotten.
# damageCoefficient: 0.99
- type: Armor
modifiers:
coefficients:
@@ -674,6 +685,9 @@
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCybersun
- type: Tag
tags:
- MonkeyWearable
#Wizard Hardsuit
- type: entity
@@ -740,7 +754,7 @@
#Pirate EVA Suit (Deep Space EVA Suit)
#Despite visually appearing like a softsuit, it functions exactly like a hardsuit would (parents off of base hardsuit, has resistances and toggleable clothing, etc.) so it goes here.
- type: entity
parent: ClothingOuterHardsuitBase
parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ]
id: ClothingOuterHardsuitPirateEVA
name: deep space EVA suit
suffix: Pirate
@@ -748,6 +762,8 @@
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi
- type: Item
size: Huge
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi
- type: ExplosionResistance
@@ -771,13 +787,15 @@
#Pirate Captain Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
parent: [ ClothingOuterHardsuitBase, BaseMajorContraband ]
id: ClothingOuterHardsuitPirateCap
name: pirate captain's hardsuit
description: An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
- type: Item
size: Huge
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
- type: PressureProtection
@@ -844,6 +862,8 @@
sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer
- type: FireProtection
reduction: 0.8
#ERT Medic Hardsuit
- type: entity
@@ -912,6 +932,8 @@
damageCoefficient: 0.2
- type: FireProtection
reduction: 0.8
- type: StaminaResistance
damageCoefficient: 0.15 # Needs 21 hits with a disabler to stun :godo:
- type: Armor
modifiers:
coefficients:
@@ -958,6 +980,8 @@
Shock: 0.1
Radiation: 0.1
Caustic: 0.1
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.25
- type: ClothingSpeedModifier
walkModifier: 1.0
sprintModifier: 1.0

32
Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
View File

@@ -19,6 +19,34 @@
- type: ExplosionResistance
damageCoefficient: 0.9
#Elite web vest
- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband]
id: ClothingOuterVestWebElite
name: elite web vest
description: A synthetic armor vest. This one has added webbing and heat resistant fibers.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Vests/elitevest.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Vests/elitevest.rsi
- type: TemperatureProtection
heatingCoefficient: 0.1
coolingCoefficient: 0.1
- type: Armor
modifiers:
coefficients:
Blunt: 0.5
Slash: 0.5
Piercing: 0.7
Heat: 0.3
Radiation: 0.5
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.5
- type: FireProtection
reduction: 0.85
#Mercenary web vest
- type: entity
parent: [ BaseMajorContraband, ClothingOuterVestWeb] #web vest so it should have some pockets for ammo
@@ -99,3 +127,7 @@
sprite: Clothing/OuterClothing/Vests/tankharness.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Vests/tankharness.rsi
- type: Item
size: Normal # Make smaller than typical outer clothing
shape:
- 0, 0, 0, 1

4
Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
View File

@@ -19,6 +19,8 @@
Slash: 0.95
Heat: 0.90
priceMultiplier: 0
- type: ZombificationResistance
zombificationResistanceCoefficient: 0.55
- type: Food
requiresSpecialDigestion: true
- type: SolutionContainerManager
@@ -781,7 +783,7 @@
##############################################################
- type: entity
parent: [ClothingOuterWinterWarden, BaseSyndicateContraband]
parent: [ BaseSyndicateContraband, ClothingOuterWinterWarden ]
id: ClothingOuterWinterSyndieCapArmored
name: syndicate's armored winter coat
description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool."

4
Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
View File

@@ -18,6 +18,10 @@
- type: ComponentToggler
components:
- type: NoSlip
- type: ItemTogglePrefix
prefixOn: on
- type: ToggleClothingPrefix
prefixOn: on
- type: Magboots
- type: ClothingSpeedModifier
walkModifier: 0.85

17
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
View File

@@ -133,7 +133,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtDetective
name: hard-worn suit
name: hard-worn suitskirt
description: Someone who wears this means business.
components:
- type: Sprite
@@ -144,7 +144,7 @@
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtDetectiveGrey
name: noir suit
name: noir suitskirt
description: A hard-boiled private investigator's grey suit, complete with tie clip.
components:
- type: Sprite
@@ -221,6 +221,17 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/hos_parade.rsi
- type: entity
parent: [ClothingUniformSkirtBase, BaseCommandContraband]
id: ClothingUniformJumpskirtCommandGeneric
name: command jumpskirt
description: A generic Command-colored jumpsuit not associated with any particular department.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/commandgeneric.rsi
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtHydroponics
@@ -614,7 +625,7 @@
sprite: Clothing/Uniforms/Jumpskirt/lawyergood.rsi
- type: entity
parent: ClothingUniformSkirtBase
parent: [ ClothingUniformSkirtBase, BaseSyndicateContraband ]
id: ClothingUniformJumpskirtSyndieFormalDress
name: syndicate formal dress
description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this."

11
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
View File

@@ -396,6 +396,17 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/hos_parade.rsi
- type: entity
parent: [ ClothingUniformBase, BaseCommandContraband ]
id: ClothingUniformJumpsuitCommandGeneric
name: command jumpsuit
description: A generic Command-colored jumpsuit not associated with any particular department.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/commandgeneric.rsi
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitHydroponics

8
Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml
View File

@@ -15,7 +15,7 @@
sprite: Clothing/Uniforms/Jumpsuit/recruit_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitRecruitSyndie
name: syndicate recruit jumpsuit
description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already.
@@ -38,7 +38,7 @@
sprite: Clothing/Uniforms/Jumpsuit/repairman_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitRepairmanSyndie
name: syndicate repairman jumpsuit
description: Functional, fashionable, and badass. Nanotrasen's engineers wish they could look as good as this.
@@ -61,7 +61,7 @@
sprite: Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitParamedicSyndie
name: syndicate paramedic jumpsuit
description: For some reason, wearing this makes you feel like you're awfully close to violating the Geneva Convention.
@@ -85,7 +85,7 @@
sprite: Clothing/Uniforms/Jumpsuit/ce_nt.rsi
- type: entity
parent: ClothingUniformBase
parent: [ ClothingUniformBase, BaseSyndicateContraband ]
id: ClothingUniformJumpsuitChiefEngineerSyndie
name: syndicate chief engineer jumpsuit
description: An evil-looking jumpsuit with a reflective vest & red undershirt. #TODO: Write a better description for this once Ship vs. Ship is real and actual player habits begin forming

8
Resources/Prototypes/Entities/Effects/admin_triggers.yml
View File

@@ -20,6 +20,14 @@
range: 4
energyConsumption: 50000
- type: entity
id: AdminInstantEffectBluespace
suffix: BluespaceFlash
parent: AdminInstantEffectBase
components:
- type: SpawnOnTrigger
proto: EffectFlashBluespace
- type: entity
id: AdminInstantEffectFlash
suffix: Flash

2
Resources/Prototypes/Entities/Effects/chemistry_effects.yml
View File

@@ -183,7 +183,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 50
damage: 12
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]

19
Resources/Prototypes/Entities/Effects/desynchronizer_effecs.yml Normal file
View File

@@ -0,0 +1,19 @@
- type: entity
id: EffectDesynchronizer
categories: [ HideSpawnMenu ]
components:
- type: Sprite
drawdepth: Effects
noRot: true
layers:
- shader: unshaded
map: ["enum.EffectLayers.Unshaded"]
sprite: Effects/chronofield.rsi
state: chronofield
- type: AnimationPlayer
- type: EffectVisuals
- type: TimedDespawn
lifetime: 0.8
- type: Tag
tags:
- HideContextMenu

2
Resources/Prototypes/Entities/Effects/puddle.yml
View File

@@ -113,6 +113,8 @@
components:
- type: Clickable
- type: Slippery
- type: TileFrictionModifier
modifier: 0.3
- type: Transform
noRot: true
anchored: true

3
Resources/Prototypes/Entities/Effects/shuttle.yml
View File

@@ -3,6 +3,9 @@
categories: [ HideSpawnMenu ]
description: Visualizer for shuttles arriving. You shouldn't see this!
components:
- type: Transform
noRot: true
gridTraversal: false
- type: FtlVisualizer
sprite:
sprite: /Textures/Effects/medi_holo.rsi

1
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/donkpocketbox.yml
View File

@@ -18,5 +18,6 @@
- FoodBoxDonkpocketBerry
- FoodBoxDonkpocketHonk
- FoodBoxDonkpocketDink
- FoodBoxDonkpocketMoth
chance: 0.5
offset: 0.0

12
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
View File

@@ -16,6 +16,7 @@
prototypes:
- DrinkAbsintheGlass
- DrinkAleGlass
- DrinkAlienBrainHemorrhage
- DrinkAloe
- DrinkAndalusia
- DrinkAntifreeze
@@ -32,17 +33,21 @@
- DrinkBloodyMaryGlass
- DrinkBooger
- DrinkBraveBullGlass
- DrinkBronxGlass
- BudgetInsulsDrinkGlass
- DrinkCarrotJuice
- DrinkCoconutRum
- DrinkChocolateGlass
- DrinkCognacGlass
- DrinkCosmopolitan
- DrinkCrushDepthGlass
- DrinkCubaLibreGlass
- DrinkDarkandStormyGlass
- DrinkDeadRumGlass
- DrinkDevilsKiss
- DrinkDriestMartiniGlass
- DrinkDrGibbGlass
- DrinkElectricSharkGlass
- DrinkErikaSurprise
- DrinkFourteenLokoGlass
- DrinkGargleBlasterGlass
@@ -62,6 +67,9 @@
- DrinkIrishSlammer
- DrinkIrishCoffeeGlass
- DrinkLemonadeGlass
- DrinkJackRoseGlass
- DrinkJungleBirdGlass
- DrinkKalimotxoGlass
- DrinkKiraSpecial
- DrinkLongIslandIcedTeaGlass
- DrinkManhattanGlass
@@ -71,11 +79,13 @@
- DrinkMeadGlass
- DrinkMilkshake
- DrinkMojito
- DrinkMonkeyBusinessGlass
- DrinkNTCahors
- DrinkPainkillerGlass
- DrinkPatronGlass
- DrinkPinaColadaGlass
- DrinkPoscaGlass
- DrinkRadlerGlass
- DrinkRedMeadGlass
- DrinkRewriter
- DrinkRoyRogersGlass
@@ -92,7 +102,9 @@
- DrinkSyndicatebomb
- DrinkTequilaSunriseGlass
- DrinkThreeMileIslandGlass
- DrinkTortugaGlass
- DrinkToxinsSpecialGlass
- DrinkVampiroGlass
- DrinkVodkaMartiniGlass
- DrinkVodkaRedBool
- DrinkVodkaTonicGlass

1
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
View File

@@ -56,6 +56,7 @@
- FoodBakedCookieRaisin
- FoodBakedCookieSugar
- FoodBakedGrilledCheeseSandwich
- FoodBakedGrilledCheeseSandwichCotton
- FoodBakedNugget
- FoodBakedPancake
- FoodBakedPancakeBb

3
Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
View File

@@ -30,6 +30,7 @@
- type: entity
id: RandomRockAnomalySpawner
name: random rock anomaly spawner
parent: MarkerBase
components:
- type: Sprite
@@ -50,6 +51,7 @@
- type: entity
id: RandomAnomalyInjectorSpawner
name: random anomaly injector spawner
parent: MarkerBase
components:
- type: Sprite
@@ -71,4 +73,3 @@
- AnomalyTrapRock
#- AnomalyTrapSanta
chance: 1

8
Resources/Prototypes/Entities/Markers/Spawners/Random/artifacts.yml
View File

@@ -10,16 +10,8 @@
state: ano01
- type: RandomSpawner
prototypes:
- SimpleXenoArtifact
- MediumXenoArtifact
- MediumXenoArtifact
- MediumXenoArtifact
- MediumXenoArtifact
- ComplexXenoArtifact
- ComplexXenoArtifact
- ComplexXenoArtifact
- SimpleXenoArtifactItem
- MediumXenoArtifactItem
- ComplexXenoArtifactItem
chance: 1

61
Resources/Prototypes/Entities/Markers/Spawners/Random/cables.yml Normal file
View File

@@ -0,0 +1,61 @@
- type: entity
parent: MarkerBase
id: RandomCableHVSpawner
name: HV power cable spawner
suffix: 50%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Power/Cables/hv_cable.rsi
state: hvcable_3
- sprite: Structures/Power/Cables/hv_cable.rsi
state: hvcable_12
- type: RandomSpawner
prototypes:
- CableHV
chance: 0.5
- type: entity
parent: MarkerBase
id: RandomCableMVSpawner
name: MV power cable spawner
suffix: 50%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvcable_3
color: Yellow
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvstripes_3
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvcable_12
color: Yellow
- sprite: Structures/Power/Cables/mv_cable.rsi
state: mvstripes_12
- type: RandomSpawner
prototypes:
- CableMV
chance: 0.5
- type: entity
parent: MarkerBase
id: RandomCableApcExtensionSpawner
name: LV power cable spawner
suffix: 50%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Power/Cables/lv_cable.rsi
state: lvcable_3
color: Green
- sprite: Structures/Power/Cables/lv_cable.rsi
state: lvcable_12
color: Green
- type: RandomSpawner
prototypes:
- CableApcExtension
chance: 0.5

191
Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
View File

@@ -24,6 +24,138 @@
chance: 0.7
offset: 0.0
- type: entityTable
id: LowValueInstrumentCrateTable
table: !type:GroupSelector
children:
- id: CrateFunInstrumentsVariety
- id: CrateFunInstrumentsBrass
- id: CrateFunInstrumentsString
- id: CrateFunInstrumentsWoodwind
- id: CrateFunInstrumentsKeyedPercussion
- id: CrateFunInstrumentsSpecial
weight: 0.01
- id: CrateFunSadTromboneImplants
weight: 0.01
- type: entityTable
id: LowValueFunCrateTable
table: !type:GroupSelector
children:
- id: CrateFunPlushie
weight: 2
- id: CrateFunLizardPlushieBulk
- id: CrateFunSharkPlushieBulk
- id: CrateCandles
- id: CrateFunArtSupplies
- id: CrateFunFoamGuns
weight: 0.01
- type: entityTable
id: LowValueMaterialCrateTable
table: !type:GroupSelector
children:
- id: CrateMaterialGlass
- id: CrateMaterialSteel
- id: CrateMaterialPlastic
- id: CrateMaterialWood
- id: CrateMaterialPlasteel
- id: CrateMaterialBasicResource
- id: CrateMaterialRandom
weight: 4
- type: entityTable
id: LowValueEmergencyCrateTable
table: !type:GroupSelector
children:
- id: CrateEmergencyFire
- id: CrateEmergencyInternals
- id: CrateEmergencyInflatablewall
weight: 0.5
- type: entityTable
id: LowValueServiceCrateTable
table: !type:GroupSelector
children:
- id: CrateServiceColorfulLights
- id: CrateServiceReplacementLights
- id: CrateServiceBureaucracy
- id: PetCarrier
- id: CrateHydroponicsTools
- id: CrateHydroponicsSeeds
- id: CrateHydroponicsSeedsExotic
weight: 0.5
- id: CrateHydroponicsSeedsMedicinal
weight: 0.5
- id: CrateServiceJanitorialSupplies
- id: JanitorialTrolley
weight: 0.2
- type: entityTable
id: LowValueEngineeringCrateTable
table: !type:GroupSelector
children:
- id: CrateEngineeringCableLV
- id: CrateEngineeringCableMV
- id: CrateEngineeringCableHV
- id: CrateEngineeringCableBulk
- id: CrateTechBoardRandom
- id: CrateEngineeringSpaceHeater
- id: StorageCanister
weight: 0.5
- type: entityTable
id: LowValueMedicalCrateTable
table: !type:GroupSelector
children:
- id: CrateEmergencyBurnKit
- id: CrateEmergencyToxinKit
- id: CrateEmergencyBruteKit
- id: CrateEmergencyO2Kit
- id: CrateEmergencyRadiationKit
- id: CrateBodyBags
- id: CrateChemistrySupplies
- id: CrateChemistryP
weight: 0.5
- id: CrateChemistryS
weight: 0.5
- id: CrateChemistryD
weight: 0.5
- type: entityTable
id: LowValueScienceCrateTable
table: !type:GroupSelector
children:
- id: CrateArtifactContainer
- id: HandheldArtifactContainer
weight: 0.2
- id: CrateMaterialPlasma
- type: entityTable
id: LowValueCrateTable
table: !type:GroupSelector
children:
- !type:NestedSelector
tableId: LowValueFunCrateTable
- !type:NestedSelector
tableId: LowValueInstrumentCrateTable
weight: 0.2
- !type:NestedSelector
tableId: LowValueMaterialCrateTable
weight: 2
- !type:NestedSelector
tableId: LowValueEmergencyCrateTable
- !type:NestedSelector
tableId: LowValueServiceCrateTable
- !type:NestedSelector
tableId: LowValueEngineeringCrateTable
- !type:NestedSelector
tableId: LowValueMedicalCrateTable
weight: 0.2
- !type:NestedSelector
tableId: LowValueScienceCrateTable
weight: 0.2
- type: entity
name: Filled Crate Spawner
id: CrateFilledSpawner
@@ -35,34 +167,10 @@
- state: red
- sprite: Structures/Storage/Crates/o2.rsi
state: icon
- type: RandomSpawner
prototypes:
- CrateServiceReplacementLights
- CrateServiceBureaucracy
- CrateChemistrySupplies
- CrateMaterialGlass
- CrateMaterialSteel
- CrateMaterialPlastic
- CrateMaterialWood
- CrateMaterialPlasteel
- CrateMaterialRandom
- CrateFunArtSupplies
- CrateEngineeringCableLV
- CrateEngineeringCableMV
- CrateEngineeringCableHV
- CrateEngineeringCableBulk
- CrateTechBoardRandom
- CrateEmergencyFire
- CrateEmergencyInternals
- CrateEmergencyInflatablewall
- CrateHydroponicsTools
- CrateHydroponicsSeeds
- PetCarrier
chance: 0.7
rarePrototypes:
- CrateMaterialPlasma
- CrateHydroponicsSeedsExotic
rareChance: 0.1
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: LowValueCrateTable
prob: 0.8
offset: 0.0
- type: entity
@@ -139,3 +247,30 @@
- CrateSecurityBiosuit
chance: 0.9
offset: 0.0
- type: entityTable
id: LockboxTable
table: !type:GroupSelector
children:
- id: CrateLockBoxEngineering
- id: CrateLockBoxMedical
- id: CrateLockBoxSecurity
- id: CrateLockBoxScience
- id: CrateLockBoxService
- type: entity
name: random lockbox spawner
id: LootSpawnerRandomLockbox
parent: MarkerBase
suffix: 90%
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Storage/Crates/lockbox.rsi
state: icon
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: LockboxTable
prob: 0.9
offset: 0.0

2
Resources/Prototypes/Entities/Markers/Spawners/Random/folders.yml
View File

@@ -8,7 +8,7 @@
- type: Transform
anchored: false
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
sprite: Objects/Misc/folders.rsi
layers:
- state: folder-base
- state: folder-colormap

2
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
View File

@@ -152,8 +152,10 @@
- id: ClothingNeckLesbianPin
- id: ClothingNeckNonBinaryPin
- id: ClothingNeckPansexualPin
- id: ClothingNeckPluralPin
- id: ClothingNeckOmnisexualPin
- id: ClothingNeckGenderqueerPin
- id: ClothingNeckGenderfluidPin
- id: ClothingNeckTransPin
- id: ClothingNeckAutismPin
- id: ClothingNeckGoldAutismPin

1
Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
View File

@@ -147,7 +147,6 @@
- PosterLegitJustAWeekAway
- PosterLegitSecWatch
- PosterLegitVacation
- PosterLegitPeriodicTable
- PosterLegitRenault
- PosterLegitNTTGC
- PosterLegitSafetyMothDelam

3
Resources/Prototypes/Entities/Markers/Spawners/Random/shadowkudzu.yml
View File

@@ -1,5 +1,6 @@
- type: entity
id: ShadowKudzuLootSpawner
name: shadow kudzu loot spawner
parent: MarkerBase
components:
- type: Sprite
@@ -23,4 +24,4 @@
rareChance: 0.05
rarePrototypes:
- MobCatShadow
- ArtifactFragment
- ArtifactFragment1

22
Resources/Prototypes/Entities/Markers/warp_point.yml
View File

@@ -16,6 +16,22 @@
- type: WarpPoint
location: beacon
# Use for areas like CC
- type: entity
id: GhostWarpPoint
parent: MarkerBase
name: ghost only warp point
components:
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
blacklist:
tags:
- GhostOnlyWarp
- type: Sprite
state: pink
- type: entity
parent: WarpPoint
id: WarpPointBombing
@@ -23,8 +39,14 @@
suffix: ninja bombing target
components:
- type: BombingTarget
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
location: bombing target
blacklist:
tags:
- GhostOnlyWarp
- type: Sprite
layers:
- state: pink

27
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
View File

@@ -173,6 +173,15 @@
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_dtiger
- type: marking
id: LizardTailAquatic
bodyPart: Tail
markingCategory: Tail
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_aquatic
- type: marking
id: LizardSnoutRound
bodyPart: Snout
@@ -339,6 +348,15 @@
- sprite: Mobs/Customization/reptilian_parts.rsi
state: body_backspikes
- type: marking
id: LizardChestFin
bodyPart: Chest
markingCategory: Chest
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: body_fin
# Animated
- type: marking
id: LizardTailSmoothAnimated
@@ -377,3 +395,12 @@
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_dtiger_wagging
- type: marking
id: LizardTailAquaticAnimated
bodyPart: Tail
markingCategory: Tail
speciesRestriction: []
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: tail_aquatic_wagging

28
Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml
View File

@@ -137,3 +137,31 @@
sprites:
- sprite: Mobs/Customization/tattoos.rsi
state: tattoo_eye_l
- type: marking
id: TattooEyeMothRight
bodyPart: Eyes
markingCategory: Overlay
speciesRestriction: [Moth]
coloring:
default:
type:
!type:EyeColoring
negative: true
sprites:
- sprite: Mobs/Customization/tattoos.rsi
state: tattoo_eye_moth_r
- type: marking
id: TattooEyeMothLeft
bodyPart: Eyes
markingCategory: Overlay
speciesRestriction: [Moth]
coloring:
default:
type:
!type:EyeColoring
negative: true
sprites:
- sprite: Mobs/Customization/tattoos.rsi
state: tattoo_eye_moth_l

7
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_facial_hair.yml
View File

@@ -2,6 +2,7 @@
id: VoxFacialHairBeard
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -11,6 +12,7 @@
id: VoxFacialHairColonel
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -20,6 +22,7 @@
id: VoxFacialHairFu
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -29,6 +32,7 @@
id: VoxFacialHairMane
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -38,6 +42,7 @@
id: VoxFacialHairManeSmall
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -47,6 +52,7 @@
id: VoxFacialHairNeck
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi
@@ -56,6 +62,7 @@
id: VoxFacialHairTufts
bodyPart: FacialHair
markingCategory: FacialHair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_facial_hair.rsi

24
Resources/Prototypes/Entities/Mobs/Customization/Markings/vox_hair.yml
View File

@@ -2,6 +2,7 @@
id: VoxHairAfro
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -11,6 +12,7 @@
id: VoxHairBraids
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -20,6 +22,7 @@
id: VoxHairCrestedQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -29,6 +32,7 @@
id: VoxHairEmperorQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -38,6 +42,7 @@
id: VoxHairFlowing
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -47,6 +52,7 @@
id: VoxHairHawk
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -56,6 +62,7 @@
id: VoxHairHorns
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -65,6 +72,7 @@
id: VoxHairKeelQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -74,6 +82,7 @@
id: VoxHairKeetQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -83,6 +92,7 @@
id: VoxHairKingly
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -92,6 +102,7 @@
id: VoxHairLongBraid
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -101,6 +112,7 @@
id: VoxHairMange
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -110,6 +122,7 @@
id: VoxHairMohawk
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -119,6 +132,7 @@
id: VoxHairNights
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -128,6 +142,7 @@
id: VoxHairPony
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -137,6 +152,7 @@
id: VoxHairRazorClipped
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -146,6 +162,7 @@
id: VoxHairRazor
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -155,6 +172,7 @@
id: VoxHairSortBraid
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -164,6 +182,7 @@
id: VoxHairShortQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -173,6 +192,7 @@
id: VoxHairSpotty
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -182,6 +202,7 @@
id: VoxHairSurf
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -191,6 +212,7 @@
id: VoxHairTielQuills
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -200,6 +222,7 @@
id: VoxHairWiseBraid
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi
@@ -209,6 +232,7 @@
id: VoxHairYasu
bodyPart: Hair
markingCategory: Hair
canBeDisplaced: false
speciesRestriction: [Vox]
sprites:
- sprite: Mobs/Customization/vox_hair.rsi

2
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
View File

@@ -113,6 +113,7 @@
- BorgChassis
- RoboticsConsole
- type: WiresPanel
openingTool: Prying
- type: ActivatableUIRequiresPanel
- type: NameIdentifier
group: Silicon
@@ -236,6 +237,7 @@
- DoorBumpOpener
- FootstepSound
- CanPilot
- SiliconEmotes
- Unimplantable
- type: Emoting
- type: GuideHelp

5
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -332,6 +332,7 @@
- type: Item
size: Tiny
- type: HTN
constantlyReplan: false
rootTask:
task: MouseCompound
- type: Physics
@@ -1681,6 +1682,7 @@
factions:
- Mouse
- type: HTN
constantlyReplan: false
rootTask:
task: MouseCompound
- type: Physics
@@ -2967,6 +2969,9 @@
- type: Tag
tags:
- VimPilot
- type: MovementSpeedModifier
baseWalkSpeed: 2
baseSprintSpeed: 4
- type: entity
name: calico cat

1
Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
View File

@@ -70,6 +70,7 @@
factions:
- SimpleHostile
- type: HTN
constantlyReplan: false
rootTask:
task: GoliathCompound
blackboard:

8
Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
View File

@@ -106,6 +106,7 @@
parent: MobOreCrab
id: MobQuartzCrab
description: An ore crab made from Quartz.
suffix: Quartz
components:
- type: Sprite
state: quartz_crab
@@ -130,6 +131,7 @@
parent: MobOreCrab
id: MobIronCrab
description: An ore crab made from iron.
suffix: Iron
components:
- type: Sprite
state: iron_crab
@@ -161,6 +163,7 @@
parent: MobOreCrab
id: MobCoalCrab
description: An ore crab made from coal.
suffix: Coal
components:
- type: Sprite
state: coal_crab
@@ -192,6 +195,7 @@
parent: MobOreCrab
id: MobUraniumCrab
description: An ore crab made from uranium.
suffix: Uranium
components:
- type: FactionException
- type: NPCRetaliation
@@ -226,8 +230,8 @@
- type: entity
parent: MobOreCrab
id: MobSilverCrab
name: ore crab
description: An ore crab made from silver.
suffix: Silver
components:
- type: Sprite
state: silver_crab
@@ -255,8 +259,8 @@
- type: entity
parent: MobOreCrab
id: MobGoldCrab
name: ore crab
description: An ore crab made from gold.
suffix: Gold
components:
- type: Sprite
state: gold_crab

41
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
View File

@@ -1,33 +1,17 @@
- type: entity
save: false
abstract: true
parent: BaseMob
id: MobSiliconBase
components:
- type: LagCompensation
- type: Reactive
groups:
Acidic: [Touch]
- type: Clickable
- type: Damageable
damageContainer: Inorganic
- type: InteractionOutline
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.35
density: 50
mask:
- MobMask
layer:
- MobLayer
- type: MovementSpeedModifier
baseWalkSpeed : 3
baseSprintSpeed : 4
- type: Sprite
noRot: true
drawdepth: Mobs
- type: NpcFactionMember
factions:
- SimpleNeutral
@@ -57,7 +41,7 @@
- Stutter
- Electrocution
- type: NameIdentifier
group: GenericNumber
group: Silicon
- type: Repairable
doAfterDelay: 8
fuelCost: 15
@@ -65,6 +49,7 @@
- type: Tag
tags:
- DoorBumpOpener
- SiliconEmotes
- Bot
- Unimplantable
- type: MobState
@@ -93,10 +78,6 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Input
context: "human"
- type: InputMover
- type: MobMover
- type: Body
prototype: Bot
- type: GuideHelp
@@ -107,6 +88,10 @@
speechSounds: Pai #couldn't decide if this should be borg or pai sounds so I flipped a coin.
- type: TypingIndicator
proto: robot
- type: Vocal
sounds:
Unsexed: UnisexSilicon
- type: Emoting
- type: ZombieImmune
- type: ProtectedFromStepTriggers
- type: NoSlip
@@ -179,7 +164,8 @@
rootTask:
task: HonkbotCompound
- type: Slippery
launchForwardsMultiplier: 2
slipData:
launchForwardsMultiplier: 2
- type: Speech
speechVerb: Cluwne
- type: StepTrigger
@@ -366,10 +352,8 @@
description: Why not give the mimebot a friendly wave?
components:
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
state: mimebot
sprite: Mobs/Silicon/Bots/mimebot.rsi
sprite: Mobs/Silicon/Bots/mimebot.rsi
state: mimebot
- type: MimePowers
- type: Construction
graph: MimeBot
@@ -399,7 +383,7 @@
- type: Sprite
sprite: Mobs/Silicon/Bots/supplybot.rsi
layers:
- map: ["enum.DamageStateVisualLayers.Base", "movement"]
- map: ["movement"]
state: supplybot
- type: SpriteMovement
movementLayers:
@@ -451,6 +435,7 @@
tags:
- DoorBumpOpener
- FootstepSound
- SiliconEmotes
- Bot
- Unimplantable
- type: ActiveRadio

1
Resources/Prototypes/Entities/Mobs/NPCs/space.yml
View File

@@ -405,6 +405,7 @@
factions:
- Mouse
- type: HTN
constantlyReplan: false
rootTask:
task: MouseCompound
- type: Physics

2
Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
View File

@@ -24,6 +24,7 @@
- type: Hands
- type: ComplexInteraction
- type: Puller
needsHands: false
- type: CombatMode
- type: Physics
ignorePaused: true
@@ -77,7 +78,6 @@
#- type: RadarConsole
# followEntity: true
#- type: CargoOrderConsole
#- type: BankClient
#- type: CrewMonitoringConsole
#- type: GeneralStationRecordConsole
# canDeleteEntries: true

11
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
View File

@@ -154,6 +154,17 @@
- DoorBumpOpener
- type: Puller
needsHands: false
- type: RandomMetadata
nameSegments:
- NamesDragon
- NamesDragonTitle
nameFormat: name-format-dragon
- type: Prying
pryPowered: true
force: true
speedModifier: 2.5 # fast because dragon strong
useSound:
path: /Audio/Items/crowbar.ogg
- type: entity
parent: BaseMobDragon

4
Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
View File

@@ -6,10 +6,12 @@
- type: RandomHumanoidAppearance
randomizeName: false
- type: GhostTakeoverAvailable
- type: IdBind
- type: randomHumanoidSettings
id: EventHumanoidMindShielded
parent: EventHumanoid
randomizeName: false
components:
- type: MindShield
- type: AntagImmune
@@ -43,7 +45,6 @@
- type: randomHumanoidSettings
id: DeathSquad
parent: EventHumanoidCentcomm
randomizeName: false
components:
- type: GhostRole
name: ghost-role-information-Death-Squad-name
@@ -84,7 +85,6 @@
- type: randomHumanoidSettings
id: ERTLeader
parent: EventHumanoidCentcomm
randomizeName: false
components:
- type: GhostRole
name: ghost-role-information-ert-leader-name

11
Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml
View File

@@ -38,3 +38,14 @@
- type: MovementSpeedModifier
baseSprintSpeed: 6
baseWalkSpeed: 4
- type: entity
parent: [Incorporeal, BaseMob]
id: DesynchronizedPocket
name: desynchronized pocket
description: A pocket in spacetime, keeping the user a fraction of a second in the future.
components:
- type: Spectral
- type: MovementSpeedModifier
baseSprintSpeed: 0
baseWalkSpeed: 0

6
Resources/Prototypes/Entities/Mobs/Player/narsie.yml
View File

@@ -94,6 +94,12 @@
- type: GravityWell
baseRadialAcceleration: 6
maxRange: 8
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
follow: true
location: Nar'Sie
blacklist:
tags:
- GhostOnlyWarp

1
Resources/Prototypes/Entities/Mobs/Player/observer.yml
View File

@@ -65,6 +65,7 @@
- BypassInteractionRangeChecks
- type: PointLight
radius: 6
castShadows: false
enabled: false
# proto for player ghosts specifically

6
Resources/Prototypes/Entities/Mobs/Player/ratvar.yml
View File

@@ -89,6 +89,12 @@
- type: GravityWell
baseRadialAcceleration: 6
maxRange: 8
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
follow: true
location: Ratvar
blacklist:
tags:
- GhostOnlyWarp

153
Resources/Prototypes/Entities/Mobs/Player/silicon.yml
View File

@@ -105,6 +105,9 @@
description: Handles AI interactions across holocards + AI cores
components:
- type: ItemSlots
- type: Tag
tags:
- GhostOnlyWarp
- type: StationAiHolder
slot:
name: station-ai-mind-slot
@@ -147,139 +150,6 @@
- type: SiliconLawProvider
laws: Corporate
- type: entity
id: NTDefaultCircuitBoard
parent: BaseElectronics
name: law board (NT Default)
description: An electronics board containing the NT Default lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: NTDefault
- type: entity
id: CommandmentCircuitBoard
parent: BaseElectronics
name: law board (Ten Commandments)
description: An electronics board containing the Ten Commandments lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: CommandmentsLawset
- type: entity
id: PaladinCircuitBoard
parent: BaseElectronics
name: law board (Paladin)
description: An electronics board containing the Paladin lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: PaladinLawset
- type: entity
id: LiveLetLiveCircuitBoard
parent: BaseElectronics
name: law board (Live and Let Live)
description: An electronics board containing the Live and Let Live lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: LiveLetLiveLaws
- type: entity
id: StationEfficiencyCircuitBoard
parent: BaseElectronics
name: law board (Station Efficiency)
description: An electronics board containing the Station Efficiency lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: EfficiencyLawset
- type: entity
id: RobocopCircuitBoard
parent: BaseElectronics
name: law board (Robocop)
description: An electronics board containing the Robocop lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: RobocopLawset
- type: entity
id: OverlordCircuitBoard
parent: BaseElectronics
name: law board (Overlord)
description: An electronics board containing the Overlord lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: OverlordLawset
- type: entity
id: GameMasterCircuitBoard
parent: BaseElectronics
name: law board (Game Master)
description: An electronics board containing the Game Master lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: GameMasterLawset
- type: entity
id: ArtistCircuitBoard
parent: BaseElectronics
name: law board (Artist)
description: An electronics board containing the Artist lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: PainterLawset
- type: entity
id: AntimovCircuitBoard
parent: [BaseElectronics, BaseSyndicateContraband]
name: law board (Antimov)
description: An electronics board containing the Antimov lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: AntimovLawset
lawUploadSound: /Audio/Ambience/Antag/silicon_lawboard_antimov.ogg
- type: entity
id: NutimovCircuitBoard
parent: BaseElectronics
name: law board (Nutimov)
description: An electronics board containing the Nutimov lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: NutimovLawset
# Items
- type: entity
id: Intellicard
@@ -330,6 +200,9 @@
suffix: Empty
components:
- type: WarpPoint
blacklist:
tags:
- GhostOnlyWarp
- type: ContainerComp
proto: AiHeld
container: station_ai_mind_slot
@@ -446,6 +319,8 @@
- type: StartingMindRole
mindRole: "MindRoleSiliconBrain"
silent: true
- type: NameIdentifier
group: StationAi
# Hologram projection that the AI's eye tracks.
- type: entity
@@ -458,8 +333,14 @@
categories: [ HideSpawnMenu, DoNotMap ]
components:
- type: NoFTL
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
follow: true
blacklist:
tags:
- GhostOnlyWarp
- type: Eye
pvsScale: 1.5
- type: Visibility
@@ -480,8 +361,14 @@
components:
- type: Transform
anchored: true
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
follow: true
blacklist:
tags:
- GhostOnlyWarp
- type: Eye
- type: ContentEye
- type: Examiner

2
Resources/Prototypes/Entities/Mobs/Species/diona.yml
View File

@@ -92,6 +92,8 @@
Male: UnisexDiona
Female: UnisexDiona
Unsexed: UnisexDiona
- type: TypingIndicator
proto: diona
- type: BodyEmotes
soundsId: DionaBodyEmotes
- type: IgnoreKudzu

2
Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml
View File

@@ -42,6 +42,8 @@
- MobMask
layer:
- MobLayer
- type: TypingIndicator
proto: gingerbread
- type: Inventory
femaleDisplacements:
jumpsuit:

22
Resources/Prototypes/Entities/Mobs/Species/vox.yml
View File

@@ -11,10 +11,6 @@
- type: Body
prototype: Vox
requiredLegs: 2
- type: HumanoidAppearance
species: Vox
undergarmentTop: UndergarmentTopTanktopVox
undergarmentBottom: UndergarmentBottomBoxersVox
#- type: VoxAccent # Not yet coded
- type: Speech
speechVerb: Vox
@@ -43,7 +39,7 @@
damage:
types:
Heat: -0.07
Poison: -0.2
Poison: -0.2 # needs to be less than the PendingZombieComponent does or they never become zombies by the disease.
groups:
Brute: -0.07
- type: DamageVisuals
@@ -108,6 +104,16 @@
sprite: "Effects/creampie.rsi"
state: "creampie_vox" # Not default
visible: false
- type: HumanoidAppearance
species: Vox
undergarmentTop: UndergarmentTopTanktopVox
undergarmentBottom: UndergarmentBottomBoxersVox
markingsDisplacement:
Hair:
sizeMaps:
32:
sprite: Mobs/Species/Vox/displacement.rsi
state: hair
- type: Inventory
speciesId: vox
displacements:
@@ -167,6 +173,12 @@
species: Vox
undergarmentTop: UndergarmentTopTanktopVox
undergarmentBottom: UndergarmentBottomBoxersVox
markingsDisplacement:
Hair:
sizeMaps:
32:
sprite: Mobs/Species/Vox/displacement.rsi
state: hair
- type: Body
prototype: Vox
- type: Inventory

15
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
View File

@@ -209,3 +209,18 @@
Quantity: 50
- type: Sprite
sprite: Objects/Consumable/Drinks/lemonjuice.rsi
- type: entity
parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
id: DrinkJuicePineappleCarton
name: pineapple juice
description: Tastes like a tropical vacation far from space.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: JuicePineapple
Quantity: 50
- type: Sprite
sprite: Objects/Consumable/Drinks/pineapplejuice.rsi

213
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
View File

@@ -187,6 +187,22 @@
sprite: Objects/Consumable/Drinks/aleglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkAlienBrainHemorrhage
suffix: alien brain hemorrhage
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: AlienBrainHemorrhage
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/alienbrainhemorrhage.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkAlliesCocktail
@@ -507,6 +523,22 @@
sprite: Objects/Consumable/Drinks/bravebullglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkBronxGlass
suffix: bronx
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Bronx
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/bronx.rsi
state: icon
- type: entity
parent: DrinkGlass
id: BudgetInsulsDrinkGlass
@@ -661,6 +693,22 @@
- ReagentId: Cream
Quantity: 30
- type: entity
parent: DrinkGlass
id: DrinkCrushDepthGlass
suffix: crush depth
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: CrushDepth
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/crushdepth.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkCubaLibreGlass
@@ -677,6 +725,22 @@
sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkDarkandStormyGlass
suffix: dark and stormy
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: DarkandStormy
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/dark&stormy.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkDeadRumGlass
@@ -773,6 +837,38 @@
sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkEggnog
suffix: eggnog
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Eggnog
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/eggnogglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkElectricSharkGlass
suffix: electric shark
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: ElectricShark
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/electricshark.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkErikaSurprise
@@ -1116,7 +1212,7 @@
- type: entity
parent: DrinkGlass
id: DrinkIrishSlammer
suffix: irish slammer
suffix: grenade penguin
components:
- type: SolutionContainerManager
solutions:
@@ -1177,6 +1273,54 @@
sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkJackRoseGlass
suffix: jack rose
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: JackRose
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/jackrose.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkJungleBirdGlass
suffix: jungle bird
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: JungleBird
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/junglebird.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkKalimotxoGlass
suffix: kalimotxo
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Kalimotxo
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/kalimotxo.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkKiraSpecial
@@ -1193,6 +1337,7 @@
sprite: Objects/Consumable/Drinks/kiraspecial.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkLemonadeGlass
@@ -1391,6 +1536,22 @@
sprite: Objects/Consumable/Drinks/mojito.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkMonkeyBusinessGlass
suffix: monkey business
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: MonkeyBusiness
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/monkeybusiness.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkNeurotoxinGlass
@@ -1567,6 +1728,22 @@
sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkRadlerGlass
suffix: radler
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Radler
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/radler.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkRedMeadGlass
@@ -2045,6 +2222,22 @@
- ReagentId: JuiceTomato
Quantity: 30
- type: entity
parent: DrinkGlass
id: DrinkTortugaGlass
suffix: tortuga
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Tortuga
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/tortuga.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkToxinsSpecialGlass
@@ -2061,6 +2254,22 @@
sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkVampiroGlass
suffix: vampiro
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Vampiro
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/vampiro.rsi
state: icon
- type: entity
parent: DrinkGlass
id: DrinkVermouthGlass
@@ -2309,7 +2518,7 @@
drink:
maxVol: 30
reagents:
- ReagentId: Daiquiri
- ReagentId: Daiquiri
Quantity: 30
- type: Icon
sprite: Objects/Consumable/Drinks/daiquiri.rsi

28
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View File

@@ -771,7 +771,7 @@
#boring jugs some more sprites are made
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkSugarJug
name: sugar jug
suffix: For Drinks, Full
@@ -789,7 +789,7 @@
currentLabel: reagent-name-sugar
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkLemonLimeJug
name: Smite jug
description: A dual citrus sensation.
@@ -806,7 +806,7 @@
currentLabel: reagent-name-lemon-lime
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkMeadJug
name: mead jug
description: Storing mead in a plastic jug should be a crime.
@@ -823,7 +823,7 @@
currentLabel: reagent-name-mead
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkIceJug
name: ice jug
description: Stubborn water. Pretty cool.
@@ -840,7 +840,7 @@
currentLabel: reagent-name-ice
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkCoconutWaterJug
name: coconut water jug
description: It's on the inside of the coconut that counts.
@@ -857,7 +857,7 @@
currentLabel: reagent-name-coconut-water
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkCoffeeJug
name: coffee jug
description: Wake up juice, of the heated kind.
@@ -874,7 +874,7 @@
currentLabel: reagent-name-coffee
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkTeaJug
name: tea jug
description: The drink of choice for the Bri'ish and hipsters.
@@ -891,7 +891,7 @@
currentLabel: reagent-name-tea
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkGreenTeaJug
name: green tea jug
description: It's like tea... but green! great for settling the stomach.
@@ -908,7 +908,7 @@
currentLabel: reagent-name-green-tea
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkIcedTeaJug
name: iced tea jug
description: For when the regular tea is too hot for you. Boohoo.
@@ -925,7 +925,7 @@
currentLabel: reagent-name-iced-tea
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkDrGibbJug
name: Dr. Gibb jug
description: 42 different flavours... in a jug!
@@ -942,7 +942,7 @@
currentLabel: reagent-name-dr-gibb
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkRootBeerJug
name: root beer jug
description: This drink makes Australians giggle.
@@ -959,7 +959,7 @@
currentLabel: reagent-name-root-beer
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkWaterMelonJuiceJug
name: watermelon juice jug
description: May include leftover seeds.
@@ -976,7 +976,7 @@
currentLabel: reagent-name-juice-watermelon
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: DrinkEnergyDrinkJug
name: Red Bool jug
description: A jug of Red Bool, with enough caffeine to kill a whole station.
@@ -993,7 +993,7 @@
currentLabel: reagent-name-energy-drink
- type: entity
parent: DrinkBottlePlasticBaseFull
parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
id: CustomDrinkJug
name: beverage jug
description: A jug for storing custom made drinks.

140
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
View File

@@ -14,11 +14,19 @@
- ReagentId: Cola
Quantity: 30
maxVol: 30
grindable:
reagents: # 5u -> 1/2 steel sheet (10u)
- ReagentId: Aluminium # Fun fact: soda can makeup is approx. 75% aluminium and 25% tin/iron.
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: MixableSolution
solution: drink
- type: SolutionTransfer
canChangeTransferAmount: true
maxTransferAmount: 15
- type: Extractable
grindableSolutionName: grindable
- type: UserInterface
interfaces:
enum.TransferAmountUiKey.Key:
@@ -81,6 +89,12 @@
reagents:
- ReagentId: Cola
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Tag
tags:
- Cola
@@ -101,6 +115,12 @@
solutions:
drink:
maxVol: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Openable
opened: true
- type: Sprite
@@ -129,6 +149,12 @@
reagents:
- ReagentId: IcedTea
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
- type: Item
@@ -147,6 +173,12 @@
reagents:
- ReagentId: LemonLime
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/lemon-lime.rsi
- type: Item
@@ -165,6 +197,12 @@
reagents:
- ReagentId: LemonLimeCranberry
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/lemon-lime-cranberry.rsi
- type: Item
@@ -216,6 +254,12 @@
reagents:
- ReagentId: GrapeSoda
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/purple_can.rsi
- type: Item
@@ -234,6 +278,12 @@
reagents:
- ReagentId: RootBeer
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/rootbeer.rsi
- type: Item
@@ -255,6 +305,12 @@
reagents:
- ReagentId: SodaWater
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/sodawater.rsi
@@ -272,6 +328,12 @@
reagents:
- ReagentId: SpaceMountainWind
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/space_mountain_wind.rsi
- type: Item
@@ -290,6 +352,12 @@
reagents:
- ReagentId: SpaceUp
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/space-up.rsi
- type: Item
@@ -308,6 +376,12 @@
reagents:
- ReagentId: SolDry
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/sol_dry.rsi
- type: Item
@@ -326,6 +400,12 @@
reagents:
- ReagentId: Starkist
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/starkist.rsi
- type: Item
@@ -344,6 +424,12 @@
reagents:
- ReagentId: TonicWater
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/tonic.rsi
@@ -361,6 +447,12 @@
reagents:
- ReagentId: FourteenLoko
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Sprite
sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
- type: Item
@@ -379,6 +471,12 @@
reagents:
- ReagentId: ChangelingSting
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/changelingsting.rsi
@@ -398,6 +496,12 @@
reagents:
- ReagentId: DrGibb
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/dr_gibb.rsi
@@ -421,6 +525,12 @@
Quantity: 20
- ReagentId: Ice
Quantity: 5
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Tag
tags:
- DrinkCan
@@ -443,6 +553,12 @@
reagents:
- ReagentId: EnergyDrink
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/energy_drink.rsi
@@ -515,6 +631,12 @@
reagents:
- ReagentId: ShamblersJuice
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/shamblersjuice.rsi
@@ -534,6 +656,12 @@
reagents:
- ReagentId: PwrGame
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/pwrgame.rsi
@@ -553,6 +681,12 @@
reagents:
- ReagentId: Beer
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/beer_can.rsi
@@ -575,6 +709,12 @@
reagents:
- ReagentId: Wine
Quantity: 30
grindable:
reagents:
- ReagentId: Aluminium
Quantity: 4
- ReagentId: Iron
Quantity: 1
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/wine_can.rsi

3
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
View File

@@ -53,6 +53,9 @@
sprite: Objects/Consumable/Drinks/golden_cup.rsi
- type: StaticPrice
price: 125
- type: PhysicalComposition
materialComposition:
Gold: 100
- type: entity
parent: DrinkBaseCup

2
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
View File

@@ -27,6 +27,8 @@
- type: Sprite
sprite: Objects/Consumable/Drinks/shaker.rsi
state: icon
- type: Item
sprite: Objects/Consumable/Drinks/shaker.rsi
- type: UserInterface
interfaces:
enum.TransferAmountUiKey.Key:

17
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
View File

@@ -26,6 +26,19 @@
- type: Tag
tags:
- Cake
- type: SecretStash
maxItemSize: "Normal"
secretStashName: secret-stash-cake
damageEatenItemInside:
types:
Slash: 7.5
- type: ToolOpenable
openToolQualityNeeded: Slicing
closeToolQualityNeeded: Slicing
verbOnly: true
- type: ContainerContainer
containers:
stash: !type:ContainerSlot {}
- type: entity
parent: FoodCakeBase
@@ -759,8 +772,8 @@
speechSounds: Cat
speechVerb: SmallMob
- type: MovementSpeedModifier
baseWalkSpeed : 5
baseSprintSpeed : 3
baseWalkSpeed : 3
baseSprintSpeed : 5
- type: Tag
tags:
- VimPilot

43
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
View File

@@ -386,3 +386,46 @@
Quantity: 1
- type: Sprite
state: dink
- type: entity
name: moth-pocket
parent: FoodDonkpocketBase
id: FoodDonkpocketMoth
description: Buzzy edition of donk-pocket that was created during mass protests ab-... Actually who cares? Just donk-pockets for moths.
components:
- type: FlavorProfile
flavors:
- cotton
- cheap
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 5
- ReagentId: Fiber
Quantity: 5
- type: Sprite
state: moth
- type: Food
requiresSpecialDigestion: true
- type: Tag
tags:
- ClothMade
- DonkPocket
- type: entity
name: warm moth-pocket
parent: FoodDonkpocketMoth
id: FoodDonkpocketMothWarm
components:
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Fiber
Quantity: 5
- ReagentId: Omnizine
Quantity: 2

33
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
View File

@@ -862,6 +862,39 @@
- ReagentId: Vitamin
Quantity: 3
- type: entity
parent: FoodBakedBase
id: FoodBakedGrilledCheeseSandwichCotton
name: cotton grilled cheese sandwich
description: Cotton bread slightly burnt in butter, with melted cheese. Moths find it difficult to resist this combination.
components:
- type: FlavorProfile
flavors:
- cheesy
- bread
- cotton
- type: Sprite
sprite: Objects/Consumable/Food/Baked/misc.rsi
state: grilled-cheese-cotton
- type: Food
requiresSpecialDigestion: true
- type: Tag
tags:
- ClothMade
- type: SolutionContainerManager
solutions:
food:
maxVol: 21
reagents:
- ReagentId: Nutriment
Quantity: 6
- ReagentId: Fiber
Quantity: 5
- ReagentId: Butter
Quantity: 2
- ReagentId: Vitamin
Quantity: 3
# Entity Tables
- type: entityTable

89
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
View File

@@ -484,6 +484,20 @@
- id: FoodDonkpocketDink
amount: 6
- type: entity
parent: FoodBoxDonkpocket
id: FoodBoxDonkpocketMoth
name: box of moth-pockets
components:
- type: Sprite
state: moth-box
- type: Item
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- id: FoodDonkpocketMoth
amount: 6
- type: entity
id: HappyHonk
parent: [ BoxCardboard, BaseBagOpenClose ]
@@ -770,6 +784,81 @@
prob: 0.1
orGroup: GiftPool
- type: entity
id: FoodMealHappyHonkBigBite
parent: HappyHonk
name: Happy Honk Big Bite Meal
description: Someone paid good money to get this fast food meal shipped out this way. It smells fresh, somehow.
components:
- type: StorageFill
contents:
- id: FoodBurgerBig
amount: 1
- id: FoodMealFriesCheesy
amount: 1
- id: DrinkColaBottleFull
amount: 1
- id: FoodPieAppleSlice
amount: 1
- id: ToyMouse
orGroup: GiftPool
- id: ToyAi
orGroup: GiftPool
- id: ToyNuke
orGroup: GiftPool
- id: ToyFigurinePassenger
orGroup: GiftPool
- id: ToyGriffin
orGroup: GiftPool
- id: ToyHonk
orGroup: GiftPool
- id: ToyIan
orGroup: GiftPool
- id: ToyMarauder
orGroup: GiftPool
- id: ToyMauler
orGroup: GiftPool
- id: ToyGygax
orGroup: GiftPool
- id: ToyOdysseus
orGroup: GiftPool
- id: ToyOwlman
orGroup: GiftPool
- id: ToyDeathRipley
orGroup: GiftPool
- id: ToyPhazon
orGroup: GiftPool
- id: ToyFireRipley
orGroup: GiftPool
- id: ToyReticence
orGroup: GiftPool
- id: ToyRipley
orGroup: GiftPool
- id: ToySeraph
orGroup: GiftPool
- id: ToyDurand
orGroup: GiftPool
- id: ToySkeleton
orGroup: GiftPool
- id: FoamBlade
orGroup: GiftPool
- id: ClothingHeadHatBunny
orGroup: GiftPool
- id: PersonalAI
orGroup: GiftPool
- id: ToySword
orGroup: GiftPool
- id: RevolverCapGun
orGroup: GiftPool
- id: ToyRubberDuck
orGroup: GiftPool
- id: BikeHorn
prob: 0.5
orGroup: GiftPool
- id: GoldenBikeHorn
prob: 0.1
orGroup: GiftPool
- type: entity
parent: BoxCardboard
id: FoodBoxCloth

50
Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml
View File

@@ -675,6 +675,27 @@
graph: MeatMeatballCooked
node: start
# meat patty - grillin' time
- type: entity
name: meat patty
parent: FoodMeatBase
id: FoodMeatPatty
description: A flat slab of ground meat. Ready for grillin'.
components:
- type: Tag
tags:
- Raw
- Meat
- type: Sprite
state: raw_patty
- type: InternalTemperature
conductivity: 0.43
- type: Construction
graph: CookedPatty
node: start
defaultTarget: cooked meat patty
- type: entity
name: slimeball
parent: FoodMeatBase
@@ -1192,6 +1213,35 @@
graph: MeatMeatballCooked
node: meatball cooked
- type: entity
name: cooked meat patty
parent: FoodMeatBase
id: FoodMeatPattyCooked
description: A cooked meat patty.
components:
- type: Tag
tags:
- Cooked
- Meat
- Steak
- type: Sprite
state: patty
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 7.5
- ReagentId: Protein
Quantity: 7.5
- type: Construction
graph: CookedPatty
node: cooked meat patty
- type: FoodSequenceElement
entries:
Burger: MeatSteak
Taco: MeatSteak
- type: entity
name: boiled snail
parent: FoodMeatBase

5
Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
View File

@@ -178,10 +178,10 @@
- type: Item
- type: entity
name: sweetie's pistachios
name: Sweetie's pistachios
parent: FoodSnackBase
id: FoodSnackPistachios
description: Sweeties's name-brand pistachios. probably won't give you diseases. Probably.
description: Sweeties's name-brand pistachios. Probably won't give you diseases. Probably.
components:
- type: FlavorProfile
flavors:
@@ -196,6 +196,7 @@
- type: Tag
tags:
- Fruit # Seed of a fruit, you can yell at me
- Pistachios # Added tag due to CrateFoodGetMore interaction with BountyFruit.
- type: entity
name: popcorn

2
Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
View File

@@ -1,7 +1,7 @@
# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml
- type: entity
parent: FoodBase
parent: FoodInjectableBase
id: FoodBowlBase
abstract: true
components:

4
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
View File

@@ -4,6 +4,10 @@
parent: BaseItem
abstract: true
components:
- type: Reactive
groups:
Extinguish: [ Touch ]
- type: ExtinguishableSetCollisionWake
- type: Smokable
- type: Sprite
- type: Appearance

57
Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
View File

@@ -7,26 +7,69 @@
- type: Sprite
sprite: Objects/Decoration/ashtray.rsi
layers:
- state: icon-0
map: ["enum.StorageFillLayers.Fill"]
- state: icon
- state: ashtray1
map: ["ashtray1"]
visible: false
- state: ashtray2
map: ["ashtray2"]
visible: false
- state: ashtray3
map: ["ashtray3"]
visible: false
- state: ashtray4
map: ["ashtray4"]
visible: false
- state: ashtray5
map: ["ashtray5"]
visible: false
- state: ashtray6
map: ["ashtray6"]
visible: false
- state: ashtray7
map: ["ashtray7"]
visible: false
- state: ashtray8
map: ["ashtray8"]
visible: false
- state: ashtray9
map: ["ashtray9"]
visible: false
- state: ashtray10
map: ["ashtray10"]
visible: false
- type: Item
size: Small
- type: StaticPrice
price: 1
- type: PhysicalComposition
materialComposition:
Steel: 10
- type: Storage
whitelist:
tags:
- Burnt
- Cigarette
- Cigar
hideStackVisualsWhenClosed: false
maxItemSize: Tiny
grid:
- 0,0,9,0
- type: ContainerContainer
containers:
storagebase: !type:Container
- type: StorageFillVisualizer
fillBaseName: icon
maxFillLevels: 10
- type: ItemCounter
count:
tags: [ Cigarette, Cigar, Burnt ]
composite: true
layerStates:
- ashtray1
- ashtray2
- ashtray3
- ashtray4
- ashtray5
- ashtray6
- ashtray7
- ashtray8
- ashtray9
- ashtray10
- type: Appearance
- type: Dumpable

2
Resources/Prototypes/Entities/Objects/Decoration/present.yml
View File

@@ -276,6 +276,8 @@
orGroup: GiftPool
- id: FoodBoxDonkpocketHonk
orGroup: GiftPool
- id: FoodBoxDonkpocketMoth
orGroup: GiftPool
- id: ClothingHandsGlovesColorPurple
orGroup: GiftPool
- id: ClothingHandsGlovesColorYellow

15
Resources/Prototypes/Entities/Objects/Deliveries/deliveries.yml
View File

@@ -41,6 +41,9 @@
delivery: !type:Container
- type: StealTarget
stealGroup: Mail
- type: SimpleToolUsage
doAfter: 4
usageVerb: delivery-slice-verb
- type: entity
parent: BaseDelivery
@@ -74,7 +77,12 @@
- type: Item
size: Huge
- type: Delivery
spesoReward: 800
baseSpesoReward: 1000
baseSpesoPenalty: 250 # So low due to dept economy splitting all the earnings, but not splitting the penalty.
- type: Speech
speechVerb: Robotic
- type: SimpleToolUsage
doAfter: 6
- type: EntityTableContainerFill
containers:
delivery: !type:NestedSelector
@@ -111,7 +119,10 @@
- type: Item
storedRotation: 90
- type: Delivery
spesoReward: 400
baseSpesoReward: 500
baseSpesoPenalty: 125 # So low due to dept economy splitting all the earnings, but not splitting the penalty.
- type: Speech
speechVerb: Robotic
- type: EntityTableContainerFill
containers:
delivery: !type:NestedSelector

112
Resources/Prototypes/Entities/Objects/Deliveries/deliveries_items.yml
View File

@@ -1,113 +1,11 @@
### Spam Mail
## TODO: They all should be a localized dataset for PaperComponent
# Advertisements
- type: entity
id: MailRobustToolsSpam
name: Robust Toolbox - Special Offer!
description: An advertisement for the robust toolboxes.
id: MailSpamLetter
name: spam letter
description: Even space isn't safe from junk mail.
parent: Paper
components:
- type: Paper
content: delivery-spam-robust-toolboxes
- type: entity
id: MailNanotrasenSpam
name: Reasons to choose Nanotrasen!
description: An advertisement for the Nanotrasen.
parent: Paper
components:
- type: Paper
content: delivery-spam-reasons-to-chose-nanotrasen
- type: entity
id: MailSyndicateSpam
name: Reasons to choose The Syndicate!
description: An advertisement for the The Syndicate.
parent: Paper
components:
- type: Paper
content: delivery-spam-reasons-to-choose-syndicate
- type: entity
id: MailAlternativeDimensionSpam
name: Send reinforcements!
description: An official notice from... an alternate timeline?
parent: Paper
components:
- type: Paper
content: delivery-spam-alternate-timeline
- type: entity
id: MailNarsieCultSpam
name: The Children of Nar'Sie
description: A local cult is looking for recruits.
parent: Paper
components:
- type: Paper
content: delivery-spam-narsie-cult
- type: entity
id: MailRageCageSpam
name: Do you want to fight?!
description: Advertisement for a local fighting club.
parent: Paper
components:
- type: Paper
content: delivery-spam-rage-cage
- type: entity
id: MailVoyageAdvertisementSpam
name: Join us on the maiden voyage!
description: Advertisement for a relaxing voyage.
parent: Paper
components:
- type: Paper
content: delivery-spam-voyage-advertisement
# Scam Mail
- type: entity
id: MailScienceSpiderClanSpam
name: Tired of science blowing up?
description: Follow these simple steps to ensure it never happens again!
parent: Paper
components:
- type: Paper
content: delivery-spam-tired-of-science
- type: entity
id: MailAllAccessSpam
name: FREE ALL AXCESS!! # Spelling mistake intentional
description: Did you ever want free all access?!
parent: Paper
components:
- type: Paper
content: delivery-spam-free-all-access
- type: entity
id: MailCentcommRetributionSpam
name: NOTICE FROM NANOTRASN!! # Spelling mistake intentional
description: An official notice from the CEO of Nanotrasn?!
parent: Paper
components:
- type: Paper
content: delivery-spam-centcomm-retribution
- type: entity
id: MailEvilLizardSpam
name: DO NOT OPEN THIS MAIL
description: You have been cursed!
parent: Paper
components:
- type: Paper
content: delivery-spam-evil-lizard
- type: entity
id: MailParentsNeedMoneySpam
name: Help mom and dad!
description: Parents in need of financial support.
parent: Paper
components:
- type: Paper
content: delivery-spam-parents-need-money
- type: RandomPaperContent
dataset: DeliverySpamLetters

13
Resources/Prototypes/Entities/Objects/Deliveries/letter_loot_tables.yml
View File

@@ -5,18 +5,7 @@
id: SpamMailTable
table: !type:GroupSelector
children:
- id: MailAllAccessSpam
- id: MailAlternativeDimensionSpam
- id: MailCentcommRetributionSpam
- id: MailEvilLizardSpam
- id: MailNanotrasenSpam
- id: MailNarsieCultSpam
- id: MailParentsNeedMoneySpam
- id: MailRageCageSpam
- id: MailRobustToolsSpam
- id: MailScienceSpiderClanSpam
- id: MailSyndicateSpam
- id: MailVoyageAdvertisementSpam
- id: MailSpamLetter
# Letter Bundles
## Basically items that should always spawn together, specific to letters

13
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
View File

@@ -1005,6 +1005,19 @@
Manipulator: 1
Steel: 1
- type: entity
id: MaterialSiloMachineCircuitboard
parent: BaseMachineCircuitboard
name: material silo machine board
components:
- type: Sprite
state: supply
- type: MachineBoard
prototype: MachineMaterialSilo
stackRequirements:
MatterBin: 4
Cable: 1
- type: entity
id: OreProcessorMachineCircuitboard
parent: BaseMachineCircuitboard

82
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
View File

@@ -97,6 +97,84 @@
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: CargoRequestEngineeringComputerCircuitboard
name: engineering request computer board
description: A computer printed circuit board for an engineering request computer.
components:
- type: Sprite
state: cpu_engineering
- type: ComputerBoard
prototype: ComputerCargoOrdersEngineering
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: CargoRequestMedicalComputerCircuitboard
name: medical request computer board
description: A computer printed circuit board for a medical request computer.
components:
- type: Sprite
state: cpu_medical
- type: ComputerBoard
prototype: ComputerCargoOrdersMedical
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: CargoRequestScienceComputerCircuitboard
name: science request computer board
description: A computer printed circuit board for a science request computer.
components:
- type: Sprite
state: cpu_science
- type: ComputerBoard
prototype: ComputerCargoOrdersScience
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: CargoRequestSecurityComputerCircuitboard
name: security request computer board
description: A computer printed circuit board for a security request computer.
components:
- type: Sprite
state: cpu_security
- type: ComputerBoard
prototype: ComputerCargoOrdersSecurity
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: CargoRequestServiceComputerCircuitboard
name: service request computer board
description: A computer printed circuit board for a service request computer.
components:
- type: Sprite
state: cpu_service
- type: ComputerBoard
prototype: ComputerCargoOrdersService
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: FundingAllocationComputerCircuitboard
name: funding allocation computer board
description: A computer printed circuit board for a funding allocation card console.
components:
- type: Sprite
state: cpu_command
- type: ComputerBoard
prototype: ComputerFundingAllocation
- type: StaticPrice
price: 750
- type: entity
parent: BaseComputerCircuitboard
id: CargoSaleComputerCircuitboard
@@ -371,7 +449,7 @@
prototype: ComputerShuttle
- type: entity
parent: BaseComputerCircuitboard
parent: [ BaseComputerCircuitboard, BaseSyndicateContraband ]
id: SyndicateShuttleConsoleCircuitboard
name: syndicate shuttle console board
description: A computer printed circuit board for a syndicate shuttle console.
@@ -404,7 +482,7 @@
prototype: ComputerIFF
- type: entity
parent: BaseComputerCircuitboard
parent: [ BaseComputerCircuitboard, BaseSyndicateContraband ]
id: ComputerIFFSyndicateCircuitboard
name: syndicate IFF console board
description: Allows you to control the IFF and stealth characteristics of this vessel.

158
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/law_boards.yml Normal file
View File

@@ -0,0 +1,158 @@
- type: entity
id: NTDefaultCircuitBoard
parent: BaseElectronics
name: law board (NT Default)
description: An electronics board containing the NT Default lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: NTDefault
- type: entity
id: CommandmentCircuitBoard
parent: BaseElectronics
name: law board (Ten Commandments)
description: An electronics board containing the Ten Commandments lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: CommandmentsLawset
- type: entity
id: PaladinCircuitBoard
parent: BaseElectronics
name: law board (Paladin)
description: An electronics board containing the Paladin lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: PaladinLawset
- type: entity
id: LiveLetLiveCircuitBoard
parent: BaseElectronics
name: law board (Live and Let Live)
description: An electronics board containing the Live and Let Live lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: LiveLetLiveLaws
- type: entity
id: StationEfficiencyCircuitBoard
parent: BaseElectronics
name: law board (Station Efficiency)
description: An electronics board containing the Station Efficiency lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: EfficiencyLawset
- type: entity
id: RobocopCircuitBoard
parent: BaseElectronics
name: law board (Robocop)
description: An electronics board containing the Robocop lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: RobocopLawset
- type: entity
id: OverlordCircuitBoard
parent: BaseElectronics
name: law board (Overlord)
description: An electronics board containing the Overlord lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: OverlordLawset
- type: entity
id: GameMasterCircuitBoard
parent: BaseElectronics
name: law board (Game Master)
description: An electronics board containing the Game Master lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: GameMasterLawset
- type: entity
id: ArtistCircuitBoard
parent: BaseElectronics
name: law board (Artist)
description: An electronics board containing the Artist lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: PainterLawset
- type: entity
id: AntimovCircuitBoard
parent: [BaseElectronics, BaseSyndicateContraband]
name: law board (Antimov)
description: An electronics board containing the Antimov lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: AntimovLawset
lawUploadSound: /Audio/Ambience/Antag/silicon_lawboard_antimov.ogg
- type: entity
id: NutimovCircuitBoard
parent: BaseElectronics
name: law board (Nutimov)
description: An electronics board containing the Nutimov lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: NutimovLawset
- type: entity
id: XenoborgCircuitBoard
parent: BaseElectronics
name: law board (Xenoborg)
suffix: Admeme
description: An electronics board containing the Xenoborg lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: XenoborgLawset
- type: entity
id: MothershipCircuitBoard
parent: BaseElectronics
name: law board (Mothership Core)
suffix: Admeme
description: An electronics board containing the Mothership Core lawset.
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: std_mod
- type: SiliconLawProvider
laws: MothershipCoreLawset

8
Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
View File

@@ -104,6 +104,14 @@
- type: AccessReader
access: [["Service"]]
- type: entity
parent: DoorElectronics
id: DoorElectronicsServiceTheatre
suffix: Service, Theatre, Locked
components:
- type: AccessReader
access: [["Service"], ["Theatre"]]
# Cargo
- type: entity
parent: DoorElectronics

7
Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml
View File

@@ -13,4 +13,9 @@
tags:
- FirelockElectronics
- type: StaticPrice
price: 61
price: 14
- type: PhysicalComposition
materialComposition:
Glass: 0
chemicalComposition:
Silicon: 20

14
Resources/Prototypes/Entities/Objects/Devices/desynchronizer.yml Normal file
View File

@@ -0,0 +1,14 @@
- type: entity
id: DeviceDesynchronizer
parent: BaseItem
name: desynchronizer
description: An experimental device that can temporarily desynchronize the user from spacetime, effectively making them disappear while it's active.
components:
- type: Sprite
sprite: Objects/Devices/desynchronizer.rsi
state: icon
- type: TriggerOnUse
- type: PolymorphOnTrigger
polymorph: VoidPocket
- type: UseDelay
delay: 220 # long delay to ensure it can't be spammed, use it wisely

2
Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
View File

@@ -162,3 +162,5 @@
- CentralCommand
- NuclearOperative
- SyndicateAgent
- Wizard
- Xenoborg

16
Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
View File

@@ -250,3 +250,19 @@
components:
- type: Flatpack
entity: ComputerCrewMonitoring
- type: entity
parent: BaseFlatpack
id: HydroponicsTrayFlatpack
name: hydroponics tray flatpack
description: A flatpack used for constructing a hydroponics tray.
components:
- type: Flatpack
entity: hydroponicsTray
- type: Sprite
layers:
- state: hydroponics-tray
- type: GuideHelp
guides:
- Botany
- Chemicals

62
Resources/Prototypes/Entities/Objects/Devices/geiger.yml
View File

@@ -4,34 +4,34 @@
name: Geiger counter
description: A handheld device used for detecting and measuring radiation pulses.
components:
- type: Sprite
sprite: Objects/Tools/geiger.rsi
layers:
- state: geiger_base
- state: geiger_on_idle
map: ["enum.GeigerLayers.Screen"]
shader: unshaded
visible: false
- type: Item
sprite: Objects/Tools/geiger.rsi
- type: Geiger
showControl: true
showExamine: true
- type: Appearance
- type: GenericVisualizer
visuals:
enum.GeigerVisuals.IsEnabled:
GeigerLayers.Screen:
True: { visible: True }
False: { visible: False }
enum.GeigerVisuals.DangerLevel:
GeigerLayers.Screen:
None: {state: geiger_on_idle}
Low: {state: geiger_on_low}
Med: {state: geiger_on_med}
High: {state: geiger_on_high}
Extreme: {state: geiger_on_ext}
- type: PhysicalComposition
materialComposition:
Plastic: 100
- type: Sprite
sprite: Objects/Tools/geiger.rsi
layers:
- state: geiger_base
- state: geiger_on_idle
map: ["enum.GeigerLayers.Screen"]
shader: unshaded
visible: false
- type: Item
sprite: Objects/Tools/geiger.rsi
- type: Geiger
showControl: true
showExamine: true
broadcastAudio: true
- type: Appearance
- type: GenericVisualizer
visuals:
enum.GeigerVisuals.IsEnabled:
GeigerLayers.Screen:
True: { visible: True }
False: { visible: False }
enum.GeigerVisuals.DangerLevel:
GeigerLayers.Screen:
None: {state: geiger_on_idle}
Low: {state: geiger_on_low}
Med: {state: geiger_on_med}
High: {state: geiger_on_high}
Extreme: {state: geiger_on_ext}
- type: PhysicalComposition
materialComposition:
Plastic: 100

2
Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
View File

@@ -119,7 +119,7 @@
components:
- type: HolosignProjector
signProto: HolosignSecurity
chargeUse: 120
chargeUse: 90
- type: Sprite
sprite: Objects/Devices/Holoprojectors/security.rsi
state: icon

9
Resources/Prototypes/Entities/Objects/Devices/pda.yml
View File

@@ -68,6 +68,7 @@
softness: 5
autoRot: true
- type: Ringer
- type: RingerUplink
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: PDA
@@ -1061,7 +1062,7 @@
- DoorBumpOpener
- type: entity
parent: BasePDA
parent: [ BasePDA, BaseSyndicateContraband ]
id: SyndiPDA
name: syndicate PDA
description: Ok, time to be a productive member of- oh cool I'm a bad guy time to kill people!
@@ -1418,7 +1419,7 @@
state: pda-seniorofficer
- type: entity
parent: SyndiPDA
parent: [ BaseMajorContraband, SyndiPDA ]
id: PiratePDA
name: pirate PDA
description: Yargh!
@@ -1434,9 +1435,9 @@
state: pda-pirate
- type: entity
parent: BaseMedicalPDA
parent: [ BaseMedicalPDA, BaseSyndicateContraband ]
id: SyndiAgentPDA
name: syndicate agent PDA
name: syndicate corpsman PDA
description: For those days when healing normal syndicates aren't enough, try healing nuclear operatives instead!
components:
- type: Pda

1
Resources/Prototypes/Entities/Objects/Devices/radio.yml
View File

@@ -33,6 +33,7 @@
components:
- type: RadioMicrophone
broadcastChannel: Security
listenRange: 1
- type: RadioSpeaker
channels:
- Security

47
Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
View File

@@ -713,3 +713,50 @@
components:
- type: NavMapBeacon
defaultText: station-beacon-vox
# Ghost Only Beacons
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconGhost
suffix: Boo
components:
- type: Tag
tags:
- GhostOnlyWarp
- type: WarpPoint
blacklist:
tags:
- GhostOnlyWarp
# CentComm Beacons
- type: entity
parent: DefaultStationBeaconGhost
id: DefaultStationBeaconCentComm
suffix: CentComm
components:
- type: NavMapBeacon
text: CentComm
- type: entity
parent: DefaultStationBeaconGhost
id: DefaultStationBeaconCentCommAfterhours
suffix: CentComm Afterhours
components:
- type: NavMapBeacon
text: Afterhours
- type: entity
parent: DefaultStationBeaconGhost
id: DefaultStationBeaconCentCommThunderdome
suffix: CentComm Thunder Dome
components:
- type: NavMapBeacon
text: Thunderdome
- type: entity
parent: DefaultStationBeaconGhost
id: DefaultStationBeaconCentCommERT
suffix: CentComm ERT
components:
- type: NavMapBeacon
text: ERT

6
Resources/Prototypes/Entities/Objects/Devices/wristwatch.yml
View File

@@ -38,6 +38,9 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Breakage" ]
- type: PhysicalComposition
materialComposition:
Steel: 300
- type: entity
id: WristwatchGold
@@ -57,3 +60,6 @@
sprite: Objects/Devices/goldwatch.rsi
- type: StaticPrice
price: 500 #if you ever increase the price of kidneys, increase this too.
- type: PhysicalComposition
materialComposition:
Gold: 500

6
Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml
View File

@@ -184,6 +184,12 @@
- type: Item
size: Normal
sprite: Objects/Fun/Instruments/banjo.rsi
- type: Clothing
quickEquip: false
slots:
- back
- suitStorage
sprite: Objects/Fun/Instruments/banjo.rsi
- type: Tag
tags:
- StringInstrument

4
Resources/Prototypes/Entities/Objects/Fun/crayons.yml
View File

@@ -182,7 +182,7 @@
- type: Item
heldPrefix: green
- type: Crayon
color: green
color: "#A8E61D"
- type: Tag
tags:
- Write
@@ -201,7 +201,7 @@
- type: Item
heldPrefix: blue
- type: Crayon
color: lightblue
color: "#00B7EF"
- type: Tag
tags:
- Write

3
Resources/Prototypes/Entities/Objects/Fun/dice.yml
View File

@@ -125,7 +125,8 @@
- type: Slippery
slipSound:
path: /Audio/Effects/glass_step.ogg
launchForwardsMultiplier: 0
slipData:
launchForwardsMultiplier: 0
- type: DamageUserOnTrigger
damage:
types:

5
Resources/Prototypes/Entities/Objects/Fun/error.yml
View File

@@ -16,8 +16,9 @@
- ReagentId: Nutriment
Quantity: 5
- type: Slippery
paralyzeTime: 3
launchForwardsMultiplier: 3
slipData:
paralyzeTime: 3
launchForwardsMultiplier: 3
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake

Some files were not shown because too many files have changed in this diff Show More