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-29-10-2024-upstream

Browse Source 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
This commit is contained in:
Ed
2024-10-29 11:16:56 +03:00
parent b14c75390c 0468c0f6bb
commit ae3cbd6092
388 changed files with 34535 additions and 18822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Resources/Prototypes/Body/Organs/Animal/animal.yml
View File

@@ -60,6 +60,9 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Item
size: Small
heldPrefix: lungs
- type: entity
id: OrganAnimalStomach
@@ -86,6 +89,9 @@
groups:
- id: Food
- id: Drink
- type: Item
size: Small
heldPrefix: stomach
- type: entity
id: OrganMouseStomach
@@ -97,6 +103,9 @@
solutions:
stomach:
maxVol: 30
- type: Item
size: Small
heldPrefix: stomach
- type: entity
id: OrganAnimalLiver
@@ -113,6 +122,9 @@
groups:
- id: Alcohol
rateModifier: 0.1
- type: Item
size: Small
heldPrefix: liver
- type: entity
id: OrganAnimalHeart
@@ -130,6 +142,9 @@
- id: Medicine
- id: Poison
- id: Narcotic
- type: Item
size: Small
heldPrefix: heart
- type: entity
id: OrganAnimalKidneys
@@ -146,3 +161,6 @@
maxReagents: 5
metabolizerTypes: [ Animal ]
removeEmpty: true
- type: Item
size: Small
heldPrefix: kidneys

15
Resources/Prototypes/Body/Organs/arachnid.yml
View File

@@ -34,6 +34,9 @@
- type: Sprite
sprite: Mobs/Species/Arachnid/organs.rsi
state: stomach
- type: Item
size: Small
heldPrefix: stomach
- type: Stomach
updateInterval: 1.5
- type: SolutionContainerManager
@@ -91,6 +94,9 @@
components:
- type: Sprite
state: heart-on
- type: Item
size: Small
heldPrefix: heart
- type: Metabolizer
updateInterval: 1.5
maxReagents: 2
@@ -107,6 +113,9 @@
description: "Pairing suggestion: chianti and fava beans."
categories: [ HideSpawnMenu ]
components:
- type: Item
size: Small
heldPrefix: liver
- type: Sprite
state: liver
- type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
@@ -129,6 +138,9 @@
- state: kidney-l
- state: kidney-r
# The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
- type: Item
size: Small
heldPrefix: kidneys
- type: Metabolizer
updateInterval: 1.5
maxReagents: 5
@@ -145,6 +157,9 @@
layers:
- state: eyeball-l
- state: eyeball-r
- type: Item
size: Small
heldPrefix: eyeballs
- type: entity
id: OrganArachnidTongue

20
Resources/Prototypes/Body/Organs/diona.yml
View File

@@ -29,8 +29,11 @@
id: OrganDionaBrain
parent: [BaseDionaOrgan, OrganHumanBrain]
name: brain
description: "The source of incredible, unending intelligence. Honk."
description: "The central hub of a diona's pseudo-neurological activity, its root-like tendrils search for its former body."
components:
- type: Item
size: Small
heldPrefix: brain
- type: Sprite
state: brain
- type: SolutionContainerManager
@@ -64,7 +67,7 @@
id: OrganDionaStomach
parent: BaseDionaOrgan
name: stomach
description: "Gross. This is hard to stomach."
description: "The diona's equivalent of a stomach, it reeks of asparagus and vinegar."
components:
- type: Sprite
state: stomach
@@ -90,18 +93,21 @@
- id: Narcotic
- id: Alcohol
rateModifier: 0.1
- type: Item
size: Small
heldPrefix: stomach
- type: entity
id: OrganDionaLungs
parent: BaseDionaOrgan
name: lungs
description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier."
description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
components:
- type: Sprite
sprite: Mobs/Species/Human/organs.rsi
layers:
- state: lung-l
- state: lung-r
state: lungs
- type: Item
size: Small
heldPrefix: lungs
- type: Lung
- type: Metabolizer
removeEmpty: true

21
Resources/Prototypes/Body/Organs/human.yml
View File

@@ -71,6 +71,9 @@
entries:
Burger: Brain
Taco: Brain
- type: Item
size: Small
heldPrefix: brain
- type: entity
id: OrganHumanEyes
@@ -82,6 +85,9 @@
layers:
- state: eyeball-l
- state: eyeball-r
- type: Item
size: Small
heldPrefix: eyeballs
- type: entity
id: OrganHumanTongue
@@ -122,6 +128,9 @@
layers:
- state: lung-l
- state: lung-r
- type: Item
size: Small
heldPrefix: lungs
- type: Lung
- type: Metabolizer
removeEmpty: true
@@ -164,6 +173,9 @@
- id: Medicine
- id: Poison
- id: Narcotic
- type: Item
size: Small
heldPrefix: heart
- type: entity
id: OrganHumanStomach
@@ -173,6 +185,9 @@
components:
- type: Sprite
state: stomach
- type: Item
size: Small
heldPrefix: stomach
- type: SolutionContainerManager
solutions:
stomach:
@@ -202,6 +217,9 @@
components:
- type: Sprite
state: liver
- type: Item
size: Small
heldPrefix: liver
- type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
maxReagents: 1
metabolizerTypes: [Human]
@@ -219,6 +237,9 @@
layers:
- state: kidney-l
- state: kidney-r
- type: Item
size: Small
heldPrefix: kidneys
# The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
- type: Metabolizer
maxReagents: 5

6
Resources/Prototypes/Body/Organs/slime.yml
View File

@@ -33,6 +33,9 @@
reagents:
- ReagentId: Slime
Quantity: 10
- type: Item
size: Small
heldPrefix: brain
- type: entity
@@ -70,3 +73,6 @@
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 5
- type: Item
size: Small
heldPrefix: lungs

6
Resources/Prototypes/Body/Organs/vox.yml
View File

@@ -1,9 +1,15 @@
- type: entity
id: OrganVoxLungs
parent: OrganHumanLungs
description: "The blue, anaerobic lungs of a vox, they intake nitrogen to breathe. Any form of gaseous oxygen is lethally toxic if breathed in."
suffix: "vox"
components:
- type: Sprite
sprite: Mobs/Species/Vox/organs.rsi
- type: Metabolizer
metabolizerTypes: [ Vox ]
- type: Lung
alert: LowNitrogen
- type: Item
size: Small
heldPrefix: lungs

1
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View File

@@ -261,6 +261,7 @@
id: LockerFillResearchDirectorNoHardsuit
table: !type:AllSelector
children:
- id: Intellicard
- id: BoxEncryptionKeyScience
- id: CircuitImprinterMachineCircuitboard
- id: ClothingBeltUtilityFilled

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
View File

@@ -8,4 +8,5 @@
id: TankDispenserEngineeringInventory
startingInventory:
PlasmaTankFilled: 10
NitrogenTankFilled: 10
OxygenTankFilled: 10

6
Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
View File

@@ -130,6 +130,12 @@
prefix: fat-extractor-fact-
count: 6
- type: localizedDataset
id: FirebotAd
values:
prefix: advertisement-firebot-
count: 4
- type: localizedDataset
id: GoodCleanFunAds
values:

764
Resources/Prototypes/Entities/Clothing/Multiple/towel.yml Normal file
View File

@@ -0,0 +1,764 @@
- type: entity
id: BaseTowel
name: base towel
abstract: true
description: If you want to survive out here, you gotta know where your towel is.
parent: [ UnsensoredClothingUniformBase, ClothingHeadBase, ClothingBeltBase ]
components:
- type: Sprite
sprite: Clothing/Multiple/towel.rsi
- type: Clothing
sprite: Clothing/Multiple/towel.rsi
slots:
- BELT
- INNERCLOTHING
- HEAD
femaleMask: UniformTop
equipSound:
unequipSound:
- type: Spillable
solution: absorbed
- type: Absorbent
pickupAmount: 15
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Fiber
Quantity: 30
absorbed:
maxVol: 30
- type: Fiber
fiberColor: fibers-white
- type: DnaSubstanceTrace
- type: Item
size: Small
- type: entity
id: TowelColorWhite
name: white towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#EAE8E8"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#EAE8E8"
right:
- state: inhand-right
color: "#EAE8E8"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#EAE8E8"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#EAE8E8"
belt:
- state: equipped-BELT
color: "#EAE8E8"
- type: Fiber
fiberColor: fibers-white
- type: entity
id: TowelColorPurple
name: purple towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#9C0DE1"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#9C0DE1"
right:
- state: inhand-right
color: "#9C0DE1"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#9C0DE1"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#9C0DE1"
belt:
- state: equipped-BELT
color: "#9C0DE1"
- type: Fiber
fiberColor: fibers-purple
- type: entity
id: TowelColorRed
name: red towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#940000"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#940000"
right:
- state: inhand-right
color: "#940000"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#940000"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#940000"
belt:
- state: equipped-BELT
color: "#940000"
- type: Fiber
fiberColor: fibers-red
- type: entity
id: TowelColorBlue
name: blue towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#0089EF"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#0089EF"
right:
- state: inhand-right
color: "#0089EF"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#0089EF"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#0089EF"
belt:
- state: equipped-BELT
color: "#0089EF"
- type: Fiber
fiberColor: fibers-blue
- type: entity
id: TowelColorDarkBlue
name: dark blue towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#3285ba"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3285ba"
right:
- state: inhand-right
color: "#3285ba"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#3285ba"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#3285ba"
belt:
- state: equipped-BELT
color: "#3285ba"
- type: Fiber
fiberColor: fibers-blue
- type: entity
id: TowelColorLightBlue
name: light blue towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#58abcc"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#58abcc"
right:
- state: inhand-right
color: "#58abcc"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#58abcc"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#58abcc"
belt:
- state: equipped-BELT
color: "#58abcc"
- type: Fiber
fiberColor: fibers-blue
- type: entity
id: TowelColorTeal
name: teal towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#3CB57C"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#3CB57C"
right:
- state: inhand-right
color: "#3CB57C"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#3CB57C"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#3CB57C"
belt:
- state: equipped-BELT
color: "#3CB57C"
- type: Fiber
fiberColor: fibers-teal
- type: entity
id: TowelColorBrown
name: brown towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#723A02"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#723A02"
right:
- state: inhand-right
color: "#723A02"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#723A02"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#723A02"
belt:
- state: equipped-BELT
color: "#723A02"
- type: Fiber
fiberColor: fibers-brown
- type: entity
id: TowelColorLightBrown
name: light brown towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#c59431"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#c59431"
right:
- state: inhand-right
color: "#c59431"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#c59431"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#c59431"
belt:
- state: equipped-BELT
color: "#c59431"
- type: Fiber
fiberColor: fibers-brown
- type: entity
id: TowelColorGray
name: gray towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#999999"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#999999"
right:
- state: inhand-right
color: "#999999"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#999999"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#999999"
belt:
- state: equipped-BELT
color: "#999999"
- type: Fiber
fiberColor: fibers-grey
- type: entity
id: TowelColorGreen
name: green towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#5ABF2F"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#5ABF2F"
right:
- state: inhand-right
color: "#5ABF2F"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#5ABF2F"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#5ABF2F"
belt:
- state: equipped-BELT
color: "#5ABF2F"
- type: Fiber
fiberColor: fibers-green
- type: entity
id: TowelColorDarkGreen
name: dark green towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#79CC26"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#79CC26"
right:
- state: inhand-right
color: "#79CC26"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#79CC26"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#79CC26"
belt:
- state: equipped-BELT
color: "#79CC26"
- type: Fiber
fiberColor: fibers-green
- type: entity
id: TowelColorGold
name: gold towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#F7C430"
- state: iconstripe
color: "#535353"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#F7C430"
right:
- state: inhand-right
color: "#F7C430"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#F7C430"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#F7C430"
belt:
- state: equipped-BELT
color: "#F7C430"
- type: Fiber
fiberColor: fibers-gold
- type: entity
id: TowelColorOrange
name: orange towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#EF8100"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#EF8100"
right:
- state: inhand-right
color: "#EF8100"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#EF8100"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#EF8100"
belt:
- state: equipped-BELT
color: "#EF8100"
- type: Fiber
fiberColor: fibers-orange
- type: entity
id: TowelColorBlack
name: black towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#535353"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#535353"
right:
- state: inhand-right
color: "#535353"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#535353"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#535353"
belt:
- state: equipped-BELT
color: "#535353"
- type: Fiber
fiberColor: fibers-black
- type: entity
id: TowelColorPink
name: pink towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#ffa69b"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ffa69b"
right:
- state: inhand-right
color: "#ffa69b"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#ffa69b"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#ffa69b"
belt:
- state: equipped-BELT
color: "#ffa69b"
- type: Fiber
fiberColor: fibers-pink
- type: entity
id: TowelColorYellow
name: yellow towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#ffe14d"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#ffe14d"
right:
- state: inhand-right
color: "#ffe14d"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#ffe14d"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#ffe14d"
belt:
- state: equipped-BELT
color: "#ffe14d"
- type: Fiber
fiberColor: fibers-yellow
- type: entity
id: TowelColorMaroon
name: maroon towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#cc295f"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#cc295f"
right:
- state: inhand-right
color: "#cc295f"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#cc295f"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#cc295f"
belt:
- state: equipped-BELT
color: "#cc295f"
- type: Fiber
fiberColor: fibers-maroon
- type: entity
id: TowelColorSilver
name: silver towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#d0d0d0"
- state: iconstripe
color: "#F7C430"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#d0d0d0"
right:
- state: inhand-right
color: "#d0d0d0"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#d0d0d0"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#d0d0d0"
belt:
- state: equipped-BELT
color: "#d0d0d0"
- type: Fiber
fiberColor: fibers-silver
- type: entity
id: TowelColorMime
name: silent towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#EAE8E8"
- state: iconstripe
color: "#535353"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#EAE8E8"
right:
- state: inhand-right
color: "#EAE8E8"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#EAE8E8"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#EAE8E8"
belt:
- state: equipped-BELT
color: "#EAE8E8"
- type: Fiber
fiberColor: fibers-white
- type: entity
id: TowelColorNT
name: NanoTrasen brand towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#004787"
- state: iconstripe
color: "#EAE8E8"
- state: NTmono
color: "#EAE8E8"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#004787"
right:
- state: inhand-right
color: "#004787"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#004787"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#004787"
belt:
- state: equipped-BELT
color: "#004787"
- type: Fiber
fiberColor: fibers-regal-blue
- type: entity
id: TowelColorCentcom
name: centcom towel
parent: BaseTowel
components:
- type: Sprite
layers:
- state: icon
color: "#29722e"
- state: iconstripe
color: "#F7C430"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#29722e"
right:
- state: inhand-right
color: "#29722e"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#29722e"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#29722e"
belt:
- state: equipped-BELT
color: "#29722e"
- type: Fiber
fiberColor: fibers-green
- type: entity
id: TowelColorSyndicate
name: syndicate towel
parent: [ BaseTowel, BaseSyndicateContraband ]
components:
- type: Sprite
layers:
- state: icon
color: "#535353"
- state: iconstripe
color: "#940000"
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#535353"
right:
- state: inhand-right
color: "#535353"
- type: Clothing
clothingVisuals:
head:
- state: equipped-HELMET
color: "#535353"
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#535353"
belt:
- state: equipped-BELT
color: "#535353"
- type: Fiber
fiberColor: fibers-black

3
Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
View File

@@ -187,6 +187,9 @@
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellSmall
disableEject: true
whitelist:
tags:
- PowerCell
- type: entity
parent: ClothingOuterBase

2
Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
View File

@@ -204,6 +204,8 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepSpurs
params:
variation: 0.09
- type: entity
parent: ClothingShoesBootsCowboyBrown

10
Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
View File

@@ -40,6 +40,8 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepClown
params:
variation: 0.17
# for H.O.N.K. construction
- type: Tag
tags:
@@ -59,6 +61,8 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepSlip
params:
variation: 0.10
- type: Construction
graph: BananaClownShoes
node: shoes
@@ -79,6 +83,8 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepClown
params:
variation: 0.17
- type: PointLight
enabled: true
radius: 3
@@ -215,6 +221,8 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepJester
params:
variation: 0.07
- type: entity
parent: ClothingShoesClown
@@ -274,3 +282,5 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepSkates
params:
variation: 0.08

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

@@ -289,6 +289,7 @@
- id: ResearchDisk5000
- id: PetCarrier
- id: DrinkMopwataBottleRandom
- id: SpectralLocator
- id: LidSalami
weight: 0.05

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

@@ -150,4 +150,10 @@
- PosterLegitPeriodicTable
- PosterLegitRenault
- PosterLegitNTTGC
- PosterLegitSafetyMothDelam
- PosterLegitSafetyMothEpi
- PosterLegitSafetyMothPiping
- PosterLegitSafetyMothMeth
- PosterLegitSafetyMothHardhat
- PosterLegitSafetyMothSSD
chance: 1

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

@@ -1407,8 +1407,7 @@
components:
# make the player a traitor once its taken
- type: AutoTraitor
giveUplink: false
giveObjectives: false
profile: TraitorReinforcement
- type: entity
id: MobMonkeySyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink
@@ -1432,11 +1431,14 @@
- type: Speech
speechSounds: Lizard
speechVerb: Reptilian
allowedEmotes: ['Thump']
- type: Vocal
sounds:
Male: MaleReptilian
Female: FemaleReptilian
Unsexed: MaleReptilian
- type: BodyEmotes
soundsId: ReptilianBodyEmotes
- type: TypingIndicator
proto: lizard
- type: InteractionPopup
@@ -1566,8 +1568,7 @@
components:
# make the player a traitor once its taken
- type: AutoTraitor
giveUplink: false
giveObjectives: false
profile: TraitorReinforcement
- type: entity
id: MobKoboldSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink

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

@@ -777,6 +777,7 @@
name: ghost-role-information-smile-name
description: ghost-role-information-smile-description
rules: ghost-role-information-nonantagonist-rules
raffle: null
- type: Grammar
attributes:
proper: true

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

@@ -8,6 +8,7 @@
components:
- type: Input
context: "ghost"
- type: Spectral
- type: MovementSpeedModifier
baseWalkSpeed: 6
baseSprintSpeed: 6

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

@@ -120,8 +120,6 @@
- type: Construction
graph: FireBot
node: bot
- type: SentienceTarget
flavorKind: station-event-random-sentience-flavor-mechanical
- type: HTN
rootTask:
task: FirebotCompound
@@ -148,12 +146,14 @@
vaporSpread: 90
sprayVelocity: 3.0
- type: UseDelay
delay: 4
delay: 2
- type: InteractionPopup
interactSuccessString: petting-success-firebot
interactFailureString: petting-failure-firebot
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: Advertise
pack: FirebotAd
- type: entity
parent: MobSiliconBase
@@ -166,6 +166,8 @@
maxInterval: 12
sound:
collection: BikeHorn
params:
variation: 0.125
- type: Sprite
sprite: Mobs/Silicon/Bots/honkbot.rsi
state: honkbot
@@ -210,6 +212,8 @@
interactFailureString: petting-failure-honkbot
interactSuccessSound:
path: /Audio/Items/bikehorn.ogg
params:
variation: 0.125
- type: entity
parent: MobHonkBot
@@ -220,6 +224,8 @@
- type: SpamEmitSound
sound:
collection: CluwneHorn
params:
variation: 0.125
- type: Sprite
state: jonkbot
- type: Construction
@@ -235,6 +241,8 @@
- type: InteractionPopup
interactSuccessSound:
path: /Audio/Items/brokenbikehorn.ogg
params:
variation: 0.125
- type: Vocal
sounds:
Unsexed: Cluwne

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

@@ -1,5 +1,5 @@
- type: entity
parent: [MobObserver, InventoryBase]
parent: [MobObserverBase, InventoryBase]
id: AdminObserver
name: admin observer
categories: [ HideSpawnMenu ]
@@ -12,6 +12,7 @@
- CanPilot
- BypassInteractionRangeChecks
- BypassDropChecks
- NoConsoleSound
- type: Input
context: "aghost"
- type: Ghost

3
Resources/Prototypes/Entities/Mobs/Player/human.yml
View File

@@ -31,8 +31,7 @@
components:
# make the player a traitor once its taken
- type: AutoTraitor
giveUplink: false
giveObjectives: false
profile: TraitorReinforcement
- type: entity
parent: MobHumanSyndicateAgent

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

@@ -28,11 +28,13 @@
layer:
- GhostImpassable
# shared parent between aghosts, replay spectators and normal observers
- type: entity
parent:
- Incorporeal
- BaseMob
id: MobObserver
id: MobObserverBase
abstract: true
name: observer
description: Boo!
categories: [ HideSpawnMenu ]
@@ -61,6 +63,13 @@
tags:
- BypassInteractionRangeChecks
# proto for player ghosts specifically
- type: entity
parent: MobObserverBase
id: MobObserver
components:
- type: Spectral
- type: entity
id: ActionGhostBoo
name: Boo!

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

@@ -1,5 +1,5 @@
- type: entity
parent: MobObserver
parent: MobObserverBase
id: ReplayObserver
categories: [ HideSpawnMenu ]
save: false

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

@@ -71,6 +71,26 @@
title: comms-console-announcement-title-station-ai
color: "#2ed2fd"
- type: entity
id: AiHeldIntellicard
description: Components added / removed from an entity that gets inserted into an Intellicard.
categories: [ HideSpawnMenu ]
components:
- type: IntrinsicRadioReceiver
- type: IntrinsicRadioTransmitter
channels:
- Binary
- type: ActiveRadio
channels:
- Binary
- Common
- type: ActionGrant
actions:
- ActionAIViewLaws
- type: UserInterface
interfaces:
enum.SiliconLawsUiKey.Key:
type: SiliconLawBoundUserInterface
# Ai
- type: entity
@@ -82,7 +102,8 @@
- type: StationAiHolder
slot:
name: station-ai-mind-slot
locked: true
locked: false
disableEject: true
whitelist:
tags:
- StationAi
@@ -239,6 +260,7 @@
state: std_mod
- type: SiliconLawProvider
laws: AntimovLawset
lawUploadSound: /Audio/Ambience/Antag/silicon_lawboard_antimov.ogg
- type: entity
id: NutimovCircuitBoard
@@ -255,13 +277,16 @@
# Items
- type: entity
id: Intellicard
name: Intellicard
name: intellicard
description: A storage device for AIs.
parent:
- BaseItem
- AiHolder
suffix: Empty
components:
- type: ContainerComp
proto: AiHeldIntellicard
container: station_ai_mind_slot
- type: Sprite
sprite: Objects/Devices/ai_card.rsi
layers:
@@ -360,7 +385,6 @@
enum.SiliconLawsUiKey.Key:
type: SiliconLawBoundUserInterface
- type: ComplexInteraction
- type: DoorRemote
- type: Actions
- type: Access
groups:
@@ -373,6 +397,7 @@
tags:
- HideContextMenu
- StationAi
- NoConsoleSound
# Hologram projection that the AI's eye tracks.
- type: entity

3
Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
View File

@@ -30,6 +30,7 @@
- type: Speech
speechSounds: Lizard
speechVerb: Reptilian
allowedEmotes: ['Thump']
- type: TypingIndicator
proto: lizard
- type: Vocal
@@ -37,6 +38,8 @@
Male: MaleReptilian
Female: FemaleReptilian
Unsexed: MaleReptilian
- type: BodyEmotes
soundsId: ReptilianBodyEmotes
- type: Damageable
damageContainer: Biological
damageModifierSet: Scale

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

@@ -135,6 +135,10 @@
Quantity: 5
- ReagentId: Vitamin
Quantity: 5
- type: Tag
tags:
- Cake
- Vegetable
- type: entity
name: slice of carrot cake
@@ -155,6 +159,11 @@
Quantity: 1
- ReagentId: Vitamin
Quantity: 1
- type: Tag
tags:
- Cake
- Vegetable
- Slice
# Tastes like sweetness, cake, carrot.
@@ -168,7 +177,10 @@
state: brain
- type: SliceableFood
slice: FoodCakeBrainSlice
- type: Tag
tags:
- Cake
- Meat
- type: entity
name: slice of brain cake
@@ -178,6 +190,11 @@
components:
- type: Sprite
state: brain-slice
- type: Tag
tags:
- Cake
- Meat
- Slice
# Tastes like sweetness, cake, brains.
- type: entity
@@ -429,6 +446,10 @@
state: slime
- type: SliceableFood
slice: FoodCakeSlimeSlice
- type: Tag
tags:
- Cake
- Meat
- type: entity
name: slice of slime cake
@@ -438,6 +459,11 @@
components:
- type: Sprite
state: slime-slice
- type: Tag
tags:
- Cake
- Meat
- Slice
# Tastes like sweetness, cake, slime.
- type: entity
@@ -498,6 +524,10 @@
state: christmas
- type: SliceableFood
slice: FoodCakeChristmasSlice
- type: Tag
tags:
- Cake
- Fruit
- type: entity
name: slice of christmas cake
@@ -506,6 +536,11 @@
components:
- type: Sprite
state: christmas-slice
- type: Tag
tags:
- Cake
- Fruit
- Slice
# Tastes like sweetness, cake, christmas.
- type: entity
@@ -634,7 +669,7 @@
Quantity: 20
- ReagentId: Vitamin
Quantity: 5
- ReagentId: Omnizine #This is a really rare cake with healing stuff and we don't have any of its chems yet
- ReagentId: PolypyryliumOligomers
Quantity: 15
- type: entity
@@ -654,7 +689,7 @@
Quantity: 4
- ReagentId: Vitamin
Quantity: 1
- ReagentId: Omnizine
- ReagentId: PolypyryliumOligomers
Quantity: 3
# Tastes like sweetness, cake, jam.

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

@@ -525,6 +525,7 @@
- type: Tag
tags:
- Raw
- Meat
- type: Sprite
state: snake
- type: SolutionContainerManager

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

@@ -64,6 +64,8 @@
orGroup: GiftPool
- id: PlushieLizard #Weh!
orGroup: GiftPool
- id: PlushieRainbowLizard
orGroup: GiftPool
- id: PlushieNar
orGroup: GiftPool
- id: PlushieCarp

1
Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml
View File

@@ -54,6 +54,7 @@
instrumentList:
"Aah": {52: 0}
"Ooh": {53: 0}
"Kweh": {4: 1}
- type: Sprite
sprite: Objects/Fun/Instruments/microphone.rsi
state: icon

58
Resources/Prototypes/Entities/Objects/Fun/spectral_locator.yml Normal file
View File

@@ -0,0 +1,58 @@
- type: entity
id: SpectralLocatorUnpowered
parent: BaseItem
name: spectral locator
description: Appears to be a modified anomaly locator. Seems very old.
suffix: Unpowered
components:
- type: Sprite
sprite: Objects/Fun/spectrallocator.rsi
layers:
- state: icon
- state: screen
shader: unshaded
visible: false
map: ["enum.ToggleVisuals.Layer"]
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleVisuals.Toggled:
enum.ToggleVisuals.Layer:
True: { visible: true }
False: { visible: false }
- type: ItemToggle
- type: ProximityBeeper
- type: ProximityDetector
range: 12
criteria:
components:
- Spectral # reacts to AI eye, intentional
- type: Beeper
isMuted: true
minBeepInterval: 0.25
maxBeepInterval: 0.5
beepSound:
path: "/Audio/Items/locator_beep.ogg"
params:
maxDistance: 1
volume: -8
- type: entity
id: SpectralLocator
parent: [ SpectralLocatorUnpowered, PowerCellSlotSmallItem ]
suffix: Powered
components:
- type: PowerCellDraw
drawRate: 1
useRate: 0
- type: ToggleCellDraw
- type: entity
id: SpectralLocatorEmpty
parent: SpectralLocator
suffix: Empty
components:
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default

17
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -344,6 +344,23 @@
- type: Speech
speechVerb: Reptilian # for pais (In the secret stash)
- type: entity
parent: PlushieLizard
id: PlushieRainbowLizard #Weh but gay
description: An adorable stuffed toy that resembles a lizardperson of every color. You just might trip while staring at it...
name: rainbow lizard plushie
components:
- type: PointLight
radius: 1.5
energy: 2
- type: RgbLightController
layers: [ 0 ]
- type: Clothing
clothingVisuals:
head:
- state: lizard-equipped-HELMET
shader: unshaded
- type: entity
parent: PlushieLizard
id: PlushieLizardMirrored

2
Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
View File

@@ -167,6 +167,8 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepClown
params:
variation: 0.17
- type: Mech
baseState: honker
openState: honker-open

4
Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
View File

@@ -68,6 +68,10 @@
components:
- type: Sharp
butcherDelayModifier: 1.5 # Butchering with a scalpel, regardless of the type, will take 50% longer
- type: Tool
qualities:
- Slicing
speedModifier: 0.66 # pretend the sixes go on forever :)
- type: Utensil
types:
- Knife

64
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
View File

@@ -10,6 +10,8 @@
- type: Sprite
sprite: Objects/Specific/Robotics/borgmodule.rsi
- type: BorgModule
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: no-action }
- type: StaticPrice
price: 100
- type: Tag
@@ -35,7 +37,7 @@
description: Select this module, enabling you to use the tools it provides.
components:
- type: InstantAction
itemIconStyle: BigItem
itemIconStyle: BigAction
useDelay: 0.5
event: !type:BorgModuleActionSelectedEvent
@@ -119,6 +121,8 @@
- CableHVStackLingering10
- Wirecutter
- trayScanner
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: wire-module }
- type: entity
id: BorgModuleFireExtinguisher
@@ -132,6 +136,8 @@
- type: ItemBorgModule
items:
- FireExtinguisher
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: extinguisher-module }
- type: entity
id: BorgModuleGPS
@@ -147,6 +153,8 @@
- HandheldGPSBasic
- HandHeldMassScannerBorg
- HandheldStationMapUnpowered
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: gps-module }
- type: entity
id: BorgModuleRadiationDetection
@@ -160,6 +168,8 @@
- type: ItemBorgModule
items:
- GeigerCounter
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: geiger-module }
- type: entity
id: BorgModuleTool
@@ -178,6 +188,8 @@
- Wirecutter
- Multitool
- WelderIndustrial
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: tool-module }
# cargo modules
- type: entity
@@ -192,6 +204,8 @@
- type: ItemBorgModule
items:
- AppraisalTool
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: appraisal-module }
- type: entity
id: BorgModuleMining
@@ -210,6 +224,8 @@
- OreBag
- Crowbar
- RadioHandheld
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: mining-module }
- type: entity
id: BorgModuleGrapplingGun
@@ -224,6 +240,8 @@
items:
- WeaponGrapplingGun
- HandheldGPSBasic
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module }
# engineering modules
- type: entity
@@ -244,6 +262,8 @@
- RemoteSignaller
- GasAnalyzer
- GeigerCounter
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-tools-module }
- type: entity
id: BorgModuleConstruction
@@ -260,6 +280,8 @@
- SheetGlassLingering0
- PartRodMetalLingering0
- FloorTileItemSteelLingering0
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: construction-module }
- type: entity
id: BorgModuleRCD
@@ -273,6 +295,8 @@
- type: ItemBorgModule
items:
- RCDRecharging
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: rcd-module }
# janitorial modules (this gets its own unique things because janis are epic)
- type: entity
@@ -289,6 +313,8 @@
- LightReplacer
- Crowbar
- Screwdriver
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: light-replacer-module }
- type: entity
id: BorgModuleCleaning
@@ -304,6 +330,8 @@
- MopItem
- Bucket
- TrashBag
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: cleaning-module }
- type: entity
id: BorgModuleAdvancedCleaning
@@ -321,6 +349,8 @@
- SprayBottleSpaceCleaner
- Dropper
- TrashBag
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-cleaning-module }
# medical modules
- type: entity
@@ -336,6 +366,8 @@
items:
- HandheldHealthAnalyzerUnpowered
- ClothingNeckStethoscope
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
- type: entity
id: BorgModuleTreatment
@@ -354,6 +386,8 @@
- Gauze10Lingering
- Bloodpack10Lingering
- Syringe
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
- type: entity
id: BorgModuleDefibrillator
@@ -367,6 +401,8 @@
- type: ItemBorgModule
items:
- DefibrillatorOneHandedUnpowered
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: defib-module }
- type: entity
id: BorgModuleAdvancedTreatment
@@ -384,6 +420,8 @@
- Beaker
- BorgDropper
- BorgHypo
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-diagnosis-module }
# science modules
# todo: if science ever gets their own custom robot, add more "sci" modules.
@@ -399,6 +437,8 @@
- type: ItemBorgModule
items:
- NodeScanner
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: node-scanner-module }
- type: entity
id: BorgModuleAnomaly
@@ -416,6 +456,8 @@
- AnomalyLocatorWideUnpowered
- RemoteSignaller
- Multitool
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: anomaly-module }
# service modules
- type: entity
@@ -435,6 +477,8 @@
- Lighter
- DrinkShaker
- BorgDropper
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: service-module }
- type: entity
id: BorgModuleMusique
@@ -450,6 +494,8 @@
- SynthesizerInstrument
- ElectricGuitarInstrument
- SaxophoneInstrument
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: musical-module }
- type: entity
id: BorgModuleGardening
@@ -466,6 +512,8 @@
- HydroponicsToolSpade
- HydroponicsToolClippers
- Bucket
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: gardening-module }
- type: entity
id: BorgModuleHarvesting
@@ -481,6 +529,8 @@
- HydroponicsToolScythe
- HydroponicsToolHatchet
- PlantBag
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: harvesting-module }
- type: entity
id: BorgModuleClowning
@@ -496,6 +546,8 @@
- BikeHorn
- ClownRecorder
- BikeHornInstrument
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: clowning-module }
#syndicate modules
- type: entity
@@ -511,6 +563,8 @@
items:
- WeaponPistolEchis
- EnergyDaggerLoud
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-weapon-module }
- type: entity
id: BorgModuleOperative
@@ -527,6 +581,8 @@
- Crowbar
- Emag
- PinpointerSyndicateNuclear
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-operative-module }
- type: entity
id: BorgModuleEsword
@@ -542,6 +598,8 @@
items:
- CyborgEnergySwordDouble
- PinpointerSyndicateNuclear
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-esword-module }
- type: entity
id: BorgModuleL6C
@@ -557,6 +615,8 @@
items:
- WeaponLightMachineGunL6C
- PinpointerSyndicateNuclear
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-l6c-module }
- type: entity
id: BorgModuleMartyr
@@ -571,3 +631,5 @@
- type: ItemBorgModule
items:
- SelfDestructSeq
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-martyr-module }

8
Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
View File

@@ -49,6 +49,10 @@
guides:
- Cyborgs
- Robotics
- type: ChangeVoiceInContainer
whitelist:
components:
- SecretStash
- type: entity
parent: MMI
@@ -127,3 +131,7 @@
guides:
- Cyborgs
- Robotics
- type: ChangeVoiceInContainer
whitelist:
components:
- SecretStash

60
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
View File

@@ -388,6 +388,66 @@
- Syringe
- Trash
- type: entity
name: mini syringe
parent: Syringe
description: A regular syringe, reshaped to fit inside of a gun.
id: MiniSyringe
components:
- type: Sprite
sprite: Objects/Specific/Chemistry/syringe.rsi
layers:
- state: minisyringe1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- state: syringeproj
- type: SolutionContainerVisuals
maxFillLevels: 3
fillBaseName: minisyringe
inHandsMaxFillLevels: 3
inHandsFillBaseName: -fill-
- type: EmbeddableProjectile
offset: "-0.1,0"
minimumSpeed: 3
removalTime: 0.25
embedOnThrow: false
- type: SolutionInjectWhileEmbedded
transferAmount: 1
solution: injector
updateInterval: 2
- type: SolutionInjectOnEmbed
transferAmount: 2
solution: injector
- type: Fixtures
fixtures:
fix1:
shape: !type:PhysShapeCircle
radius: 0.2
density: 5
mask:
- ItemMask
restitution: 0.3
friction: 0.2
projectile:
shape:
!type:PhysShapeAabb
bounds: "-0.1,-0.3,0.1,0.3"
hard: false
mask:
- Impassable
- BulletImpassable
- type: Projectile
deleteOnCollide: false
onlyCollideWhenShot: true
damage:
types:
Piercing: 5
- type: Tag
tags:
- Syringe
- Trash
- SyringeGunAmmo
- type: entity
parent: BaseSyringe
id: PrefilledSyringe

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
View File

@@ -20,7 +20,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi
- type: MagazineVisuals
magState: mag
steps: 2
steps: 4
zeroVisible: false
- type: Appearance
@@ -41,7 +41,7 @@
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: magb
steps: 2
steps: 4
zeroVisible: false
- type: Appearance

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
View File

@@ -20,7 +20,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi
- type: MagazineVisuals
magState: mag
steps: 2
steps: 4
zeroVisible: false
- type: Appearance
@@ -41,7 +41,7 @@
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: mag10
steps: 2
steps: 4
zeroVisible: false
- type: Appearance
@@ -61,7 +61,7 @@
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: magb
steps: 2
steps: 4
zeroVisible: false
- type: Appearance

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
View File

@@ -20,7 +20,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi
- type: MagazineVisuals
magState: mag
steps: 2
steps: 4
zeroVisible: false
- type: Appearance
@@ -41,7 +41,7 @@
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: magb
steps: 2
steps: 4
zeroVisible: false
- type: Appearance

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
View File

@@ -19,7 +19,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi
- type: MagazineVisuals
magState: mag
steps: 2
steps: 4
zeroVisible: false
- type: Appearance

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
View File

@@ -20,7 +20,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi
- type: MagazineVisuals
magState: mag
steps: 2
steps: 3
zeroVisible: false
- type: Appearance

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
View File

@@ -19,7 +19,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi
- type: MagazineVisuals
magState: mag
steps: 2
steps: 4
zeroVisible: false
- type: Appearance
@@ -40,7 +40,7 @@
map: ["enum.GunVisualLayers.Mag"]
- type: MagazineVisuals
magState: magb
steps: 2
steps: 4
zeroVisible: false
- type: Appearance

37
Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml
View File

@@ -103,6 +103,43 @@
containers:
storagebase: !type:Container
ents: []
- type: entity
name: syringe gun
parent: BaseStorageItem
id: LauncherSyringe
description: Load full of poisoned syringes for optimal fun.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Cannons/syringe_gun.rsi
layers:
- state: syringe_gun
- type: Storage
maxItemSize: Normal
grid:
- 0,0,2,0
whitelist:
tags:
- SyringeGunAmmo
- type: Gun
fireRate: 1
selectedMode: SemiAuto
availableModes:
- SemiAuto
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/syringe_gun.ogg
soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg
clumsyProof: true
- type: ContainerAmmoProvider
container: storagebase
- type: Item
size: Normal
- type: ContainerContainer
containers:
storagebase: !type:Container
ents: []
# shoots bullets instead of throwing them, no other changes
- type: entity

1
Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
View File

@@ -115,6 +115,7 @@
color: Red
enabled: false
castShadows: false
- type: NavMapDoor
- type: entity
id: Firelock

95
Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
View File

@@ -72,6 +72,59 @@
rewardMinAmount: 0
rewardMaxAmount: 0
possibleRewards:
- Basketball
- BalloonNT
- BalloonCorgi
- BoxDonkSoftBox
- BoxCartridgeCap
- BeachBall
- CandyBucket
- CrayonBox
- ClothingHeadHatCowboyRed
- FoamCrossbow
- FoamBlade
- FoamCutlass
- Football
- GlowstickBase #green
- GlowstickBlue
- GlowstickYellow
- GlowstickPurple
- GlowstickRed
- HarmonicaInstrument
- OcarinaInstrument
- RecorderInstrument
- GunpetInstrument
- BirdToyInstrument
- MysteryFigureBox
- PlushieHampter
- PlushieLizard
- PlushieRainbowLizard
- PlushieAtmosian
- PlushieSpaceLizard
- PlushieNuke
- PlushieCarp
- PlushieMagicarp
- PlushieHolocarp
- PlushieRainbowCarp
- PlushieRatvar
- PlushieNar
- PlushieSnake
- PlushieArachind
- PlushieMoth
- PlushieHampter
- PlushiePenguin
- PlushieHuman
- PlushieRouny
- PlushieBee
- PlushieSlime
- PlushieGhost
- PlushieDiona
- PlushieSharkBlue
- PlushieVox
- PlushieXeno
- PlasticBanana
- RevolverCapGun
- SnapPopBox
- ToyMouse
- ToyAi
- ToyNuke
@@ -91,44 +144,12 @@
- ToySeraph
- ToyDurand
- ToySkeleton
- FoamCrossbow
- RevolverCapGun
- PlushieHampter
- PlushieLizard
- PlushieAtmosian
- PlushieSpaceLizard
- PlushieNuke
- PlushieCarp
- PlushieMagicarp
- PlushieHolocarp
- PlushieRainbowCarp
- PlushieRatvar
- PlushieNar
- PlushieSnake
- PlushieArachind
- Basketball
- Football
- PlushieRouny
- PlushieBee
- PlushieSlime
- BalloonNT
- BalloonCorgi
- ToySword
- CrayonBox
- BoxDonkSoftBox
- BoxCartridgeCap
- HarmonicaInstrument
- OcarinaInstrument
- RecorderInstrument
- GunpetInstrument
- BirdToyInstrument
- PlushieXeno
- BeachBall
- PlushieMoth
- PlushieHampter
- PlushiePenguin
- PlushieHuman
- ClothingHeadHatCowboyRed
- ToyAmongPequeno
- ToyRubberDuck
- ToyHammer
- WeaponWaterPistol
- WhoopieCushion
- Whistle
- type: WiresPanel
- type: Wires

5
Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
View File

@@ -60,6 +60,11 @@
collection: Keyboard
params:
volume: -1
variation: 0.10
pitch: 1.10 # low pitch keyboard sounds feel kinda weird
blacklist:
tags:
- NoConsoleSound
- type: ContainerContainer
containers:
board: !type:Container

1
Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
View File

@@ -34,6 +34,7 @@
interfaces:
enum.FaxUiKey.Key:
type: FaxBoundUi
- type: StationAiWhitelist
- type: ApcPowerReceiver
powerLoad: 250
- type: Faxecute

6
Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View File

@@ -199,11 +199,9 @@
- WetFloorSign
- ClothingHeadHatCone
- FreezerElectronics
- Flare
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxLethalshot
- BoxShotgunFlare
- BoxShotgunSlug
- CombatKnife
- MagazineBoxLightRifle
@@ -733,7 +731,6 @@
runningState: icon
staticRecipes:
- BoxLethalshot
- BoxShotgunFlare
- BoxShotgunPractice
- BoxShotgunSlug
- ClothingEyesHudSecurity
@@ -856,7 +853,6 @@
runningState: icon
staticRecipes:
- BoxLethalshot
- BoxShotgunFlare
- BoxShotgunSlug
- BoxShellTranquilizer
- MagazineBoxLightRifle
@@ -1176,8 +1172,6 @@
- type: Machine
board: BiogeneratorMachineCircuitboard
- type: MaterialStorage
insertOnInteract: false
canEjectStoredMaterials: false
- type: ProduceMaterialExtractor
- type: ItemSlots
slots:

2
Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
View File

@@ -86,7 +86,7 @@
- type: GenericVisualizer
visuals:
enum.ConveyorVisuals.State:
enum.RecyclerVisualLayers.Main:
enum.ConveyorState.Off:
Forward: { state: grinder-b1 }
Reverse: { state: grinder-b1 }
Off: { state: grinder-b0 }

1
Resources/Prototypes/Entities/Structures/Power/apc.yml
View File

@@ -91,7 +91,6 @@
type: ApcBoundUserInterface
- type: ActivatableUI
inHandsOnly: false
singleUser: true
key: enum.ApcUiKey.Key
- type: Construction
graph: APC

10
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
View File

@@ -1060,6 +1060,16 @@
- type: Sprite
state: poster51_legit
- type: entity
parent: PosterBase
id: PosterLegitSafetyMothSSD
name: "Safety Moth - Space Sleep Disorder"
description: "This informational poster uses Safety Moth™ to tell the viewer about Space Sleep Disorder (SSD), a condition where the person stops reacting to things. \"Treat SSD crew with care! They might wake up at any time!\""
components:
- type: Sprite
state: poster52_legit
#maps
- type: entity

5
Resources/Prototypes/Entities/Structures/hydro_tray.yml
View File

@@ -67,6 +67,11 @@
False: { visible: false }
- type: PlantHolder
drawWarnings: true
wateringSound:
path: /Audio/Effects/Fluids/slosh.ogg
params:
volume: -6
variation: 0.20
- type: Destructible
thresholds:
- trigger:

12
Resources/Prototypes/Entities/categories.yml
View File

@@ -11,4 +11,14 @@
- type: entityCategory
id: Objectives
name: entity-category-name-objectives
hideSpawnMenu: true
hideSpawnMenu: true
- type: entityCategory
id: Roles
name: entity-category-name-roles
hideSpawnMenu: true
# markers, atmos fixing, etc
- type: entityCategory
id: Mapping
name: entity-category-name-mapping

3
Resources/Prototypes/GameRules/events.yml
View File

@@ -35,6 +35,7 @@
- id: RevenantSpawn
- id: SleeperAgents
- id: ZombieOutbreak
- id: LoneOpsSpawn
- type: entity
id: BaseStationEvent
@@ -451,7 +452,7 @@
duration: 1
- type: RuleGrids
- type: LoadMapRule
preloadedGrid: ShuttleStriker
mapPath: /Maps/Shuttles/ShuttleEvent/striker.yml
- type: NukeopsRule
roundEndBehavior: Nothing
- type: AntagSelection

9
Resources/Prototypes/GameRules/roundstart.yml
View File

@@ -189,6 +189,15 @@
mindRoles:
- MindRoleTraitor
- type: entity
id: TraitorReinforcement
parent: Traitor
components:
- type: TraitorRule
giveUplink: false
giveCodewords: false # It would actually give them a different set of codewords than the regular traitors, anyway
giveBriefing: false
- type: entity
id: Revolutionary
parent: BaseGameRule

5
Resources/Prototypes/GameRules/unknown_shuttles.yml
View File

@@ -20,7 +20,6 @@
- id: UnknownShuttleMeatZone
- id: UnknownShuttleMicroshuttle
- id: UnknownShuttleSpacebus
- id: UnknownShuttleInstigator
- type: entityTable
id: UnknownShuttlesFreelanceTable
@@ -32,9 +31,9 @@
id: UnknownShuttlesHostileTable
table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp
children:
- id: LoneOpsSpawn
- id: UnknownShuttleInstigator
# Shuttle Game Rules
# Shuttle Game Rules
- type: entity
abstract: true

2
Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
View File

@@ -41,4 +41,4 @@
- !type:GroupLoadoutEffect
proto: JensenTimer
equipment:
eyes: ClothingEyesGlassesJensen
eyes: ClothingEyesGlassesJensen

190
Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
View File

@@ -155,3 +155,193 @@
storage:
back:
- ClothingNeckGoldAutismPin
# Towels
- type: loadout
id: TowelColorWhite
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:OverallPlaytimeRequirement
time: 36000 # 10hr
storage:
back:
- TowelColorWhite
- type: loadout
id: TowelColorSilver
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:OverallPlaytimeRequirement
time: 1800000 # 500hr
storage:
back:
- TowelColorSilver
- type: loadout
id: TowelColorGold
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:OverallPlaytimeRequirement
time: 3600000 # 1000hr
storage:
back:
- TowelColorGold
- type: loadout
id: TowelColorLightBrown
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Cargo
time: 360000 # 100hr
storage:
back:
- TowelColorLightBrown
- type: loadout
id: TowelColorGreen
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Civilian
time: 360000 # 100hr
storage:
back:
- TowelColorGreen
- type: loadout
id: TowelColorDarkBlue
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Command
time: 360000 # 100hr
storage:
back:
- TowelColorDarkBlue
- type: loadout
id: TowelColorOrange
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Engineering
time: 360000 # 100hr
storage:
back:
- TowelColorOrange
- type: loadout
id: TowelColorLightBlue
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Medical
time: 360000 # 100hr
storage:
back:
- TowelColorLightBlue
- type: loadout
id: TowelColorPurple
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Science
time: 360000 # 100hr
storage:
back:
- TowelColorPurple
- type: loadout
id: TowelColorRed
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:DepartmentTimeRequirement
department: Security
time: 360000 # 100hr
storage:
back:
- TowelColorRed
- type: loadout
id: TowelColorGray
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobPassenger
time: 360000 # 100hr
storage:
back:
- TowelColorGray
- type: loadout
id: TowelColorBlack
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobChaplain
time: 360000 # 100hr
storage:
back:
- TowelColorBlack
- type: loadout
id: TowelColorDarkGreen
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobLibrarian
time: 360000 # 100hr
storage:
back:
- TowelColorDarkGreen
- type: loadout
id: TowelColorMaroon
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobLawyer
time: 360000 # 100hr
storage:
back:
- TowelColorMaroon
- type: loadout
id: TowelColorYellow
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobClown
time: 360000 # 100hr
storage:
back:
- TowelColorYellow
- type: loadout
id: TowelColorMime
effects:
- !type:JobRequirementLoadoutEffect
requirement:
!type:RoleTimeRequirement
role: JobMime
time: 360000 # 100hr
storage:
back:
- TowelColorMime

17
Resources/Prototypes/Loadouts/loadout_groups.yml
View File

@@ -28,6 +28,23 @@
- ClothingNeckTransPin
- ClothingNeckAutismPin
- ClothingNeckGoldAutismPin
- TowelColorBlack
- TowelColorDarkBlue
- TowelColorDarkGreen
- TowelColorGold
- TowelColorGray
- TowelColorGreen
- TowelColorLightBlue
- TowelColorLightBrown
- TowelColorMaroon
- TowelColorMime
- TowelColorOrange
- TowelColorPurple
- TowelColorRed
- TowelColorSilver
- TowelColorLightBlue
- TowelColorWhite
- TowelColorYellow
- type: loadoutGroup
id: Glasses

12
Resources/Prototypes/NPCs/firebot.yml
View File

@@ -29,6 +29,18 @@
pathfindKey: TargetPathfind
rangeKey: InteractRange
- !type:HTNPrimitiveTask
operator: !type:SetFloatOperator
targetKey: WaitTime
amount: 1
- !type:HTNPrimitiveTask
operator: !type:WaitOperator
key: WaitTime
preconditions:
- !type:KeyExistsPrecondition
key: WaitTime
- !type:HTNPrimitiveTask
preconditions:
- !type:TargetInRangePrecondition

3
Resources/Prototypes/Reagents/narcotics.yml
View File

@@ -321,6 +321,9 @@
- !type:GenericStatusEffect
key: Muted
component: Muted
type: Add
time: 10
refresh: false
- type: reagent
id: NorepinephricAcid

14
Resources/Prototypes/Recipes/Reactions/drinks.yml
View File

@@ -768,6 +768,20 @@
products:
NuclearCola: 5
- type: reaction
id: NuclearColaBreakdown
source: true
requiredMixerCategories:
- Centrifuge
reactants:
NuclearCola:
amount: 10 # assuming we loose all o2 released as gas in the centrifugal process
products:
Ipecac: 2
Water: 2
Sugar: 2
Uranium: 1
- type: reaction
id: Patron
requiredMixerCategories:

2
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View File

@@ -19,6 +19,7 @@
weight: 10
startingGear: QuartermasterGear
icon: "JobIconQuarterMaster"
requireAdminNotify: true
supervisors: job-supervisors-captain
canBeAntag: false
access:
@@ -26,6 +27,7 @@
- Salvage
- Quartermaster
- Maintenance
- External
- Command
- Brig
- Cryogenics

4
Resources/Prototypes/Roles/Jobs/Science/borg.yml
View File

@@ -8,7 +8,7 @@
requirements:
- !type:RoleTimeRequirement
role: JobBorg
time: 18000 # 5 hrs
time: 54000 # 15 hrs
canBeAntag: false
icon: JobIconStationAi
supervisors: job-supervisors-rd
@@ -23,7 +23,7 @@
playTimeTracker: JobBorg
requirements:
- !type:OverallPlaytimeRequirement
time: 216000 # 60 hrs
time: 144000 # 40 hrs
canBeAntag: false
icon: JobIconBorg
supervisors: job-supervisors-rd

5
Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
View File

@@ -1,8 +1,3 @@
- type: preloadedGrid
id: ShuttleStriker
path: /Maps/Shuttles/ShuttleEvent/striker.yml
copies: 2
- type: preloadedGrid
id: ShuttleCargoLost
path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml

16
Resources/Prototypes/Voice/speech_emote_sounds.yml
View File

@@ -424,6 +424,22 @@
path: /Audio/Voice/Diona/diona_salute.ogg
params:
volume: -5
- type: emoteSounds
id: ReptilianBodyEmotes
sounds:
Thump:
path: /Audio/Voice/Reptilian/reptilian_tailthump.ogg
params:
variation: 0.125
Clap:
collection: Claps
Snap:
collection: Snaps
params:
volume: -6
Salute:
collection: Salutes
# mobs
- type: emoteSounds

25
Resources/Prototypes/Voice/speech_emotes.yml
View File

@@ -312,6 +312,31 @@
- щёлкнула пальцами
# CP14-RU-Localization-End
- type: emote
id: Thump
name: chat-emote-name-thump
category: Hands
available: false
icon: Interface/Emotes/tailslap.png
whitelist:
components:
- Hands
blacklist:
components:
- BorgChassis
chatMessages: ["chat-emote-msg-thump"]
chatTriggers:
- thump
- thumps
- thumping
- thumped
- thump tail
- thumps tail
- thumps their tail
- thumps her tail
- thumps his tail
- thumps its tail
- type: emote
id: Salute
name: chat-emote-name-salute

6
Resources/Prototypes/tags.yml
View File

@@ -987,6 +987,9 @@
- type: Tag
id: NoBlockAnchoring
- type: Tag
id: NoConsoleSound
- type: Tag
id: NozzleBackTank
@@ -1297,6 +1300,9 @@
- type: Tag
id: Syringe
- type: Tag
id: SyringeGunAmmo
- type: Tag
id: Spellbook