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

Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
This commit is contained in:
Ed
2024-06-21 18:30:31 +03:00
parent e2f97ece50 f041f58a6d
commit 3a910a7f7f
443 changed files with 8337 additions and 2540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
abstract: true
@@ -187,6 +189,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
abstract: true
@@ -261,3 +265,5 @@
- type: HideLayerClothing
slots:
- Hair
- HeadTop
- HeadSide

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

@@ -18,7 +18,10 @@
sprite: Clothing/Head/Hardsuits/basic.rsi
- type: HideLayerClothing
slots:
- Hair
- Snout
- HeadTop
- HeadSide
#Atmospherics Hardsuit
- type: entity

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

@@ -250,6 +250,10 @@
- type: ContainerContainer
containers:
storagebase: !type:Container
- type: PilotedClothing
pilotWhitelist:
tags:
- ChefPilot
- type: Tag
tags:
- ClothMade
@@ -313,8 +317,8 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoshat
name: head of security's hat
description: "There's a new sheriff in station."
name: head of security cap
description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge.
components:
- type: Sprite
sprite: Clothing/Head/Hats/hoshat.rsi
@@ -388,6 +392,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadHatWizardBase
@@ -489,6 +495,8 @@
- type: Appearance
- type: AddAccentClothing
accent: RussianAccent
- type: RussianAccent
- type: AccentWearerNameClothing
- type: Foldable
canFoldInsideContainer: true
- type: FoldableClothing

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

@@ -22,6 +22,10 @@
- type: Tag
tags:
- WhitelistChameleon
- type: HideLayerClothing
slots:
- HeadTop
- HeadSide
#Mercenary Helmet
- type: entity
@@ -114,6 +118,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
#Janitorial Bombsuit Helmet
- type: entity
@@ -168,6 +174,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
#Templar Helmet
- type: entity
@@ -234,6 +242,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
#Atmos Fire Helmet
- type: entity
@@ -263,6 +273,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: BreathMask
#Chitinous Helmet

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

@@ -18,6 +18,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadHatHoodBioGeneral
@@ -158,6 +160,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
- type: entity
parent: ClothingHeadBase
@@ -240,6 +244,8 @@
slots:
- Hair
- Snout
- HeadTop
- HeadSide
#Winter Coat Hoods
- type: entity

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

@@ -10,10 +10,10 @@
sprite: Clothing/OuterClothing/Coats/bomber.rsi
- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
id: ClothingOuterCoatDetective
name: detective trenchcoat
description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/detective.rsi
@@ -23,13 +23,20 @@
contents:
- id: SmokingPipeFilledTobacco
- id: FlippoEngravedLighter
- type: Armor #same as regular sec armor
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.70
Heat: 0.80
- type: ExplosionResistance
damageCoefficient: 1 #its a coat. it doesnt do shit
- type: entity
parent: [ClothingOuterCoatDetectiveLoadout]
id: ClothingOuterCoatDetectiveLoadoutGrey
name: noir trenchcoat
description: Ah, your trusty coat. There's a few tears here and there, giving it a more timely look. Or at least, that's what you told yourself when you found out gettin' it repaired would set you back 200 speos.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
- type: entity
parent: ClothingOuterCoatDetective
@@ -93,17 +100,6 @@
- type: Clothing
sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatInspector
name: inspector's coat
description: A strict inspector's coat for being intimidating during inspections.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
- type: entity
parent: ClothingOuterStorageToggleableBase
id: ClothingOuterCoatJensen

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

@@ -184,6 +184,20 @@
sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
- type: entity
parent: ClothingUniformSkirtBase
@@ -377,6 +391,21 @@
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: entity
parent: ClothingUniformSkirtBase
@@ -388,6 +417,21 @@
sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
- type: entity
parent: ClothingUniformSkirtBase
@@ -788,3 +832,14 @@
sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtMusician
name: musician's skirt
description: A fancy skirt for the musically inclined. Perfect for any lounge act!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/musician.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/musician.rsi

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

@@ -340,6 +340,18 @@
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right
- type: entity
parent: ClothingUniformBase
@@ -588,6 +600,18 @@
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right
- type: entity
parent: ClothingUniformBase
@@ -621,6 +645,18 @@
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right
- type: entity
parent: ClothingUniformBase

2
Resources/Prototypes/Entities/Debugging/spanisharmyknife.yml
View File

@@ -22,8 +22,6 @@
Slash: 10
- type: ToolTileCompatible
- type: Tool
qualities:
- Prying
- type: Prying
- type: MultipleTool
statusShowBehavior: true

10
Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
View File

@@ -18,7 +18,7 @@
- type: GhostRole
name: ghost-role-information-rat-king-name
description: ghost-role-information-rat-king-description
rules: ghost-role-information-rat-king-rules
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostRoleMobSpawner
@@ -39,7 +39,7 @@
- type: GhostRole
name: ghost-role-information-remilia-name
description: ghost-role-information-remilia-description
rules: ghost-role-information-remilia-rules
rules: ghost-role-information-familiar-rules
raffle:
settings: short
- type: GhostRoleMobSpawner
@@ -60,7 +60,7 @@
- type: GhostRole
name: ghost-role-information-cerberus-name
description: ghost-role-information-cerberus-description
rules: ghost-role-information-cerberus-rules
rules: ghost-role-information-familiar-rules
raffle:
settings: default
- type: GhostRoleMobSpawner
@@ -143,7 +143,7 @@
- type: GhostRole
name: ghost-role-information-space-dragon-name
description: ghost-role-information-space-dragon-description
rules: ghost-role-component-default-rules
rules: ghost-role-component-space-dragon-rules
- type: Sprite
layers:
- state: green
@@ -159,7 +159,7 @@
- type: GhostRole
name: ghost-role-information-space-ninja-name
description: ghost-role-information-space-ninja-description
rules: ghost-role-information-space-ninja-rules
rules: ghost-role-information-antagonist-rules
raffle:
settings: default
- type: GhostRoleMobSpawner

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

@@ -421,6 +421,7 @@
allowMovement: true
name: ghost-role-information-mothroach-name
description: ghost-role-information-mothroach-description
rules: ghost-role-information-freeagent-rules
- type: Fixtures
fixtures:
fix1:
@@ -1104,6 +1105,7 @@
prob: 0.25
name: ghost-role-information-kangaroo-name
description: ghost-role-information-kangaroo-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Vocal
sounds:
@@ -1278,6 +1280,7 @@
makeSentient: true
name: ghost-role-information-monkey-name
description: ghost-role-information-monkey-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Clumsy
clumsyDamage:
@@ -1312,6 +1315,7 @@
makeSentient: true
name: ghost-role-information-monkey-name
description: ghost-role-information-monkey-description
rules: ghost-role-information-syndicate-monkey-reinforcement-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -1443,6 +1447,7 @@
makeSentient: true
name: ghost-role-information-kobold-name
description: ghost-role-information-kobold-description
rules: ghost-role-information-nonantagonist-rules
- type: entity
name: kobold
@@ -1516,6 +1521,7 @@
allowMovement: true
name: ghost-role-information-mouse-name
description: ghost-role-information-mouse-description
rules: ghost-role-information-freeagent-rules
- type: GhostTakeoverAvailable
- type: Speech
speechSounds: Squeak
@@ -1624,6 +1630,7 @@
tags:
- Trash
- VimPilot
- ChefPilot
- Mouse
- Meat
- type: Respirator
@@ -2264,17 +2271,10 @@
tags:
- DoorBumpOpener
- FootstepSound
- type: Tool # Open door from xeno.yml.
- type: Prying # Open door from xeno.yml.
pryPowered: true
force: true
speedModifier: 1.5
qualities:
- Prying
useSound:
path: /Audio/Items/crowbar.ogg
- type: Prying
pryPowered: !type:Bool
true
force: !type:Bool
true
useSound:
path: /Audio/Items/crowbar.ogg
- type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 4 damage a minute from base.yml.
@@ -2306,6 +2306,7 @@
makeSentient: true
name: ghost-role-information-giant-spider-name
description: ghost-role-information-giant-spider-description
rules: ghost-role-information-giant-spider-rules
raffle:
settings: short
- type: GhostTakeoverAvailable
@@ -3085,6 +3086,7 @@
allowMovement: true
name: ghost-role-information-hamster-name
description: ghost-role-information-hamster-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Speech
speechVerb: SmallMob
@@ -3176,6 +3178,7 @@
- type: Tag
tags:
- VimPilot
- ChefPilot
- Trash
- Hamster
- Meat

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

@@ -10,6 +10,7 @@
makeSentient: true
name: ghost-role-information-behonker-name
description: ghost-role-information-behonker-description
rules: ghost-role-information-antagonist-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

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

@@ -163,6 +163,7 @@
makeSentient: true
name: ghost-role-information-sentient-carp-name
description: ghost-role-information-sentient-carp-description
rules: ghost-role-information-space-dragon-summoned-carp-rules
raffle:
settings: short
- type: GhostTakeoverAvailable

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

@@ -232,6 +232,7 @@
- type: GhostRole
prob: 0
description: ghost-role-information-angry-slimes-description
rules: ghost-role-information-angry-slimes-rules
raffle:
settings: short
- type: NpcFactionMember

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

@@ -12,6 +12,7 @@
makeSentient: true
name: ghost-role-information-hellspawn-name
description: ghost-role-information-hellspawn-description
rules: ghost-role-information-antagonist-rules
raffle:
settings: default
- type: RotationVisuals

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

@@ -572,6 +572,7 @@
allowMovement: true
name: ghost-role-information-hamlet-name
description: ghost-role-information-hamlet-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: InteractionPopup
successChance: 1
@@ -593,6 +594,7 @@
- CannotSuicide
- Hamster
- VimPilot
- ChefPilot
- type: entity
name: Shiva
@@ -685,6 +687,7 @@
prob: 0.25
name: ghost-role-information-willow-name
description: ghost-role-information-willow-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Loadout
prototypes: [ BoxingKangarooGear ]
@@ -755,6 +758,7 @@
- type: GhostRole
name: ghost-role-information-smile-name
description: ghost-role-information-smile-description
rules: ghost-role-information-nonantagonist-rules
- type: Grammar
attributes:
proper: true
@@ -773,6 +777,7 @@
allowMovement: true
name: ghost-role-information-punpun-name
description: ghost-role-information-punpun-description
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Butcherable
butcheringType: Spike
@@ -806,6 +811,7 @@
# allowMovement: true
# name: ghost-role-information-tropico-name
# description: ghost-role-information-tropico-description
# rules: ghost-role-information-nonantagonist-rules
# - type: GhostTakeoverAvailable
- type: Tag
tags:

2
Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
View File

@@ -89,7 +89,7 @@
makeSentient: true
name: ghost-role-information-rat-king-name
description: ghost-role-information-rat-king-description
rules: ghost-role-information-rat-king-rules
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

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

@@ -55,7 +55,7 @@
makeSentient: true
name: ghost-role-information-revenant-name
description: ghost-role-information-revenant-description
rules: ghost-role-information-revenant-rules
rules: ghost-role-information-antagonist-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

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

@@ -156,6 +156,7 @@
makeSentient: true
name: ghost-role-information-honkbot-name
description: ghost-role-information-honkbot-description
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -183,6 +184,7 @@
makeSentient: true
name: ghost-role-information-jonkbot-name
description: ghost-role-information-jonkbot-description
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: InteractionPopup
@@ -315,6 +317,7 @@
makeSentient: true
name: ghost-role-information-mimebot-name
description: ghost-role-information-mimebot-description
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -338,6 +341,7 @@
makeSentient: true
name: ghost-role-information-supplybot-name
description: ghost-role-information-supplybot-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

4
Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
View File

@@ -127,6 +127,7 @@
makeSentient: true
name: ghost-role-information-slimes-name
description: ghost-role-information-slimes-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Speech
@@ -200,6 +201,7 @@
- SimpleHostile
- type: GhostRole
description: ghost-role-information-angry-slimes-description
rules: ghost-role-information-angry-slimes-rules
raffle:
settings: short
@@ -237,6 +239,7 @@
- SimpleHostile
- type: GhostRole
description: ghost-role-information-angry-slimes-description
rules: ghost-role-information-angry-slimes-rules
raffle:
settings: short
@@ -274,5 +277,6 @@
- SimpleHostile
- type: GhostRole
description: ghost-role-information-angry-slimes-description
rules: ghost-role-information-angry-slimes-rules
raffle:
settings: short

11
Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
View File

@@ -21,15 +21,10 @@
true
NavSmash: !type:Bool
true
- type: Tool
speedModifier: 1.5
qualities:
- Prying
- type: Prying
pryPowered: !type:Bool
true
force: !type:Bool
true
pryPowered: true
force: true
speedModifier: 1.5
useSound:
path: /Audio/Items/crowbar.ogg
- type: Reactive

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

@@ -14,6 +14,7 @@
makeSentient: true
name: ghost-role-information-space-dragon-name
description: ghost-role-information-space-dragon-description
rules: ghost-role-information-space-dragon-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -142,7 +143,6 @@
- type: entity
parent: BaseMobDragon
id: MobDragon
suffix: No role or objectives
components:
- type: Dragon
spawnRiftAction: ActionSpawnRift
@@ -180,6 +180,7 @@
components:
- type: GhostRole
description: ghost-role-information-space-dragon-dungeon-description
rules: ghost-role-information-space-dragon-dungeon-rules
raffle:
settings: default
- type: SlowOnDamage

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

@@ -10,7 +10,7 @@
allowSpeech: true
name: ghost-role-information-remilia-name
description: ghost-role-information-remilia-description
rules: ghost-role-information-remilia-rules
rules: ghost-role-information-familiar-rules
- type: GhostTakeoverAvailable
- type: Grammar
attributes:
@@ -43,7 +43,7 @@
allowSpeech: true
name: ghost-role-information-cerberus-name
description: ghost-role-information-cerberus-description
rules: ghost-role-information-cerberus-rules
rules: ghost-role-information-familiar-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

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

@@ -13,6 +13,7 @@
makeSentient: true
name: ghost-role-information-guardian-name
description: ghost-role-information-guardian-description
rules: ghost-role-information-familiar-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -122,6 +123,7 @@
makeSentient: true
name: ghost-role-information-holoparasite-name
description: ghost-role-information-holoparasite-description
rules: ghost-role-information-familiar-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -154,6 +156,7 @@
makeSentient: true
name: ghost-role-information-ifrit-name
description: ghost-role-information-ifrit-description
rules: ghost-role-information-familiar-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -182,6 +185,7 @@
makeSentient: true
name: ghost-role-information-holoclown-name
description: ghost-role-information-holoclown-description
rules: ghost-role-information-familiar-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

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

@@ -12,7 +12,7 @@
parent: EventHumanoid
components:
- type: MindShield
- type: InitialInfectedExempt
- type: AntagImmune
## Death Squad
@@ -30,16 +30,16 @@
- NamesLastMilitary
- type: RandomHumanoidSpawner
settings: DeathSquad
- type: InitialInfectedExempt
- type: randomHumanoidSettings
id: DeathSquad
parent: EventHumanoidMindShielded
randomizeName: false
components:
components:
- type: GhostRole
name: ghost-role-information-Death-Squad-name
description: ghost-role-information-Death-Squad-description
rules: ghost-role-information-Death-Squad-rules
raffle:
settings: short
- type: Loadout
@@ -66,7 +66,6 @@
- NamesLastMilitary
- type: RandomHumanoidSpawner
settings: ERTLeader
- type: InitialInfectedExempt
- type: randomHumanoidSettings
id: ERTLeader
@@ -76,6 +75,7 @@
- type: GhostRole
name: ghost-role-information-ert-leader-name
description: ghost-role-information-ert-leader-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -96,7 +96,6 @@
state: ertleadereva
- type: RandomHumanoidSpawner
settings: ERTLeaderEVA
- type: InitialInfectedExempt
- type: randomHumanoidSettings
id: ERTLeaderEVA
@@ -105,6 +104,7 @@
- type: GhostRole
name: ghost-role-information-ert-leader-name
description: ghost-role-information-ert-leader-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -117,7 +117,6 @@
components:
- type: RandomHumanoidSpawner
settings: ERTLeaderEVALecter
- type: InitialInfectedExempt
- type: randomHumanoidSettings
id: ERTLeaderEVALecter
@@ -126,6 +125,7 @@
- type: GhostRole
name: ghost-role-information-ert-leader-name
description: ghost-role-information-ert-leader-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -156,6 +156,7 @@
- type: GhostRole
name: ghost-role-information-ert-chaplain-name
description: ghost-role-information-ert-chaplain-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: RandomMetadata
@@ -184,6 +185,7 @@
- type: GhostRole
name: ghost-role-information-ert-chaplain-name
description: ghost-role-information-ert-chaplain-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -214,6 +216,7 @@
- type: GhostRole
name: ghost-role-information-ert-janitor-name
description: ghost-role-information-ert-janitor-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: RandomMetadata
@@ -242,6 +245,7 @@
- type: GhostRole
name: ghost-role-information-ert-janitor-name
description: ghost-role-information-ert-janitor-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -272,6 +276,7 @@
- type: GhostRole
name: ghost-role-information-ert-engineer-name
description: ghost-role-information-ert-engineer-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: RandomMetadata
@@ -300,6 +305,7 @@
- type: GhostRole
name: ghost-role-information-ert-engineer-name
description: ghost-role-information-ert-engineer-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -330,6 +336,7 @@
- type: GhostRole
name: ghost-role-information-ert-security-name
description: ghost-role-information-ert-security-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: RandomMetadata
@@ -358,6 +365,7 @@
- type: GhostRole
name: ghost-role-information-ert-security-name
description: ghost-role-information-ert-security-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -378,6 +386,7 @@
- type: GhostRole
name: ghost-role-information-ert-security-name
description: ghost-role-information-ert-security-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -408,6 +417,7 @@
- type: GhostRole
name: ghost-role-information-ert-medical-name
description: ghost-role-information-ert-medical-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: RandomMetadata
@@ -436,6 +446,7 @@
- type: GhostRole
name: ghost-role-information-ert-medical-name
description: ghost-role-information-ert-medical-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -453,7 +464,6 @@
state: cburn
- type: RandomHumanoidSpawner
settings: CBURNAgent
- type: InitialInfectedExempt
- type: randomHumanoidSettings
id: CBURNAgent
@@ -464,12 +474,14 @@
- type: GhostRole
name: ghost-role-information-cburn-agent-name
description: ghost-role-information-cburn-agent-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: RandomMetadata
nameSegments:
- NamesFirstMilitary
- NamesLastMilitary
## Central Command
- type: entity
@@ -481,7 +493,6 @@
state: centcom
- type: RandomHumanoidSpawner
settings: CentcomOfficial
- type: InitialInfectedExempt
- type: randomHumanoidSettings
id: CentcomOfficial
@@ -490,6 +501,7 @@
- type: GhostRole
name: ghost-role-information-centcom-official-name
description: ghost-role-information-centcom-official-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: default
- type: Loadout
@@ -557,6 +569,7 @@
- type: GhostRole
name: ghost-role-information-cluwne-name
description: ghost-role-information-cluwne-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: default
- type: Cluwne
@@ -598,7 +611,7 @@
- type: GhostRole
name: ghost-role-information-lost-cargo-technical-name
description: ghost-role-information-lost-cargo-technical-description
rules: ghost-role-information-lost-cargo-technical-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -649,7 +662,7 @@
- type: GhostRole
name: ghost-role-information-clown-troupe-name
description: ghost-role-information-clown-troupe-description
rules: ghost-role-information-clown-troupe-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -699,7 +712,7 @@
- type: GhostRole
name: ghost-role-information-traveling-chef-name
description: ghost-role-information-traveling-chef-description
rules: ghost-role-information-traveling-chef-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout
@@ -759,7 +772,7 @@
- type: GhostRole
name: ghost-role-information-disaster-victim-name
description: ghost-role-information-disaster-victim-description
rules: ghost-role-information-disaster-victim-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: default
@@ -820,7 +833,7 @@
- type: GhostRole
name: ghost-role-information-syndie-disaster-victim-name
description: ghost-role-information-syndie-disaster-victim-description
rules: ghost-role-information-syndie-disaster-victim-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: Loadout

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

@@ -17,6 +17,7 @@
- type: GhostRole
name: ghost-role-information-skeleton-pirate-name
description: ghost-role-information-skeleton-pirate-description
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -33,6 +34,7 @@
- type: GhostRole
name: ghost-role-information-skeleton-biker-name
description: ghost-role-information-skeleton-biker-description
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
@@ -48,6 +50,7 @@
- type: GhostRole
name: ghost-role-information-closet-skeleton-name
description: ghost-role-information-closet-skeleton-description
rules: ghost-role-information-freeagent-rules
raffle:
settings: default
- type: GhostTakeoverAvailable

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

@@ -7,6 +7,8 @@
components:
- type: HumanoidAppearance
species: Moth
hideLayersOnEquip:
- HeadTop
- type: Hunger
- type: Thirst
- type: Icon

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

@@ -7,6 +7,10 @@
components:
- type: HumanoidAppearance
species: Reptilian
hideLayersOnEquip:
- Snout
- HeadTop
- HeadSide
- type: Hunger
- type: Puller
needsHands: false

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

@@ -2328,44 +2328,6 @@
- type: Sprite
sprite: Objects/Consumable/Drinks/shake-white.rsi
- type: entity
parent: DrinkGlassBase
id: DrinkRamen
name: cup ramen
description: Just add 10ml boiling water. A taste that reminds you of your school years.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 40 #big cup
reagents:
- ReagentId: DryRamen
Quantity: 25
- ReagentId: Soysauce
Quantity: 5
- type: Sprite
sprite: Objects/Consumable/Drinks/ramen.rsi
- type: Tag
tags:
- Trash
- type: SpaceGarbage
- type: entity
parent: DrinkRamen
id: DrinkHellRamen
name: hell ramen
description: Just add 10ml boiling water. Super spicy flavor.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 40
reagents:
- ReagentId: DryRamen
Quantity: 25
- ReagentId: CapsaicinOil
Quantity: 5
- type: entity
parent: DrinkGlass
id: DrinkBloodGlass

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

@@ -818,7 +818,7 @@
name: ghost-role-information-BreadDog-name
allowMovement: true
description: ghost-role-information-BreadDog-description
rules: ghost-role-information-BreadDog-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: GhostTakeoverAvailable

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

@@ -699,7 +699,7 @@
name: ghost-role-information-Cak-name
allowMovement: true
description: ghost-role-information-Cak-description
rules: ghost-role-information-Cak-rules
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: short
- type: GhostTakeoverAvailable

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

@@ -272,6 +272,46 @@
- type: Food
trash: FoodPacketSyndiTrash
- type: entity
parent: FoodSnackBase
id: DrinkRamen
name: cup ramen
description: A cheap food with a taste that reminds you of your school years.
components:
- type: RefillableSolution
solution: food
- type: InjectableSolution
solution: food
- type: SolutionContainerManager
solutions:
food:
maxVol: 50 #big cup
reagents:
- ReagentId: DryRamen
Quantity: 30
- ReagentId: Soysauce
Quantity: 5
- type: Sprite
state: ramen
- type: Food
trash: FoodPacketCupRamenTrash
- type: entity
parent: DrinkRamen
id: DrinkHellRamen
name: hell ramen
description: Super spicy flavor!
components:
- type: SolutionContainerManager
solutions:
food:
maxVol: 50
reagents:
- ReagentId: DryRamen
Quantity: 30
- ReagentId: CapsaicinOil
Quantity: 5
- type: entity
name: chow mein
parent: FoodSnackBase
@@ -573,6 +613,15 @@
- type: Sprite
state: syndicakes-trash
- type: entity
noSpawn: true
parent: FoodPacketTrash
id: FoodPacketCupRamenTrash
name: empty cup ramen
components:
- type: Sprite
state: ramen
- type: entity
noSpawn: true
parent: FoodPacketTrash

2
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
View File

@@ -191,7 +191,7 @@
- type: StorageFill
contents:
- id: CigaretteSyndicate
amount: 5
amount: 10
- type: entity
id: CigPackMixedMedical

6
Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
View File

@@ -79,9 +79,9 @@
suffix: NukeOps
components:
- type: GhostRole
name: Syndicate Assault Cyborg
description: Nuclear operatives needs reinforcements. You, a cold silicon killing machine, will help them.
rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them.
name: ghost-role-information-syndie-assaultborg-name
description: ghost-role-information-syndie-assaultborg-description
rules: ghost-role-information-silicon-rules
raffle:
settings: default
- type: GhostRoleMobSpawner

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

@@ -37,6 +37,7 @@
beginSearchingText: pai-system-searching
roleName: pai-system-role-name
roleDescription: pai-system-role-description
roleRules: ghost-role-information-familiar-rules
wipeVerbText: pai-system-wipe-device-verb-text
wipeVerbPopup: pai-system-wiped-device
stopSearchVerbText: pai-system-stop-searching-verb-text
@@ -89,6 +90,7 @@
- type: ToggleableGhostRole
roleName: pai-system-role-name-syndicate
roleDescription: pai-system-role-description-syndicate
roleRules: ghost-role-information-familiar-rules
- type: IntrinsicRadioTransmitter
channels:
- Syndicate
@@ -120,6 +122,7 @@
- type: ToggleableGhostRole
roleName: pai-system-role-name-potato
roleDescription: pai-system-role-description-potato
roleRules: ghost-role-information-familiar-rules
- type: Appearance
- type: GenericVisualizer
visuals:

33
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -75,3 +75,36 @@
- type: VaporVisuals
animationTime: 0.8
animationState: extinguish
- type: entity
name: pocket fire extinguisher
parent: FireExtinguisher
id: FireExtinguisherMini
description: A light and compact fibreglass-framed model fire extinguisher. It holds less water then its bigger brother.
components:
- type: Sprite
sprite: Objects/Misc/fire_extinguisher_mini.rsi
layers:
- state: fire_extinguisher_closed
map: [ "enabled" ]
- type: Item
sprite: Objects/Misc/fire_extinguisher_mini.rsi
size: Small
- type: SolutionContainerManager
solutions:
spray:
maxVol: 30
reagents:
- ReagentId: Water
Quantity: 30
- type: MeleeWeapon
wideAnimationRotation: 180
damage:
types:
Blunt: 3 #completely ineffective; your fists are better
soundHit:
path: /Audio/Effects/weak_hit1.ogg
- type: PhysicalComposition
materialComposition:
Steel: 50
Glass: 40

15
Resources/Prototypes/Entities/Objects/Misc/monkeycube.yml
View File

@@ -7,10 +7,7 @@
- type: StorageFill
contents:
- id: MonkeyCubeWrapped
amount: 6
- type: Storage
grid:
- 0,0,2,1
amount: 8
- type: Sprite
sprite: Objects/Misc/monkeycube.rsi
state: box
@@ -45,7 +42,7 @@
- type: StorageFill
contents:
- id: KoboldCubeWrapped
amount: 6
amount: 8
- type: Sprite
sprite: Objects/Misc/monkeycube.rsi
state: box_kobold
@@ -59,9 +56,9 @@
- type: StorageFill
contents:
- id: KoboldCubeWrapped
amount: 3
amount: 4
- id: MonkeyCubeWrapped
amount: 3
amount: 4
- type: Sprite
sprite: Objects/Misc/monkeycube.rsi
state: box_variant
@@ -89,10 +86,6 @@
id: SyndicateSpongeBox
description: Drymate brand monkey cubes. Just add water!
components:
- type: Storage
whitelist:
tags:
- MonkeyCube
- type: StorageFill
contents:
- id: SyndicateSpongeWrapped

30
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
View File

@@ -248,6 +248,36 @@
Blunt: 3
- type: Plunger
- type: entity
name: golden plunger
id: GoldenPlunger
parent: Plunger
description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains.
components:
- type: Sprite
sprite: Objects/Specific/Janitorial/golden_plunger.rsi
state: plunger
- type: Item
sprite: Objects/Specific/Janitorial/golden_plunger.rsi
heldPrefix: plunger
- type: Clothing
sprite: Objects/Specific/Janitorial/golden_plunger.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.15625"
- type: PointLight
radius: 1.5
energy: 0.75
color: "#ffc20e"
- type: PhysicalComposition
materialComposition:
Plastic: 50
Gold: 10
Wood: 25
- type: weightedRandomEntity
id: PlungerLoot
weights:

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

@@ -84,6 +84,7 @@
beginSearchingText: positronic-brain-searching
roleName: positronic-brain-role-name
roleDescription: positronic-brain-role-description
roleRules: ghost-role-information-silicon-rules
wipeVerbText: positronic-brain-wipe-device-verb-text
wipeVerbPopup: positronic-brain-wiped-device
stopSearchVerbText: positronic-brain-stop-searching-verb-text

72
Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
View File

@@ -85,7 +85,8 @@
- type: entity
parent: Jug
name: jug (carbon)
name: jug
suffix: carbon
id: JugCarbon
noSpawn: true
components:
@@ -100,7 +101,8 @@
- type: entity
parent: Jug
name: jug (iodine)
name: jug
suffix: iodine
id: JugIodine
noSpawn: true
components:
@@ -115,7 +117,8 @@
- type: entity
parent: Jug
name: jug (fluorine)
name: jug
suffix: fluorine
id: JugFluorine
noSpawn: true
components:
@@ -130,7 +133,8 @@
- type: entity
parent: Jug
name: jug (chlorine)
name: jug
suffix: chlorine
id: JugChlorine
noSpawn: true
components:
@@ -145,7 +149,8 @@
- type: entity
parent: Jug
name: jug (aluminium)
name: jug
suffix: aluminium
id: JugAluminium
noSpawn: true
components:
@@ -160,7 +165,8 @@
- type: entity
parent: Jug
name: jug (phosphorus)
name: jug
suffix: phosphorus
id: JugPhosphorus
noSpawn: true
components:
@@ -175,7 +181,8 @@
- type: entity
parent: Jug
name: jug (sulfur)
name: jug
suffix: sulfur
id: JugSulfur
noSpawn: true
components:
@@ -190,7 +197,8 @@
- type: entity
parent: Jug
name: jug (silicon)
name: jug
suffix: silicon
id: JugSilicon
noSpawn: true
components:
@@ -205,7 +213,8 @@
- type: entity
parent: Jug
name: jug (hydrogen)
name: jug
suffix: hydrogen
id: JugHydrogen
noSpawn: true
components:
@@ -220,7 +229,8 @@
- type: entity
parent: Jug
name: jug (lithium)
name: jug
suffix: lithium
id: JugLithium
noSpawn: true
components:
@@ -235,7 +245,8 @@
- type: entity
parent: Jug
name: jug (sodium)
name: jug
suffix: sodium
id: JugSodium
noSpawn: true
components:
@@ -250,7 +261,8 @@
- type: entity
parent: Jug
name: jug (potassium)
name: jug
suffix: potassium
id: JugPotassium
noSpawn: true
components:
@@ -265,7 +277,8 @@
- type: entity
parent: Jug
name: jug (radium)
name: jug
suffix: radium
id: JugRadium
noSpawn: true
components:
@@ -280,7 +293,8 @@
- type: entity
parent: Jug
name: jug (iron)
name: jug
suffix: iron
id: JugIron
noSpawn: true
components:
@@ -295,7 +309,8 @@
- type: entity
parent: Jug
name: jug (copper)
name: jug
suffix: copper
id: JugCopper
noSpawn: true
components:
@@ -310,7 +325,8 @@
- type: entity
parent: Jug
name: jug (gold)
name: jug
suffix: gold
id: JugGold
noSpawn: true
components:
@@ -325,7 +341,8 @@
- type: entity
parent: Jug
name: jug (mercury)
name: jug
suffix: mercury
id: JugMercury
noSpawn: true
components:
@@ -340,7 +357,8 @@
- type: entity
parent: Jug
name: jug (silver)
name: jug
suffix: silver
id: JugSilver
noSpawn: true
components:
@@ -355,7 +373,8 @@
- type: entity
parent: Jug
name: jug (ethanol)
name: jug
suffix: ethanol
id: JugEthanol
noSpawn: true
components:
@@ -370,7 +389,8 @@
- type: entity
parent: Jug
name: jug (sugar)
name: jug
suffix: sugar
id: JugSugar
noSpawn: true
components:
@@ -385,7 +405,8 @@
- type: entity
parent: Jug
name: jug (nitrogen)
name: jug
suffix: nitrogen
id: JugNitrogen
noSpawn: true
components:
@@ -400,7 +421,8 @@
- type: entity
parent: Jug
name: jug (oxygen)
name: jug
suffix: oxygen
id: JugOxygen
noSpawn: true
components:
@@ -415,7 +437,8 @@
- type: entity
parent: Jug
name: jug (Plant-B-Gone)
name: jug
suffix: Plant-B-Gone
id: JugPlantBGone
noSpawn: true
components:
@@ -430,7 +453,8 @@
- type: entity
parent: Jug
name: jug (welding fuel)
name: jug
suffix: welding fuel
id: JugWeldingFuel
noSpawn: true
components:

2
Resources/Prototypes/Entities/Objects/Tools/bucket.yml
View File

@@ -45,6 +45,8 @@
Blunt: 0
- type: Spillable
solution: bucket
- type: SpillWhenWorn
solution: bucket
- type: DrawableSolution
solution: bucket
- type: RefillableSolution

5
Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
View File

@@ -91,11 +91,10 @@
- type: Tool
qualities:
- Prying
useSound:
path: /Audio/Items/crowbar.ogg
speedModifier: 0.05
- type: ToolTileCompatible
delay: 10
- type: Prying
speedModifier: 0.05
- type: entity
name: mooltitool

8
Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
View File

@@ -18,15 +18,15 @@
slots:
- Belt
- type: ToolTileCompatible
delay: 0.5
- type: Tool
qualities:
- Prying
speedModifier: 1.5
useSound: /Audio/Items/jaws_pry.ogg
- type: Prying
speedModifier: 1.5
pryPowered: true
useSound: /Audio/Items/jaws_pry.ogg
- type: ToolForcePowered
- type: MultipleTool
statusShowBehavior: true
entries:
@@ -66,9 +66,7 @@
right:
- state: syn_inhand-right
size: Normal
- type: Tool
qualities:
- Prying
- type: Prying
speedModifier: 3.0
- type: MultipleTool
entries:

12
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/toy.yml Normal file
View File

@@ -0,0 +1,12 @@
- type: entity
parent: MagazineLightRifleBox # It goes in a saw, its funny.
id: MagazineFoamBox
name: ammunition box (foam)
components:
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- BulletFoam
proto: BulletFoam
capacity: 100

36
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/toy.yml
View File

@@ -4,12 +4,30 @@
name: foam dart
parent: BaseItem
components:
- type: Tag
tags:
- BulletFoam
- Trash
- type: Ammo
- type: Sprite
sprite: Objects/Fun/toys.rsi
layers:
- state: foamdart
- type: Fixtures
fixtures:
fix1:
shape: !type:PolygonShape
vertices:
- -0.05,-0.15
- -0.05,0.25
- 0.05,-0.15
- 0.05,0.25
density: 20
mask:
- ItemMask
restitution: 0.3
friction: 0.2
- type: Tag
tags:
- BulletFoam
- Trash
- type: Ammo
- type: Sprite
sprite: Objects/Fun/toys.rsi
layers:
- state: foamdart
- type: EmbeddableProjectile
removalTime: .2
- type: ThrowingAngle
angle: 180

30
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

@@ -186,3 +186,33 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: entity
name: Foam Force Astro Ace
parent: [BaseWeaponShotgun, BaseGunWieldable]
id: WeaponRifleFoam
description: A premium foam rifle of the highest quality. Its plastic feels rugged, and its mechanisms sturdy.
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
- type: Clothing
sprite: Objects/Weapons/Guns/Rifles/foam_rifle.rsi
- type: Item
sprite: Objects/Weapons/Guns/Rifles/foam_rifle_inhand_64x.rsi
- type: BallisticAmmoProvider
whitelist:
tags:
- BulletFoam
capacity: 10
proto: BulletFoam
- type: GunRequiresWield #remove when inaccuracy on spreads is fixed
- type: Gun
fireRate: 2
selectedMode: SemiAuto
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Effects/thunk.ogg
soundEmpty:
path: /Audio/Weapons/Guns/Empty/empty.ogg
clumsyProof: true

3
Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml
View File

@@ -18,7 +18,4 @@
- type: Item
size: Normal
sprite: Objects/Weapons/Melee/armblade.rsi
- type: Tool
qualities:
- Prying
- type: Prying

3
Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
View File

@@ -62,9 +62,6 @@
- type: Item
size: Ginormous
- type: DisarmMalus
- type: Tool
qualities:
- Prying
- type: Prying
- type: entity

19
Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
View File

@@ -241,3 +241,22 @@
- type: ContainerContainer
containers:
cluster-payload: !type:Container
- type: entity
parent: GrenadeShrapnel
id: GrenadeFoamDart
name: foam dart grenade
description: Releases a bothersome spray of foam darts that cause severe welching.
components:
- type: Sprite
sprite: Objects/Weapons/Grenades/foamdart.rsi
layers:
- state: icon
map: ["Base"]
- state: primed
map: ["enum.TriggerVisualLayers.Base"]
- type: ClusterGrenade
fillPrototype: BulletFoam
maxGrenadesCount: 30
grenadeType: enum.GrenadeType.Throw
velocity: 70

6
Resources/Prototypes/Entities/Stations/base.yml
View File

@@ -4,12 +4,6 @@
components:
- type: StationData
- type: entity
id: BaseRandomStation
abstract: true
components:
- type: StationRandomTransform
- type: entity
id: BaseStationCargo
abstract: true

1
Resources/Prototypes/Entities/Stations/nanotrasen.yml
View File

@@ -25,7 +25,6 @@
- BaseStationSiliconLawCrewsimov
- BaseStationAllEventsEligible
- BaseStationNanotrasen
- BaseRandomStation
noSpawn: true
components:
- type: Transform

2
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
View File

@@ -357,6 +357,8 @@
components:
- type: Foldable
folded: true
- type: Strap
enabled: False
- type: entity
name: steel bench

1
Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
View File

@@ -73,6 +73,7 @@
orGroup: dressermainloot
- id: ClothingUniformJumpskirtColorPink
prob: 0.05
orGroup: dresserthirdloot
- id: ClothingUniformJumpsuitLoungewear
prob: 0.05
orGroup: dressermainloot

6
Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
View File

@@ -79,6 +79,8 @@
components:
- type: Foldable
folded: true
- type: Strap
enabled: False
- type: entity
id: CheapRollerBed
@@ -105,6 +107,8 @@
components:
- type: Foldable
folded: true
- type: Strap
enabled: False
- type: entity
id: EmergencyRollerBed
@@ -131,3 +135,5 @@
components:
- type: Foldable
folded: true
- type: Strap
enabled: False

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

@@ -196,6 +196,8 @@
- WeaponCapacitorRechargerCircuitboard
- HandheldStationMap
- ClothingHeadHatWelding
- WetFloorSign
- ClothingHeadHatCone
- type: EmagLatheRecipes
emagStaticRecipes:
- BoxLethalshot

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

@@ -59,3 +59,4 @@
- type: GuideHelp
guides:
- Medical Doctor
- type: PowerSwitch

8
Resources/Prototypes/Entities/Structures/conveyor.yml
View File

@@ -24,10 +24,10 @@
conveyor:
shape: !type:PolygonShape
vertices:
- -0.55,-0.55
- 0.55,-0.55
- 0.55,0.55
- -0.55,0.55
- -0.49,-0.49
- 0.49,-0.49
- 0.49,0.49
- -0.49,0.49
layer:
- Impassable
- MidImpassable