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-08-07-2025-upstream

Browse Source 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
This commit is contained in:
Ed
2025-07-08 00:40:30 +03:00
parent e7b73354ab 2181585030
commit 7a8326d41e
920 changed files with 19950 additions and 9262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Resources/Prototypes/Accents/full_replacements.yml
View File

@@ -183,3 +183,27 @@
- accent-words-tomato-3
- accent-words-tomato-4
- accent-words-tomato-5
- type: accent
id: scurret
fullReplacements:
- accent-words-scurret-1
- accent-words-scurret-2
- accent-words-scurret-3
- accent-words-scurret-4
- accent-words-scurret-5
- accent-words-scurret-6
- accent-words-scurret-7
- accent-words-scurret-8
- accent-words-scurret-9
- accent-words-scurret-10
- accent-words-scurret-11
- accent-words-scurret-12
- accent-words-scurret-13
- accent-words-scurret-14
- accent-words-scurret-15
- accent-words-scurret-16
- accent-words-scurret-17
- accent-words-scurret-18
- accent-words-scurret-19
- accent-words-scurret-20

2
Resources/Prototypes/Actions/polymorph.yml
View File

@@ -4,6 +4,8 @@
name: Revert
description: Revert back into your original form.
components:
- type: ConfirmableAction
popup: revert-polymorph-action-popup
- type: InstantAction
event: !type:RevertPolymorphActionEvent

3
Resources/Prototypes/Actions/types.yml
View File

@@ -221,7 +221,7 @@
event: !type:ToggleClothingEvent
- type: entity
parent: BaseAction
parent: BaseMentalAction
id: ActionCombatModeToggle
name: "[color=red]Combat Mode[/color]"
description: Enter combat mode
@@ -369,6 +369,7 @@
iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
itemIconStyle: NoItem
useDelay: 1 # emote spam
checkCanInteract: false
- type: entity
parent: BaseAction

11
Resources/Prototypes/Alerts/revenant.yml
View File

@@ -18,12 +18,15 @@
id: AlertEssenceSpriteView
categories: [ HideSpawnMenu ]
components:
- type: GenericCounterAlert
centerGlyph: false
hideLeadingZeroes: false
- type: Sprite
sprite: /Textures/Interface/Alerts/essence_counter.rsi
layers:
- map: [ "enum.AlertVisualLayers.Base" ]
- map: [ "enum.RevenantVisualLayers.Digit1" ]
- map: [ "enum.RevenantVisualLayers.Digit2" ]
offset: 0.125, 0
- map: [ "enum.RevenantVisualLayers.Digit3" ]
- map: [ "1" ]
offset: 0.25, 0
- map: [ "10" ]
offset: 0.125, 0
- map: [ "100" ]

22
Resources/Prototypes/Body/Prototypes/a_ghost.yml
View File

@@ -1,22 +0,0 @@
- type: body
id: Aghost
name: "aghost"
root: torso
slots:
torso:
part: TorsoHuman
connections:
- right_arm
- left_arm
right_arm:
part: RightArmHuman
connections:
- right_hand
left_arm:
part: LeftArmHuman
connections:
- left_hand
right_hand:
part: RightHandHuman
left_hand:
part: LeftHandHuman

10
Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
View File

@@ -218,6 +218,16 @@
category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
id: HydratedScurret
icon:
sprite: Structures/Wallmounts/posters.rsi
state: poster55_legit
product: CrateFunScurret
cost: 25000 # You will surely not regret buying this
category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
id: FunCrateGambling
icon:

19
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
View File

@@ -458,3 +458,22 @@
amount: 1
prob: 0.05
- type: entity
name: hydrated scurret
description: Wait, what?
id: CrateFunScurret
parent: CratePlastic
components:
- type: StorageFill
contents:
- id: MobEmotionalSupportScurret # How? Why?
- id: DrinkVodkaBottleFull
- id: DrinkWhiskeyBottleFull
- id: DrinkTequilaBottleFull # ...that explains it.
- id: DrinkShotGlass
amount: 2
- id: Spear # self defence
- id: ClothingHeadHatHardhatYellow
- id: ClothingNeckMantleQM
- id: ClothingHeadsetCargo

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

@@ -43,7 +43,7 @@
- id: ClothingHeadsetAltCommand
- id: ClothingOuterArmorCaptainCarapace
- id: CommsComputerCircuitboard
- id: DoorRemoteCommand
- id: DoorRemoteCustom
- id: MedalCase
- id: NukeDisk
- id: PinpointerNuclear

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml
View File

@@ -35,7 +35,7 @@
ClothingNeckScarfStripedTrans: 2
ClothingHeadHatXmasCrown: 2
BedsheetRainbow: 2
ClothingNeckHeadphones: 2
ClothingMultipleHeadphones: 2
ClothingHeadHatFlowerWreath: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 2

14
Resources/Prototypes/Catalog/thief_toolbox_sets.yml
View File

@@ -3,7 +3,7 @@
name: thief-backpack-category-chameleon-name
description: thief-backpack-category-chameleon-description
sprite:
sprite: /Textures/Clothing/OuterClothing/Misc/black_hoodie.rsi
sprite: Objects/Devices/chameleon_projector.rsi
state: icon
content:
- ClothingBackpackChameleonFill
@@ -16,8 +16,8 @@
name: thief-backpack-category-tools-name
description: thief-backpack-category-tools-description
sprite:
sprite: Objects/Tools/jaws_of_life.rsi
state: jaws_pry
sprite: Objects/Weapons/Bombs/c4.rsi
state: icon
content:
- WelderIndustrialAdvanced
- ClothingEyesGlassesMeson
@@ -77,8 +77,8 @@
name: thief-backpack-category-communicator-name
description: thief-backpack-category-communicator-description
sprite:
sprite: Objects/Tools/spy_device.rsi
state: icon
sprite: Objects/Devices/communication.rsi
state: old-radio
content:
- EncryptionKeyStationMaster
- CyberPen
@@ -91,8 +91,8 @@
name: thief-backpack-category-smuggler-name
description: thief-backpack-category-smuggler-description
sprite:
sprite: Clothing/Neck/Cloaks/void.rsi
state: icon
sprite: Objects/Tools/fulton.rsi
state: extraction_pack
content:
- InvisibleCrate
- FultonBeacon

11
Resources/Prototypes/Datasets/Names/scurret.yml Normal file
View File

@@ -0,0 +1,11 @@
- type: localizedDataset
id: NamesFirstScurret
values:
prefix: names-scurret-first-dataset-
count: 50
- type: localizedDataset
id: NamesLastScurret
values:
prefix: names-scurret-last-dataset-
count: 50

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

@@ -2,7 +2,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeaverHat
name: beaver hat
description: 'Gentlemen?'
description: "\"Gentlemen?\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/beaver_hat.rsi
@@ -13,7 +13,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeret
name: beret
description: A beret, an artists favorite headwear.
description: An artist's favorite headwear.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret.rsi
@@ -30,7 +30,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretFrench
name: french beret
description: A French beret, "vive la France".
description: A French beret. "Vive la France!"
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_french.rsi
@@ -48,7 +48,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretSecurity
name: security beret
description: A stylish clothing option for security officers.
description: A beret with the security department's insignia. For officers that are more inclined towards style than safety.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_security.rsi
@@ -65,7 +65,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatSecurityTrooper
name: trooper hat
description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it.
description: A campaign hat for the Nanotrasen Troopers. It's supposed to come with a case, too...
components:
- type: Sprite
sprite: Clothing/Head/Hats/security_trooper_hat.rsi
@@ -108,7 +108,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretEngineering
name: engineering beret
description: A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety.
description: A beret with the engineering department's insignia. For engineers that are more inclined towards style than safety.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_engineering.rsi
@@ -125,7 +125,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretQM
name: quartermaster's beret
description: A beret with the cargo's insignia emblazoned on it. For quartermasters that are more inclined towards style.
description: A beret with the cargo department's insignia.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_qm.rsi
@@ -159,7 +159,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretWarden
name: warden's beret
description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
description: A corporate-blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_warden.rsi
@@ -181,7 +181,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretBrigmedic
name: brigmedical beret
description: White beret, looks like a cream pie on the head.
description: A white beret for brigmedics.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_brigmedic.rsi
@@ -192,7 +192,7 @@
parent: [ ClothingHeadBase ]
id: ClothingHeadHatBeretMerc
name: mercenary beret
description: Olive beret, the badge depicts a jackal on a rock.
description: An olive beret with a badge depicting a jackal on a rock.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_merc.rsi
@@ -203,7 +203,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretCommand
name: command beret
description: A beret with a Command insignia emblazoned on it. It has an aura of authority.
description: A beret with the Nanotrasen logo. It has an aura of authority.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_command.rsi
@@ -219,7 +219,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBowlerHat
name: bowler hat
description: Stylish bowler hat.
description: A stylish bowler hat.
components:
- type: Sprite
sprite: Clothing/Head/Hats/bowler_hat.rsi
@@ -230,7 +230,7 @@
parent: [ClothingHeadBase, BaseCommandContraband]
id: ClothingHeadHatCaptain
name: captain's hardhat
description: It's good being the king.
description: Feels good being the king.
components:
- type: Sprite
sprite: Clothing/Head/Hats/captain.rsi
@@ -262,7 +262,7 @@
parent: [ ClothingHeadBase, BaseCentcommContraband ]
id: ClothingHeadHatCentcom
name: CentComm brand hat
description: "It's good to be the emperor."
description: Feels good being the king's boss.
components:
- type: Sprite
sprite: Clothing/Head/Hats/centcom.rsi
@@ -273,7 +273,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatChef
name: chef's hat
description: "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
description: A hat used by chefs to keep their hair out of your food. Judging by the food in the mess, they don't work.
components:
- type: Sprite
sprite: Clothing/Head/Hats/chefhat.rsi
@@ -304,7 +304,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatFedoraBrown
name: brown fedora
description: It's a brown fedora.
description: A brown fedora.
components:
- type: Sprite
sprite: Clothing/Head/Hats/brownfedora.rsi
@@ -321,7 +321,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatFedoraGrey
name: grey fedora
description: It's a grey fedora.
description: A grey fedora.
components:
- type: Sprite
sprite: Clothing/Head/Hats/greyfedora.rsi
@@ -343,7 +343,7 @@
parent: [ClothingHeadBase, BaseCommandContraband]
id: ClothingHeadHatHopcap
name: head of personnel's cap
description: A grand, stylish head of personnel's cap.
description: A stylish cap worn by the Head of Personnel. Shows paperwork who's in charge.
components:
- type: Sprite
sprite: Clothing/Head/Hats/hopcap.rsi
@@ -360,7 +360,7 @@
parent: [ClothingHeadBase, BaseCommandContraband]
id: ClothingHeadHatHoshat
name: head of security cap
description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge.
description: A stylish cap worn by the Head of Security. Shows the officers who's in charge.
components:
- type: Sprite
sprite: Clothing/Head/Hats/hoshat.rsi
@@ -412,7 +412,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatPirate
name: pirate hat
description: 'Yo ho ho and a bottle of rum!'
description: "\"Yo ho ho and a bottle of rum!\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/pirate.rsi
@@ -444,7 +444,7 @@
parent: ClothingHeadHatWizardBase
id: ClothingHeadHatRedwizard
name: red wizard hat
description: Strange-looking red hat-wear that most certainly belongs to a real magic user.
description: A strange-looking red hat that most certainly belongs to a powerful magic-user.
components:
- type: Sprite
sprite: Clothing/Head/Hats/redwizard.rsi
@@ -491,7 +491,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatSombrero
name: sombrero
description: "Perfectly for Space Mexico, si?"
description: "\"Perfect for Space Mexico, si?\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/sombrero.rsi
@@ -576,7 +576,7 @@
parent: [ClothingHeadBase, BaseFoldable]
id: ClothingHeadHatUshanka
name: ushanka
description: "Perfect for winter in Siberia, da?"
description: "\"Perfect for winter in Siberia, da?\""
components:
- type: Clothing
sprite: Clothing/Head/Hats/ushanka.rsi
@@ -639,7 +639,7 @@
parent: ClothingHeadHatWizardBase
id: ClothingHeadHatVioletwizard
name: violet wizard hat
description: "Strange-looking violet hat-wear that most certainly belongs to a real magic user."
description: A strange-looking violet hat that most certainly belongs to a powerful magic-user.
components:
- type: Sprite
sprite: Clothing/Head/Hats/violetwizard.rsi
@@ -655,7 +655,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatWarden
name: warden's cap
description: A police officer's Hat. This hat emphasizes that you are THE LAW
description: This hat emphasizes that you are THE LAW.
components:
- type: Sprite
sprite: Clothing/Head/Hats/warden.rsi
@@ -688,7 +688,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatWizardFake
name: fake wizard hat
description: It has WIZZARD written across it in sequins. Comes with a cool beard.
description: It has "WIZZARD" written across it in garish sequins. Comes with a cool beard.
components:
- type: Sprite
sprite: Clothing/Head/Hats/wizard_fake.rsi
@@ -711,7 +711,7 @@
parent: ClothingHeadHatWizardBase
id: ClothingHeadHatWizard
name: wizard hat
description: Strange-looking blue hat-wear that most certainly belongs to a powerful magic user.
description: A strange-looking blue hat that most certainly belongs to a powerful magic-user.
components:
- type: Sprite
sprite: Clothing/Head/Hats/wizardhat.rsi
@@ -729,7 +729,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatXmasCrown
name: xmas crown
description: 'Happy Christmas!'
description: "\"Happy Christmas!\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/xmascrown.rsi
@@ -740,7 +740,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatTrucker
name: trucker hat
description: Formerly Chucks, this hat is yours now.
description: Formerly Chuck's, this hat is yours now.
components:
- type: Sprite
sprite: Clothing/Head/Hats/truckershat.rsi
@@ -799,7 +799,7 @@
parent: ClothingHeadBase
id: ClothingHeadPaperSack
name: papersack hat
description: A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness.
description: A paper sack with crude holes cut out for eyes. Useful for hiding one's identity and/or ugliness.
components:
- type: Sprite
sprite: Clothing/Head/Hats/papersack.rsi
@@ -833,7 +833,7 @@
parent: ClothingHeadBase
id: ClothingHeadFishCap
name: fishing cap
description: Women fear me. Fish fear me. Men turn their eyes away from me. As I walk no beast dares make a sound in my presence. I am alone on this barren Earth.
description: "\"Women fear me. Fish fear me. Men turn their eyes away from me. As I walk no beast dares make a sound in my presence. I am alone on this barren Earth.\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/fishcap.rsi
@@ -844,7 +844,7 @@
parent: ClothingHeadBase
id: ClothingHeadWehcellentCap
name: wehcellent cap
description: It was a net hat! Tiders wear them all the time! It's got airholes in the back to keep a cross-breeze going and everything!
description: "\"It was a net hat! Tiders wear them all the time! It's got airholes in the back to keep a cross-breeze going and everything!\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/wehcellentcap.rsi
@@ -899,7 +899,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatJester
name: jester hat
description: A hat with bells, to add some merriness to the suit.
description: A hat with bells, to add some merriness to your head.
components:
- type: Sprite
sprite: Clothing/Head/Hats/jester.rsi
@@ -924,7 +924,7 @@
parent: [ClothingHeadBase, BaseCommandContraband]
id: ClothingHeadHatBeretCmo
name: chief medical officer's beret
description: Turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured.
description: A turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_cmo.rsi
@@ -941,7 +941,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatPirateTricord
name: pirate hat
description: 'Yo ho ho and a bottle of rum!'
description: "\"Yo ho ho and a bottle of rum!\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/piratetricord.rsi
@@ -1004,7 +1004,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatTacticalMaidHeadband
name: tactical maid headband
description: "A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns."
description: A red headband - don't imagine yourself a Rambo and don't pick up a few machine guns.
components:
- type: Sprite
sprite: Clothing/Head/Hats/tacticalmaidheadband.rsi
@@ -1026,7 +1026,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatMagician
name: magician's tophat
description: "A magician's tophat."
description: A magician's top hat.
components:
- type: Icon
sprite: Clothing/Head/Hats/magician.rsi
@@ -1060,7 +1060,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatCapcap
name: cap cap
description: A grand, stylish captain cap.
description: A grand, stylish cap worn by the Captain. Shows the station who's in charge.
components:
- type: Sprite
sprite: Clothing/Head/Hats/capcap.rsi
@@ -1083,7 +1083,7 @@
parent: [ ClothingHeadBase, BaseCentcommContraband ]
id: ClothingHeadHatCentcomcap
name: CentComm cap
description: An extravagant, fancy Central Commander cap.
description: An extravagant, stylish cap worn by CentComm officials. Shows the Captain who's in charge.
components:
- type: Sprite
sprite: Clothing/Head/Hats/comcap.rsi
@@ -1188,7 +1188,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBrownFlatcap
name: brown flatcap
description: Stupid clown! You made me look bad!
description: "\"Stupid clown! You made me look bad!\""
components:
- type: Tag
tags:
@@ -1202,7 +1202,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatCowboyBrown
name: brown cowboy hat
description: This hat ain't big enough for the both of us.
description: "\"This hat ain't big enough for the two of us.\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/cowboyhatbrown.rsi
@@ -1310,7 +1310,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretMedic
name: medical beret
description: White beret that encourages you to be clean.
description: A sterile white beret.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_medic.rsi
@@ -1321,7 +1321,7 @@
parent: ClothingHeadBase
id: ClothingHeadHatSolidHeadband
name: solid headband
description: "You'll feel like you're Invisible while wearing this! (DISCLAIMER: DOES NOT ACTUALLY MAKE THE WEARER INVISIBLE)"
description: "\"You'll feel like you're Invisible while wearing this! (DISCLAIMER: DOES NOT ACTUALLY MAKE THE WEARER INVISIBLE)\""
components:
- type: Sprite
sprite: Clothing/Head/Hats/solidheadband.rsi

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

@@ -44,7 +44,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatBluesoft
name: blue cap
description: "It's a baseball hat in a tasteless blue colour."
description: A blue baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/bluesoft.rsi
@@ -60,7 +60,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCargosoft
name: cargo cap
description: "It's a baseball hat painted in Cargo colours."
description: A baseball cap colored to match cargo's uniforms.
components:
- type: Sprite
sprite: Clothing/Head/Soft/cargosoft.rsi
@@ -89,7 +89,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatQMsoft
name: quartermaster's cap
description: "It's a baseball hat painted in the Quartermaster's colors."
description: A baseball cap colored to match the Quartermaster's uniform.
components:
- type: Sprite
sprite: Clothing/Head/Soft/qmsoft.rsi
@@ -105,7 +105,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCommandSoft
name: command cap
description: It's a baseball hat painted in Command colours.
description: A baseball cap in command's distinctive shade of blue.
components:
- type: Sprite
sprite: Clothing/Head/Soft/commandsoft.rsi
@@ -121,7 +121,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatCorpsoft
name: corporate cap
description: A baseball bat in corporation colors.
description: A baseball cap in corporation colors.
components:
- type: Sprite
sprite: Clothing/Head/Soft/corpsoft.rsi
@@ -137,7 +137,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatGreensoft
name: green cap
description: "It's a baseball hat in a tasteless green colour."
description: A green baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/greensoft.rsi
@@ -153,7 +153,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatBlacksoft
name: black cap
description: "It's a baseball hat in a tasteless black colour."
description: A black baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/blacksoft.rsi
@@ -169,7 +169,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatGreysoft
name: grey cap
description: "It's a baseball hat in a tasteless grey colour."
description: A grey baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/greysoft.rsi
@@ -185,7 +185,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatMimesoft
name: white cap
description: "It's a baseball hat in a tasteless white colour."
description: A white baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/mimesoft.rsi
@@ -201,7 +201,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatOrangesoft
name: orange cap
description: It's a baseball hat in a good-looking orange colour.
description: An orange baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/orangesoft.rsi
@@ -217,7 +217,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatPurplesoft
name: purple cap
description: It's a baseball hat in a tasteless purple colour.
description: A purple baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/purplesoft.rsi
@@ -246,7 +246,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatRedsoft
name: red cap
description: It's a baseball hat in a tasteless red colour.
description: A red baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/redsoft.rsi
@@ -262,7 +262,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatSecsoft
name: security cap
description: It's a robust baseball hat in tasteful red colour.
description: A baseball cap colored to match security's uniforms.
components:
- type: Sprite
sprite: Clothing/Head/Soft/secsoft.rsi
@@ -278,7 +278,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatYellowsoft
name: yellow cap
description: A yellow baseball hat.
description: A yellow baseball cap.
components:
- type: Sprite
sprite: Clothing/Head/Soft/yellowsoft.rsi
@@ -310,7 +310,7 @@
parent: ClothingHeadHeadHatBaseFlippable
id: ClothingHeadHatParamedicsoft
name: paramedic cap
description: "It's a paramedic's baseball hat with a medical logo."
description: A blue baseball cap with a cross on the front.
components:
- type: Sprite
sprite: Clothing/Head/Soft/paramedicsoft.rsi

40
Resources/Prototypes/Entities/Clothing/Multiple/misc.yml Normal file
View File

@@ -0,0 +1,40 @@
- type: entity
parent: Clothing
id: ClothingMultipleHeadphones
name: headphones
description: Quality headphones from Drunk Masters, with good sound insulation.
components:
- type: Sprite
sprite: Clothing/Multiple/headphones.rsi
layers:
- state: icon
map: [ "enum.ToggleableVisuals.Layer" ]
- type: Clothing
equippedPrefix: off
sprite: Clothing/Multiple/headphones.rsi
slots:
- HEAD
- EARS
- NECK
- type: ToggleableVisuals
spriteLayer: enum.ToggleableVisuals.Layer
clothingVisuals:
head:
- state: on-equipped-HELMET
ears:
- state: on-equipped-EARS
neck:
- state: on-equipped-NECK
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleableVisuals.Enabled:
enum.ToggleableVisuals.Layer:
True: {state: icon-on}
False: {state: icon}
- type: ItemToggle
predictable: false
soundActivate:
path: /Audio/Items/flashlight_on.ogg
soundDeactivate:
path: /Audio/Items/flashlight_off.ogg

33
Resources/Prototypes/Entities/Clothing/Neck/misc.yml
View File

@@ -1,36 +1,3 @@
- type: entity
parent: ClothingNeckBase
id: ClothingNeckHeadphones
name: headphones
description: Quality headphones from Drunk Masters, with good sound insulation.
components:
- type: Sprite
sprite: Clothing/Neck/Misc/headphones.rsi
layers:
- state: icon
map: [ "enum.ToggleableVisuals.Layer" ]
- type: Clothing
equippedPrefix: off
sprite: Clothing/Neck/Misc/headphones.rsi
- type: ToggleableVisuals
spriteLayer: enum.ToggleableVisuals.Layer
clothingVisuals:
neck:
- state: on-equipped-NECK
- type: Appearance
- type: GenericVisualizer
visuals:
enum.ToggleableVisuals.Enabled:
enum.ToggleableVisuals.Layer:
True: {state: icon-on}
False: {state: icon}
- type: ItemToggle
predictable: false
soundActivate:
path: /Audio/Items/flashlight_on.ogg
soundDeactivate:
path: /Audio/Items/flashlight_off.ogg
- type: entity
parent: Clothing
id: ClothingNeckStethoscope

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

@@ -250,8 +250,8 @@
Caustic: 0.5
- type: ExplosionResistance
damageCoefficient: 0.35
#- type: StaminaResistance
# damageCoefficient: 0.45
- type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
damageCoefficient: 0.45
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9

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

@@ -556,8 +556,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
#- type: StaminaResistance
# damageCoefficient: 0.75
- type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
damageCoefficient: 0.75
- type: Armor
modifiers:
coefficients:
@@ -579,6 +579,7 @@
- Hardsuit
- WhitelistChameleon
- CorgiWearable
- ScurretWearable
- type: StaticPrice
price: 5000
@@ -621,8 +622,8 @@
damageCoefficient: 0.2
- type: FireProtection
reduction: 0.8
#- type: StaminaResistance
# damageCoefficient: 0.6
- type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
@@ -662,8 +663,8 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
#- type: StaminaResistance
# damageCoefficient: 0.6
- type: StaminaResistance # do not add these to other equipment or mobs, we don't want to microbalance these everywhere
damageCoefficient: 0.6
- type: Armor
modifiers:
coefficients:
@@ -702,8 +703,7 @@
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.3
#- type: StaminaResistance # Should not have stamina resistance, this is purely so people know it was not forgotten.
# damageCoefficient: 0.99
# - type: StaminaResistance # Should not have stamina resistance, this is purely so people know it was not forgotten.
- type: Armor
modifiers:
coefficients:

1
Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml
View File

@@ -62,6 +62,7 @@
- type: Tag
tags:
- CorgiWearable
- ScurretWearable
- MonkeyWearable
- WhitelistChameleon

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

@@ -56,7 +56,7 @@
- id: ClothingHeadHatPaper
- id: ClothingHeadHatPirate
- id: ClothingMaskSterile
- id: ClothingNeckHeadphones
- id: ClothingMultipleHeadphones
- id: ClothingNeckTieRed
- id: ClothingOuterCoatGentle
- !type:AllSelector

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

@@ -160,4 +160,5 @@
- PosterLegitSafetyMothSSD
- PosterLegitOppenhopper
- PosterLegitTyrone
- PosterLegitHelio
chance: 1

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

@@ -3266,6 +3266,7 @@
- type: Grammar
attributes:
gender: epicene
- type: SlowAccent
- type: Tag
tags:
- VimPilot

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

@@ -25,7 +25,6 @@
- Electrocution
- TemporaryBlindness
- RadiationProtection
- Drowsiness
- Adrenaline
- type: StandingState
- type: Tag
@@ -58,7 +57,7 @@
- type: MobThresholds
thresholds:
0: Alive
250: Dead
150: Dead
- type: MeleeWeapon
soundHit:
path: "/Audio/Weapons/smash.ogg"
@@ -379,7 +378,7 @@
- type: MobThresholds
thresholds:
0: Alive
75: Dead
45: Dead
- type: MeleeWeapon
angle: 0
animation: WeaponArcBite

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

@@ -156,6 +156,10 @@
suffix: "Salvage Ruleset"
components:
- type: SalvageMobRestrictions
- type: MobThresholds
thresholds:
0: Alive
30: Dead
- type: entity
name: space carp
@@ -222,7 +226,7 @@
- type: MobThresholds
thresholds:
0: Alive
150: Dead
82: Dead # Might seem random, but this brings up the hits to kill with a crusher mark to 3
- type: Stamina
critThreshold: 150
- type: DamageStateVisuals

212
Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml Normal file
View File

@@ -0,0 +1,212 @@
# Defines the scurret, a small, agile sapient species intended for players who want to play as something similar to an ewok.
# Although based on MobBaseAncestor, this species does not have a "developed" playable species it is an ancestor to.
- type: entity
name: scurret
id: MobBaseScurret
parent: MobBaseAncestor
abstract: true
components:
# Custom names
- type: ReplacementAccent
accent: scurret
- type: Sprite
layers:
- map: ["enum.DamageStateVisualLayers.Base"]
sprite: Mobs/Animals/scurret/scurret.rsi
state: scurret
- map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
color: "#ffffff"
sprite: Objects/Misc/handcuffs.rsi
state: body-overlay-2
visible: false
# Custom visuals for dead scurrets; be aware these do not work well with equipment.
- type: DamageStateVisuals
states:
Alive:
Base: scurret
Critical:
Base: scurret_oof
Dead:
Base: scurret_rip
# About as tough as a monkey
- type: MobThresholds
thresholds:
0: Alive
60: Critical
125: Dead
- type: Temperature
heatDamageThreshold: 360
coldDamageThreshold: 285
currentTemperature: 310.15
specificHeat: 42
# Good eatin', you monster.
- type: Butcherable
butcheringType: Spike
spawned:
- id: FoodMeat
amount: 4
# They wawa!
- type: Vocal
sounds:
Male: Scurret
Female: Scurret
Unsexed: Scurret
wilhelmProbability: 0.01 # the scug, it screams like a man
- type: Speech
speechVerb: Wawa
speechSounds: Wawa
allowedEmotes: ["Thump"] # They're 80% tail
- type: TypingIndicator
proto: moth
- type: InteractionPopup
successChance: 0.99 # Imagine not being allowed to headpat a scurret, chat
interactSuccessString: petting-success-scurret
interactFailureString: petting-failure-scurret
interactSuccessSpawn: EffectHearts
interactSuccessSound:
path: /Audio/Animals/wawa_chillin.ogg
interactFailureSound:
path: /Audio/Animals/wawa_chatter.ogg
# They nyoom
- type: MovementSpeedModifier
baseWalkSpeed: 5 # nyoom
baseSprintSpeed: 7 # NYOOOOOM
- type: MeleeWeapon
soundHit:
path: /Audio/Effects/bite.ogg
angle: 30
animation: WeaponArcBite
damage:
types:
Piercing: 10 # NOM
- type: Inventory
speciesId: scurret
templateId: scurret
displacements:
jumpsuit:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: jumpsuit
id:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: id
gloves:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: gloves
neck:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: neck
ears:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: ears
eyes:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: eyes
head:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: head
mask:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: mask
back:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: back
- type: Hands
leftHandDisplacement:
sizeMaps:
32:
sprite: Mobs/Animals/scurret/displacement.rsi
state: hand
- type: InventorySlots
- type: Food
- type: Hunger
baseDecayRate: 0.05 # They get a lil' hungy
- type: BodyEmotes # Grants them clapping and so on.
soundsId: Scurret
- type: Deathgasp
prototype: ScurretDeathgasp # You monster
- type: Tag
tags:
- DoorBumpOpener
- FootstepSound
- CanPilot
- VimPilot
- AnomalyHost
# Spawnable scurrets have a random name and colour.
- type: entity
name: scurret
description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnolds's Pizza's "loyal workforce".
id: MobScurret
parent: MobBaseScurret
components:
# The have a rich culture
- type: RandomMetadata
nameSegments:
- NamesFirstScurret
- NamesLastScurret
nameFormat: name-format-standard
# They come in a variety of colours
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:
scurret: ScurretColors
# They are of a mysterious gender.
- type: Grammar
attributes:
gender: epicene
proper: true
# Strips the name identifier from them, so they're just "Confident Waters" rather than "Confident Waters (123)"
- type: NameIdentifier
group: null
# Emotional Support Scurrets have a ghost role and equipment. At the moment, these are intended to be used for admemes, but
# feel free to hook them into random content.
- type: entity
name: Emotional Support Scurret
id: MobBaseEmotionalSupportScurret
parent: MobBaseScurret
abstract: true
components:
- type: Loadout
prototypes: [ EmotionalSupportScurretGear ]
- type: NpcFactionMember
factions:
- Passive
- type: GhostRole
makeSentient: true
name: ghost-role-information-emotional-support-scurret-name
description: ghost-role-information-emotional-support-scurret-description
rules: ghost-role-information-nonantagonist-rules
raffle:
settings: default
- type: GhostTakeoverAvailable
# Spawnable ESS have a ghost role, equipment, a random name and a random colour.
- type: entity
name: Emotional Support Scurret
id: MobEmotionalSupportScurret
parent: [MobScurret, MobBaseEmotionalSupportScurret]
description: Commonly known as Wawa, from the wetlands of Planet Wawa, these critters make up the bulk of Arnold's Pizza's "loyal workforce". This one is here as a temp.

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

@@ -22,12 +22,10 @@
- SlowedDown
- Stutter
- Electrocution
- ForcedSleep
- TemporaryBlindness
- Pacified
- Flashed
- RadiationProtection
- Drowsiness
- Adrenaline
- type: Buckle
- type: StandingState
@@ -100,13 +98,11 @@
- SlowedDown
- Stutter
- Electrocution
- ForcedSleep
- TemporaryBlindness
- Pacified
- StaminaModifier
- Flashed
- RadiationProtection
- Drowsiness
- Adrenaline
- type: Bloodstream
bloodMaxVolume: 150

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

@@ -34,7 +34,7 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead
80: Dead
- type: Stamina
critThreshold: 150
- type: MovementAlwaysTouching
@@ -168,6 +168,10 @@
spawned:
- id: FoodMeat
amount: 1
- type: MobThresholds
thresholds:
0: Alive
60: Dead
- type: entity
id: MobKangarooSpaceSalvage
@@ -194,7 +198,7 @@
- type: MobThresholds
thresholds:
0: Alive
90: Dead
45: Dead
- type: Stamina
critThreshold: 150
- type: DamageStateVisuals
@@ -295,7 +299,7 @@
- type: MobThresholds
thresholds:
0: Alive
100: Dead
45: Dead
- type: Stamina
critThreshold: 150
- type: DamageStateVisuals

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

@@ -41,7 +41,7 @@
- type: MobThresholds
thresholds:
0: Alive
15: Dead
5: Dead
- type: Destructible
thresholds:
- trigger:

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

@@ -458,8 +458,8 @@
# Mob mapped to Xeno Station that can not be ghostrole / pry
- type: entity
name: lone praetorian
description: The last of its kind.
name: '"Dale"'
description: A praetorian left over from the station's initial security sweep. Has a pair of bloodied dog tags engraved with the name "Pvt. Dale" stuck in its maw.
parent: SimpleSpaceMobBase
id: MobXenoLonePraetorianNoGhost
components:

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

@@ -22,6 +22,14 @@
canInteract: true
- type: GhostHearing
- type: Hands
hands:
hand_right:
location: Right
hand_left:
location: Left
sortedHands:
- hand_right
- hand_left
- type: ComplexInteraction
- type: Puller
needsHands: false
@@ -29,8 +37,6 @@
- type: Physics
ignorePaused: true
bodyType: Kinematic
- type: Body
prototype: Aghost
- type: Access
groups:
- AllAccess

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

@@ -16,8 +16,8 @@
- NpcFactionMember
# traits
# - LegsParalyzed (you get healed)
- BlackAndWhiteOverlay
- LightweightDrunk
- Monochromacy
- Muted
- Narcolepsy
- Pacified

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

@@ -103,11 +103,9 @@
- SlowedDown
- Stutter
- Electrocution
- ForcedSleep
- TemporaryBlindness
- Pacified
- RadiationProtection
- Drowsiness
- Adrenaline
- type: Temperature
heatDamageThreshold: 800

1
Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
View File

@@ -13,7 +13,6 @@
- type: Hunger
- type: Thirst
- type: Sericulture
action: ActionSericulture
productionLength: 2
entityProduced: MaterialWebSilk1
hungerCost: 4 # Should total to 25 total silk on full hunger

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

@@ -123,20 +123,17 @@
- KnockedDown
- SlowedDown
- Stutter
- SeeingRainbows
- Electrocution
- Drunk
- SlurredSpeech
- RatvarianLanguage
- PressureImmunity
- Muted
- ForcedSleep
- TemporaryBlindness
- Pacified
- StaminaModifier
- Flashed
- RadiationProtection
- Drowsiness
- Adrenaline
- type: Body
prototype: Human

78
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
View File

@@ -3,7 +3,13 @@
id: FlaskBase
abstract: true
components:
- type: Drink
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
- type: Sprite
state: icon
sprite: Objects/Consumable/Drinks/flask.rsi
- type: PhysicalComposition
materialComposition:
Steel: 300
@@ -11,7 +17,31 @@
solution: drink
- type: entity
parent: FlaskBase
id: DrinkFlaskVisualsOpenable
abstract: true
components:
- type: GenericVisualizer
visuals:
enum.OpenableVisuals.Opened:
enum.OpenableVisuals.Layer:
True: {state: "icon_open"}
False: {state: "icon"}
- type: Appearance
- type: Sprite
layers:
- state: icon
map: ["enum.OpenableVisuals.Layer"]
- type: Openable
sound:
collection: flaskOpenSounds
closeable: true
closeSound:
collection: flaskCloseSounds
# Flasks
- type: entity
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkShinyFlask
name: shiny flask
description: A shiny metal flask. It appears to have a Greek symbol inscribed on it.
@@ -20,8 +50,9 @@
sprite: Objects/Consumable/Drinks/shinyflask.rsi
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkMREFlask
suffix: Full
name: MRE flask
description: An old military flask, filled with the finest contents for soldiers.
components:
@@ -37,7 +68,7 @@
solution: drink
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkDetFlask
name: inspector's flask
description: A metal flask with a leather band and golden badge belonging to the inspector.
@@ -46,7 +77,7 @@
sprite: Objects/Consumable/Drinks/detflask.rsi
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkHosFlask
name: hos's flask
description: A metal flask, fit for a hard working HoS.
@@ -55,7 +86,7 @@
sprite: Objects/Consumable/Drinks/hosflask.rsi
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkFlask
name: captain's flask
description: A metal flask belonging to the captain.
@@ -64,7 +95,7 @@
sprite: Objects/Consumable/Drinks/flask.rsi
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkFlaskBar
name: bar flask
description: A metal flask often given out by the bartender on loan. Don't forget to return it!
@@ -75,14 +106,14 @@
- type: entity
parent: FlaskBase
id: DrinkFlaskOld
name: flask
description: ''
name: old flask
description: A decrepit old flask, its lid seems to be missing.
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/flask_old.rsi
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkLithiumFlask
name: lithium flask
description: A flask with a Lithium Atom symbol on it.
@@ -91,35 +122,10 @@
sprite: Objects/Consumable/Drinks/lithiumflask.rsi
- type: entity
parent: FlaskBase
parent: [FlaskBase, DrinkFlaskVisualsOpenable]
id: DrinkVacuumFlask
name: vacuum flask
description: Keeping your drinks at the perfect temperature since 1892.
components:
- type: Sprite
sprite: Objects/Consumable/Drinks/vacuumflask.rsi
- type: entity
parent: FlaskBase
id: Pitcher
name: metal pitcher
description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 60
- type: Sprite
sprite: Objects/Consumable/Drinks/pitcher.rsi
layers:
- state: icon
map: ["enum.SolutionContainerLayers.Base"]
- state: fill-6
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 6
fillBaseName: fill-
inHandsMaxFillLevels: 2
inHandsFillBaseName: -fill-

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

@@ -177,3 +177,33 @@
- type: PhysicalComposition
materialComposition:
Steel: 75
- type: entity
parent: DrinkBase
id: Pitcher
name: metal pitcher
description: A stainless steel insulated pitcher. Everyone's best friend in the morning.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 60
- type: Sprite
sprite: Objects/Consumable/Drinks/pitcher.rsi
layers:
- state: icon
map: ["enum.SolutionContainerLayers.Base"]
- state: fill-6
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 6
fillBaseName: fill-
inHandsMaxFillLevels: 2
inHandsFillBaseName: -fill-
- type: PhysicalComposition
materialComposition:
Steel: 300
- type: FitsInDispenser
solution: drink

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

@@ -29,6 +29,24 @@
- type: Access
groups:
- Command
- type: DoorRemote
- type: entity
parent: [DoorRemoteDefault, BaseCommandContraband]
id: DoorRemoteCustom
name: custom door remote
description: A gadget which can open and bolt doors remotely. This advanced variant does not have built-in access, instead inheriting the ID access of the user.
components:
- type: Sprite
layers:
- state: door_remotebase
- state: door_remotelightscolour
color: "#0077FF"
- state: door_remotescreencolour
color: "#0033EE"
- type: Access
- type: DoorRemote
includeUserAccess: true
- type: entity
parent: [DoorRemoteDefault, BaseCommandContraband]
@@ -155,6 +173,8 @@
color: "#2eba22"
- state: door_remotescreencolour
color: "#22871a"
- type: DoorRemote
includeUserAccess: true
- type: Access
groups:
- AllAccess

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

@@ -473,6 +473,13 @@
accentVColor: "#a23e3e"
- type: Icon
state: pda-qm
- type: CartridgeLoader
preinstalled:
- CrewManifestCartridge
- NotekeeperCartridge
- NanoTaskCartridge
- NewsReaderCartridge
- AstroNavCartridge
- type: entity
parent: BasePDA
@@ -1512,3 +1519,14 @@
borderColor: "#7F3300"
- type: Icon
state: pda-wizard
- type: entity
parent: ClearPDA
id: ScurretPDA
description: A temporary PDA granted to scurret temps. Doesn't do much. Wawa!
components:
- type: Pda
id: VisitorIDCard
- type: Tag # Ignore Chameleon tags
tags:
- DoorBumpOpener

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

@@ -456,6 +456,70 @@
- type: NavMapBeacon
defaultText: station-beacon-solars
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsN
suffix: Solars, North
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-N
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsNE
suffix: Solars, Northeast
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-NE
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsE
suffix: Solars, East
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-E
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsSE
suffix: Solars, Southeast
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-SE
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsS
suffix: Solars, South
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-S
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsSW
suffix: Solars, Southwest
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-SW
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsW
suffix: Solars, West
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-W
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconSolarsNW
suffix: Solars, Northwest
components:
- type: NavMapBeacon
defaultText: station-beacon-solars-NW
- type: entity
parent: DefaultStationBeaconEngineering
id: DefaultStationBeaconGravGen
@@ -706,6 +770,70 @@
- type: NavMapBeacon
defaultText: station-beacon-escape-pod
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodN
suffix: Escape Pod, North
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-N
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodNE
suffix: Escape Pod, Northeast
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-NE
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodE
suffix: Escape Pod, East
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-E
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodSE
suffix: Escape Pod, Southeast
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-SE
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodS
suffix: Escape Pod, South
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-S
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodSW
suffix: Escape Pod, Southwest
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-SW
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodW
suffix: Escape Pod, West
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-W
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconEscapePodNW
suffix: Escape Pod, Northwest
components:
- type: NavMapBeacon
defaultText: station-beacon-escape-pod-NW
- type: entity
parent: DefaultStationBeacon
id: DefaultStationBeaconVox

218
Resources/Prototypes/Entities/Objects/Fun/mech_figurines.yml
View File

@@ -17,7 +17,7 @@
- type: Tag
tags:
- Figurine
#Ripley APLU
- type: entity
parent: BaseFigurineMech
@@ -27,6 +27,24 @@
components:
- type: Sprite
state: ripley
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#d5c644"
- state: inhand-left-trim
color: "#524c14"
- state: inhand-left-visor
color: "#7aef83"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#d5c644"
- state: inhand-right-trim
color: "#524c14"
- state: inhand-right-visor
color: "#7aef83"
#Fire Ripley
- type: entity
@@ -37,6 +55,24 @@
components:
- type: Sprite
state: fireripley
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#819a73"
- state: inhand-left-trim
color: "#486b2f"
- state: inhand-left-visor
color: "#5a150e"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#819a73"
- state: inhand-right-trim
color: "#486b2f"
- state: inhand-right-visor
color: "#5a150e"
#Death Ripley
- type: entity
@@ -47,6 +83,24 @@
components:
- type: Sprite
state: deathripley
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#575757"
- state: inhand-left-trim
color: "#b3001b"
- state: inhand-left-visor
color: "#e1131e"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#575757"
- state: inhand-right-trim
color: "#b3001b"
- state: inhand-right-visor
color: "#e1131e"
#Ggygax
- type: entity
@@ -57,6 +111,24 @@
components:
- type: Sprite
state: gygax
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#e76241"
- state: inhand-left-trim
color: "#4f5359"
- state: inhand-left-visor
color: "#00ff33"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#e76241"
- state: inhand-right-trim
color: "#4f5359"
- state: inhand-right-visor
color: "#00ff33"
#Durand
- type: entity
@@ -67,6 +139,24 @@
components:
- type: Sprite
state: durand
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#a8abb3"
- state: inhand-left-trim
color: "#686d78"
- state: inhand-left-visor
color: "#8cc865"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#a8abb3"
- state: inhand-right-trim
color: "#686d78"
- state: inhand-right-visor
color: "#8cc865"
#H.O.N.K
- type: entity
@@ -77,6 +167,24 @@
components:
- type: Sprite
state: honk
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#ed1c24"
- state: inhand-left-trim
color: "#ffffff"
- state: inhand-left-visor
color: "#ff040b"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#ed1c24"
- state: inhand-right-trim
color: "#ffffff"
- state: inhand-right-visor
color: "#ff040b"
#Marauder
- type: entity
@@ -87,6 +195,24 @@
components:
- type: Sprite
state: marauder
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#9da6be"
- state: inhand-left-trim
color: "#557a48"
- state: inhand-left-visor
color: "#00ff33"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#9da6be"
- state: inhand-right-trim
color: "#557a48"
- state: inhand-right-visor
color: "#00ff33"
#Seraph
- type: entity
@@ -97,6 +223,24 @@
components:
- type: Sprite
state: seraph
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#878c97"
- state: inhand-left-trim
color: "#943226"
- state: inhand-left-visor
color: "#f31a33"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#878c97"
- state: inhand-right-trim
color: "#943226"
- state: inhand-right-visor
color: "#f31a33"
#Mauler
- type: entity
@@ -107,6 +251,24 @@
components:
- type: Sprite
state: mauler
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#2b2b2b"
- state: inhand-left-trim
color: "#660000"
- state: inhand-left-visor
color: "#ff0000"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#2b2b2b"
- state: inhand-right-trim
color: "#660000"
- state: inhand-right-visor
color: "#ff0000"
#Odysseus
- type: entity
@@ -117,6 +279,24 @@
components:
- type: Sprite
state: odysseus
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#ffffff"
- state: inhand-left-trim
color: "#7d7f97"
- state: inhand-left-visor
color: "#857149"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#ffffff"
- state: inhand-right-trim
color: "#7d7f97"
- state: inhand-right-visor
color: "#857149"
#Phazon
- type: entity
@@ -127,6 +307,24 @@
components:
- type: Sprite
state: phazon
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#4d79a0"
- state: inhand-left-trim
color: "#f38233"
- state: inhand-left-visor
color: "#f38233"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#4d79a0"
- state: inhand-right-trim
color: "#f38233"
- state: inhand-right-visor
color: "#f38233"
#Reticence
- type: entity
@@ -137,3 +335,21 @@
components:
- type: Sprite
state: reticence
- type: Item
inhandVisuals:
left:
- state: inhand-left-base
- state: inhand-left-body
color: "#d9d9d9"
- state: inhand-left-trim
color: "#8b8b8b"
- state: inhand-left-visor
color: "#1f1f1f"
right:
- state: inhand-right-base
- state: inhand-right-body
color: "#d9d9d9"
- state: inhand-right-trim
color: "#8b8b8b"
- state: inhand-right-visor
color: "#1f1f1f"

105
Resources/Prototypes/Entities/Objects/Fun/plushies.yml
View File

@@ -127,6 +127,7 @@
noRot: true
- type: Item
size: Normal
- type: MultiHandedItem
- type: Construction
graph: PlushieGhostRevenant
node: plushie
@@ -202,6 +203,15 @@
wideAnimationRotation: 180
soundHit:
path: /Audio/Items/Toys/mousesqueek.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/hampter.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.04"
- type: FoodSequenceElement
entries:
CottonBurger: HamptrPlushie
@@ -240,6 +250,15 @@
- type: Sprite
sprite: Objects/Fun/Plushies/nukie.rsi
state: icon
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/nukie.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.03"
- type: FoodSequenceElement
entries:
CottonBurger: NukiePlushie
@@ -254,6 +273,15 @@
sprite: Objects/Fun/Plushies/rouny.rsi
state: icon
- type: Rotatable
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/rouny.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.03"
- type: FoodSequenceElement
entries:
CottonBurger: RounyPlushie
@@ -307,6 +335,11 @@
wideAnimationRotation: 180
soundHit:
path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/arachnid.rsi
slots:
- HEAD
- type: FoodSequenceElement
entries:
CottonBurger: ArachnidPlushie
@@ -650,6 +683,15 @@
- LowImpassable
- type: CollisionWake
enabled: false
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/diona.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.09"
- type: FoodSequenceElement
entries:
CottonBurger: DionaPlushie
@@ -739,7 +781,7 @@
parent: BasePlushie
id: PlushieRatvar
name: ratvar plushie
description: A small stuffed doll of the elder god Ratvar.
description: A large stuffed doll of the elder god Ratvar.
components:
- type: Sprite
sprite: Objects/Fun/Plushies/ratvar.rsi
@@ -747,6 +789,12 @@
- type: Item
size: Normal
sprite: Objects/Fun/Plushies/ratvar.rsi
- type: MultiHandedItem
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/ratvar.rsi
slots:
- neck
- type: FoodSequenceElement
entries:
CottonBurger: RatvarPlushie
@@ -755,7 +803,7 @@
parent: BasePlushie
id: PlushieNar
name: nar'sie plushie
description: A small stuffed doll of the elder goddess Nar'Sie.
description: A large stuffed doll of the elder goddess Nar'Sie.
components:
- type: Sprite
sprite: Objects/Fun/Plushies/narsie.rsi
@@ -763,6 +811,12 @@
- type: Item
size: Normal
sprite: Objects/Fun/Plushies/narsie.rsi
- type: MultiHandedItem
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/narsie.rsi
slots:
- neck
- type: FoodSequenceElement
entries:
CottonBurger: NarPlushie
@@ -885,6 +939,11 @@
wideAnimationRotation: 180
soundHit:
path: /Audio/Voice/Slime/slime_squish.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/slime.rsi
slots:
- HEAD
- type: FoodSequenceElement
entries:
CottonBurger: SlimePlushie
@@ -1007,6 +1066,15 @@
wideAnimationRotation: 180
soundHit:
path: /Audio/Voice/Vox/shriek1.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/vox.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.09"
- type: FoodSequenceElement
entries:
CottonBurger: VoxPlushie
@@ -1020,6 +1088,15 @@
- type: Sprite
sprite: Objects/Fun/Plushies/atmosian.rsi
state: icon
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/atmosian.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.04"
- type: FoodSequenceElement
entries:
CottonBurger: AtmosianPlushie
@@ -1058,6 +1135,15 @@
wideAnimationRotation: 180
soundHit:
path: /Audio/Weapons/Xeno/alien_spitacid.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/xeno.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.03"
- type: FoodSequenceElement
entries:
CottonBurger: XenoPlushie
@@ -1071,6 +1157,11 @@
- type: Sprite
sprite: Objects/Fun/Plushies/penguin.rsi
state: icon
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/penguin.rsi
slots:
- HEAD
- type: FoodSequenceElement
entries:
CottonBurger: PenguinPlushie
@@ -1106,6 +1197,11 @@
- type: EmitSoundOnTrigger
sound:
path: /Audio/Voice/Human/malescream_5.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/human.rsi
slots:
- HEAD
- type: FoodSequenceElement
entries:
CottonBurger: HumanPlushie
@@ -1141,6 +1237,11 @@
requiresSpecialDigestion: true
useSound:
path: /Audio/Voice/Moth/moth_chitter.ogg
- type: Clothing
quickEquip: false
sprite: Objects/Fun/Plushies/moth.rsi
slots:
- HEAD
- type: FoodSequenceElement
entries:
CottonBurger: MothPlushie

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

@@ -155,6 +155,15 @@
- type: Sprite
sprite: Objects/Fun/AI.rsi
state: icon
- type: Clothing
quickEquip: false
sprite: Objects/Fun/AI.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.06"
- type: entity
parent: BaseFigurineCheapo
@@ -165,6 +174,15 @@
- type: Sprite
sprite: Objects/Fun/toy_nuke.rsi
state: icon
- type: Clothing
quickEquip: false
sprite: Objects/Fun/toy_nuke.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.12"
- type: Tag
tags:
- Payload
@@ -198,6 +216,15 @@
- type: Sprite
sprite: Objects/Fun/toy_ian.rsi
state: icon
- type: Clothing
quickEquip: false
sprite: Objects/Fun/toy_ian.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET
offset: "0, 0.06"
- type: Item
size: Tiny
- type: EmitSoundOnUse
@@ -478,11 +505,17 @@
sprite: Objects/Fun/toy_singularity.rsi
state: icon
- type: SingularityDistortion
intensity: 2000
intensity: 25
falloffPower: 2.6
- type: Item
size: Normal
sprite: Objects/Fun/icon.rsi
inhandVisuals:
left:
- state: singu-inhand-left
shader: unshaded
right:
- state: singu-inhand-right
shader: unshaded
- type: entity
parent: BaseItem
@@ -495,6 +528,14 @@
shader: unshaded
layers:
- state: tesla_projectile
- type: Item
inhandVisuals:
left:
- state: tesla-inhand-left
shader: unshaded
right:
- state: tesla-inhand-right
shader: unshaded
- type: PointLight
enabled: true
radius: 5
@@ -632,6 +673,22 @@
- state: base
map: [ "enum.DamageStateVisualLayers.Base" ]
- state: visor
- type: Clothing
sprite: Objects/Fun/pequeno.rsi
slots:
- HEAD
clothingVisuals:
head:
- state: equipped-HELMET-body
- state: equipped-HELMET-vis
- type: Item
inhandVisuals:
left:
- state: inhand-left-body
- state: inhand-left-vis
right:
- state: inhand-right-body
- state: inhand-right-vis
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:

12
Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
View File

@@ -140,13 +140,13 @@
sprite: Objects/Misc/Lights/lampint.rsi
layers:
- state: lamp-int
map: [ "enum.FlashVisuals.BaseLayer" ]
map: [ "enum.FlashVisualLayers.BaseLayer" ]
- state: lamp-int-on
shader: unshaded
visible: false
map: [ "light" ]
- state: flashing
map: [ "enum.FlashVisuals.LightLayer" ]
map: [ "enum.FlashVisualLayers.LightLayer" ]
visible: false
- type: Item
sprite: Objects/Misc/Lights/lampint.rsi
@@ -159,6 +159,10 @@
energy: 0.5
color: "#FFFFEE"
- type: Flash
flashOnMelee: false
flashOnUse: false
- type: UseDelay
delay: 1
- type: LimitedCharges
maxCharges: 3
- type: AutoRecharge
@@ -176,10 +180,10 @@
- type: GenericVisualizer
visuals:
enum.FlashVisuals.Burnt:
enum.FlashVisuals.BaseLayer:
enum.FlashVisualLayers.BaseLayer:
True: {state: burnt}
enum.FlashVisuals.Flashing:
enum.FlashVisuals.LightLayer:
enum.FlashVisualLayers.LightLayer:
True: {visible: true}
False: {visible: false}

4
Resources/Prototypes/Entities/Objects/Misc/implanters.yml
View File

@@ -46,6 +46,7 @@
- MindShieldImplant
- FakeMindShieldImplant
- RadioImplant
- ChameleonControllerImplant
deimplantFailureDamage:
types:
Cellular: 50
@@ -248,8 +249,7 @@
- type: entity
id: ChameleonControllerImplanter
name: chameleon controller implant
suffix: chameleon controller
name: chameleon controller implanter
parent: BaseImplantOnlyImplanterSyndi
components:
- type: Implanter

2
Resources/Prototypes/Entities/Objects/Misc/tiles.yml
View File

@@ -1669,7 +1669,7 @@
stackType: FloorTileXenoSteelCorner
- type: entity
name: xeno techmaint
name: xeno techmaint floor
parent: FloorTileItemBase
id: FloorTileItemXenoMaint
components:

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

@@ -26,6 +26,7 @@
- type: Spillable
solution: absorbed
spillWhenThrown: false
preventMelee: false
- type: DrainableSolution
solution: absorbed
- type: Wieldable
@@ -84,6 +85,7 @@
- type: Spillable
solution: absorbed
spillWhenThrown: false
preventMelee: false
- type: DrainableSolution
solution: absorbed
- type: Wieldable

2
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
View File

@@ -257,7 +257,7 @@
damage:
types:
Bloodloss: -0.5 #lowers bloodloss damage
ModifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
modifyBloodLevel: 15 #restores about 5% blood per use on standard humanoids.
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
params:

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

@@ -446,6 +446,7 @@
items:
- BorgFireExtinguisher
- BorgHandheldGPSBasic
- HandheldStationMapUnpowered
- HandHeldMassScannerBorg
- type: BorgModuleIcon
icon: { sprite: Interface/Actions/actions_borg.rsi, state: extinguisher-module }

52
Resources/Prototypes/Entities/Objects/Tools/lantern.yml
View File

@@ -10,31 +10,33 @@
radiatingBehaviourId: radiating
- type: LightBehaviour
behaviours:
- !type:FadeBehaviour
id: radiating
maxDuration: 2.0
startValue: 3.0
endValue: 2.0
isLooped: true
reverseWhenFinished: true
- !type:PulseBehaviour
id: blinking
interpolate: Nearest
maxDuration: 1.0
minValue: 0.1
maxValue: 2.0
isLooped: true
- !type:FadeBehaviour
id: radiating
maxDuration: 2.0
startValue: 3.0
endValue: 2.0
isLooped: true
reverseWhenFinished: true
- !type:PulseBehaviour
id: blinking
interpolate: Nearest
maxDuration: 1.0
minValue: 0.1
maxValue: 2.0
isLooped: true
- type: Sprite
sprite: Objects/Tools/lantern.rsi
layers:
- state: lantern
- state: lantern-on
shader: unshaded
visible: false
map: [ "light" ]
- state: lantern
- state: lantern-on
shader: unshaded
visible: false
map: [ "light" ]
- type: Item
sprite: Objects/Tools/lantern.rsi
heldPrefix: off
- type: UseDelay
delay: 1
- type: PointLight
enabled: false
radius: 3
@@ -62,7 +64,7 @@
equippedPrefix: off
quickEquip: false
slots:
- Belt
- Belt
- type: Tag
tags:
- Flashlight
@@ -76,18 +78,20 @@
sprite: Objects/Tools/lantern.rsi
layers:
- state: lantern
map: [ "enum.FlashVisuals.BaseLayer" ]
map: [ "enum.FlashVisualLayers.BaseLayer" ]
- state: lantern-on
shader: unshaded
visible: false
map: [ "light" ]
- state: flashing
map: [ "enum.FlashVisuals.LightLayer" ]
map: [ "enum.FlashVisualLayers.LightLayer" ]
visible: false
- type: PointLight
radius: 5
energy: 10
- type: Flash
flashOnMelee: false
flashOnUse: false
- type: LimitedCharges
maxCharges: 15
- type: MeleeWeapon
@@ -98,9 +102,9 @@
- type: GenericVisualizer
visuals:
enum.FlashVisuals.Burnt:
enum.FlashVisuals.BaseLayer:
enum.FlashVisualLayers.BaseLayer:
True: {state: burnt}
enum.FlashVisuals.Flashing:
enum.FlashVisuals.LightLayer:
enum.FlashVisualLayers.LightLayer:
True: {visible: true}
False: {visible: false}

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml
View File

@@ -18,6 +18,7 @@
proto: ProjectileHealingBolt
capacity: 10
count: 10
- type: PacifismAllowedGun
- type: entity
name: staff of entrance

21
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View File

@@ -496,7 +496,7 @@
impactEffect: BulletImpactEffectKinetic
damage:
types:
Blunt: 25
Blunt: 15
Structural: 30
# Short lifespan
- type: TimedDespawn
@@ -553,8 +553,8 @@
- MobState
damage:
types:
Blunt: 20
Slash: 5
Blunt: 18
Slash: 4
- type: Projectile
impactEffect: BulletImpactEffectKinetic
damage:
@@ -564,6 +564,21 @@
- type: TimedDespawn
lifetime: 0.4
# Deals less damage, glaive has better HP recovery
- type: entity
id: BulletChargeGlaive
name: leech bolt
parent: BulletCharge
components:
- type: DamageMarkerOnCollide
whitelist:
components:
- MobState
damage:
types:
Blunt: 1
Slash: 5
- type: entity
parent: BaseBullet
id: AnomalousParticleDelta

4
Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
View File

@@ -146,7 +146,7 @@
storedSprite: null
- type: entity
parent: ClothingHeadHatGreyFlatcap
parent: [ClothingHeadHatGreyFlatcap, BaseMinorContraband]
id: BladedFlatcapGrey
name: grey flatcap
description: Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim.
@@ -175,7 +175,7 @@
parent: BladedFlatcapGrey
id: BladedFlatcapBrown
name: brown flatcap
description: Stupid clown! You made me look bad! It has glass shards hidden in the brim.
description: "\"Stupid clown! You made me look bad!\" It has glass shards hidden in the brim."
components:
- type: Construction
graph: BladedFlatcapBrown

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

@@ -106,6 +106,7 @@
enabled: false
radius: 4
# Very high burst damage if you land a mark, while also providing a small amount of healing.
- type: entity
parent: [BaseWeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusher
@@ -132,7 +133,7 @@
- type: LeechOnMarker
leech:
groups:
Brute: -10
Brute: -6
- type: Gun
soundGunshot: /Audio/Weapons/plasma_cutter.ogg
fireRate: 1
@@ -146,25 +147,26 @@
capacity: 1
count: 1
- type: MeleeWeapon
attackRate: 1.5
attackRate: 1
wideAnimationRotation: -135
damage:
types:
Blunt: 10
Slash: 5
Blunt: 6
Slash: 4
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 2.5
Slash: 2.5
Blunt: 6
Slash: 2
Structural: 30
- type: GunRequiresWield
- type: DisarmMalus
- type: Prying
# No mark ability in exchange for wideswing, autoattack, and being one-handed
- type: entity
parent: [ BaseKnife, BaseWeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusherDagger
@@ -194,12 +196,12 @@
- type: ThrowingAngle
angle: 225
# Like a crusher... but better
# Less mark damage in exchange for more healing. Also has a better ratio of blunt to slash damage, but less structural.
- type: entity
parent: [ WeaponCrusher, BaseSecurityCargoContraband]
id: WeaponCrusherGlaive
name: crusher glaive
description: An early design of the proto-kinetic accelerator, in glaive form.
description: An early design of the proto-kinetic accelerator, in glaive form. Provides better healing in exchange for less charged damage.
components:
- type: Sprite
sprite: Objects/Weapons/Melee/crusher_glaive.rsi
@@ -215,11 +217,27 @@
- suitStorage
- type: UseDelay
delay: 1.9
- type: BasicEntityAmmoProvider
proto: BulletChargeGlaive
capacity: 1
count: 1
- type: LeechOnMarker
leech:
groups:
Brute: -21
- type: MeleeWeapon
- type: Tag
tags:
- Pickaxe
- type: MeleeWeapon
attackRate: 1
wideAnimationRotation: -135
damage:
types:
Blunt: 3
Slash: 7
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 2
Slash: 6
Structural: 20

10
Resources/Prototypes/Entities/Objects/Weapons/security.yml
View File

@@ -139,9 +139,9 @@
sprite: Objects/Weapons/Melee/flash.rsi
layers:
- state: flash
map: [ "enum.FlashVisuals.BaseLayer" ]
map: [ "enum.FlashVisualLayers.BaseLayer" ]
- state: flashing
map: [ "enum.FlashVisuals.LightLayer" ]
map: [ "enum.FlashVisualLayers.LightLayer" ]
visible: false
shader: unshaded
- type: Flash
@@ -157,16 +157,18 @@
size: Small
sprite: Objects/Weapons/Melee/flash.rsi
- type: UseDelay
delay: 4 # has to be the same as the FlashingTime datafield in FlashComponent
- type: UseDelayOnMeleeHit
- type: StaticPrice
price: 40
- type: Appearance
- type: GenericVisualizer
visuals:
enum.FlashVisuals.Burnt:
enum.FlashVisuals.BaseLayer:
enum.FlashVisualLayers.BaseLayer:
True: {state: burnt}
enum.FlashVisuals.Flashing:
enum.FlashVisuals.LightLayer:
enum.FlashVisualLayers.LightLayer:
True: {visible: true}
False: {visible: false}
- type: GuideHelp

52
Resources/Prototypes/Entities/StatusEffects/misc.yml Normal file
View File

@@ -0,0 +1,52 @@
- type: entity
id: StatusEffectBase
abstract: true
components:
- type: StatusEffect
- type: Sprite
drawdepth: Effects
- type: Tag
tags:
- HideContextMenu
- type: entity
parent: StatusEffectBase
id: MobStatusEffectBase
abstract: true
components:
- type: StatusEffect
whitelist:
components:
- MobState
# The creature sleeps so heavily that nothing can wake him up. Not even its own death.
- type: entity
parent: MobStatusEffectBase
id: StatusEffectForcedSleeping
name: forced sleep
components:
- type: ForcedSleepingStatusEffect
# This creature is asleep because it's disconnected from the game.
- type: entity
parent: MobStatusEffectBase
id: StatusEffectSSDSleeping
name: forced sleep
components:
- type: ForcedSleepingStatusEffect
# Blurs your vision and makes you randomly fall asleep
- type: entity
parent: MobStatusEffectBase
id: StatusEffectDrowsiness
name: drowsiness
components:
- type: DrowsinessStatusEffect
# Adds drugs overlay
- type: entity
parent: MobStatusEffectBase
id: StatusEffectSeeingRainbow
name: hallucinations
components:
- type: SeeingRainbowsStatusEffect

6
Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
View File

@@ -342,9 +342,6 @@
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/xeno.rsi
- type: IconSmooth
key: chitin
mode: NoSprite
- type: entity
parent: AirlockGlass
@@ -353,6 +350,3 @@
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/xeno.rsi
- type: IconSmooth
key: chitin
mode: NoSprite

3
Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
View File

@@ -158,9 +158,6 @@
- board
- type: PlacementReplacement
key: walls
- type: IconSmooth
key: walls
mode: NoSprite
- type: PaintableAirlock
group: Standard
department: Civilian

3
Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
View File

@@ -115,9 +115,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: Construction
graph: Airlock
node: highSecDoor

3
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
View File

@@ -55,9 +55,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: Occluder
- type: BlockWeather

3
Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
View File

@@ -78,9 +78,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: DoorSignalControl
- type: DeviceNetwork
deviceNetId: Wireless

3
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
View File

@@ -643,6 +643,9 @@
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepFloor
- type: Construction
graph: Table
node: TableXeno
# Fancy tables

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

@@ -241,7 +241,7 @@
- id: ClothingHeadHatAnimalHeadslime
prob: 0.03
orGroup: dresserthirdloot
- id: ClothingNeckHeadphones
- id: ClothingMultipleHeadphones
prob: 0.03
orGroup: dresserthirdloot
- id: ClothingUnderSocksCoder

9
Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
View File

@@ -117,7 +117,7 @@
- Cryogenics
- type: entity
parent: BaseStructure
parent: BaseMachine
id: CryoPodDestroyed
name: destroyed cryo pod
description: A cryo pod that has seen better days. It's entirely inoperable; not good for anything but scrap.
@@ -128,22 +128,17 @@
noRot: true
offset: 0, 0.5
state: pod-cracked
- type: Transform
noRot: true
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.90"
bounds: "-0.5,-0.5,0.5,0.5"
density: 200
mask:
- MachineMask
layer:
- MachineLayer
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallic
- type: Destructible
thresholds:
- trigger:

56
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/binary.yml
View File

@@ -155,6 +155,62 @@
guides:
- Pumps
- type: entity
parent: GasBinaryBase
id: GasPressureRegulator
name: inlet pressure regulator
description: A valve that releases gas when the inlet pressure exceeds a certain threshold.
placement:
mode: SnapgridCenter
components:
- type: Rotatable
- type: Transform
noRot: false
- type: SubFloorHide
visibleLayers:
- enum.SubfloorLayers.FirstLayer
- type: Sprite
sprite: Structures/Piping/Atmospherics/pump.rsi
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
state: pipeStraight
map: [ "enum.PipeVisualLayers.Pipe" ]
- state: pumpPressureRegulator
map: [ "enum.SubfloorLayers.FirstLayer", "enabled" ]
- type: Appearance
- type: GenericVisualizer
visuals:
enum.PressureRegulatorVisuals.State:
enabled:
True: { state: pumpPressureRegulatorOn }
False: { state: pumpPressureRegulator }
- type: PipeColorVisuals
- type: GasPressureRegulator
enabled: false
threshold: 4500
- type: Construction
graph: GasBinary
node: pressureregulator
- type: ActivatableUI
key: enum.GasPressureRegulatorUiKey.Key
blockSpectators: true
- type: ActivatableUIRequiresAnchor
- type: UserInterface
interfaces:
enum.GasPressureRegulatorUiKey.Key:
type: GasPressureRegulatorBoundUserInterface
- type: AmbientSound
enabled: false
volume: -9
range: 5
sound:
path: /Audio/Ambience/Objects/gas_hiss.ogg
- type: AtmosMonitoringConsoleDevice
navMapBlip: GasFlowRegulator
- type: GuideHelp
guides:
- PressureRegulator
- type: entity
parent: GasBinaryBase
id: GasPassiveGate

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

@@ -1123,6 +1123,15 @@
- type: Sprite
state: poster54_legit
- type: entity
parent: PosterBase
id: PosterLegitHelio
name: Helio Logistics ad
description: "A poster advertising Helio Logistics and their adorable mascot. The slogan reads 'Come rain or shine, we deliver on time.'"
components:
- type: Sprite
state: poster55_legit
#maps
- type: entity

7
Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
View File

@@ -151,7 +151,6 @@
- type: entity
id: AirAlarmXeno
parent: AirAlarm
name: air alarm
description: An alien air alarm. Hopefully they didn't breathe poison.
components:
- type: Sprite
@@ -161,17 +160,11 @@
map: ["airAlarmBase"] # TODO: fire alarm enum
- state: alarmx
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Construction
- type: entity
id: AirAlarmAssemblyXeno
parent: AirAlarmAssembly
name: air alarm assembly
description: An alien air alarm. Why are the wires pulsating?...
components:
- type: Sprite
sprite: Structures/Wallmounts/air_monitors_xeno.rsi
layers:
- state: alarm_b1
map: [ "enum.ConstructionVisuals.Layer" ]
- type: Construction

14
Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
View File

@@ -146,29 +146,15 @@
- type: entity
id: FireAlarmXeno
parent: FireAlarm
name: fire alarm
description: An alien fire alarm. Works just the same!
components:
- type: Sprite
sprite: Structures/Wallmounts/air_monitors_xeno.rsi
layers:
- state: fire0
map: ["fireAlarmBase"]
- state: fire_off
map: ["fireAlarmState"]
- state: fire_b2
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Construction
- type: entity
id: FireAlarmAssemblyXeno
parent: FireAlarmAssembly
name: fire alarm assembly
description: An alien fire alarm assembly. Good luck with the wires.
components:
- type: Sprite
sprite: Structures/Wallmounts/air_monitors_xeno.rsi
layers:
- state: fire_b1
map: [ "enum.ConstructionVisuals.Layer" ]
- type: Construction

3
Resources/Prototypes/Entities/Structures/plastic_flaps.yml
View File

@@ -35,9 +35,6 @@
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: IconSmooth
key: walls
mode: NoSprite
- type: StaticPrice
price: 100

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

@@ -27,3 +27,8 @@
id: DoNotMap
name: entity-category-name-donotmap
suffix: entity-category-suffix-donotmap
- type: entityCategory
id: StatusEffects
name: entity-category-name-status-effects
hideSpawnMenu: true

6
Resources/Prototypes/Guidebook/engineering.yml
View File

@@ -120,6 +120,7 @@
- SignalValve
- PneumaticValve
- PassiveGate
- PressureRegulator
- type: guideEntry
id: ManualValve
@@ -141,6 +142,11 @@
name: guide-entry-passivegate
text: "/ServerInfo/Guidebook/Engineering/PassiveGate.xml"
- type: guideEntry
id: PressureRegulator
name: guide-entry-ressureregulator
text: "/ServerInfo/Guidebook/Engineering/PressureRegulator.xml"
- type: guideEntry
id: MixingAndFiltering
name: guide-entry-mixingandfiltering

71
Resources/Prototypes/InventoryTemplates/scurret_inventory_template.yml Normal file
View File

@@ -0,0 +1,71 @@
- type: inventoryTemplate
id: scurret
slots:
- name: ears
slotTexture: ears
slotFlags: EARS
stripTime: 3
uiWindowPos: 0,2
strippingWindowPos: 1,2
displayName: Ears
- name: gloves
slotTexture: gloves
slotFlags: GLOVES
uiWindowPos: 0,1
strippingWindowPos: 2,2
displayName: Gloves
- name: head
slotTexture: head
slotFlags: HEAD
uiWindowPos: 1,3
strippingWindowPos: 0,0
displayName: Head
- name: mask
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,2
strippingWindowPos: 1,1
displayName: Mask
- name: neck
slotTexture: neck
slotFlags: NECK
uiWindowPos: 1,1
strippingWindowPos: 0,1
displayName: Neck
- name: jumpsuit
slotTexture: uniform
slotFlags: INNERCLOTHING
stripTime: 6
uiWindowPos: 1,0
strippingWindowPos: 0,2
displayName: Jumpsuit
- name: id
slotTexture: id
fullTextureName: template_small
slotFlags: IDCARD
slotGroup: SecondHotbar
stripTime: 6
uiWindowPos: 2,1
strippingWindowPos: 2,4
displayName: ID
- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 2,5
dependsOn: jumpsuit
dependsOnComponents:
- type: AllowSuitStorage
displayName: Suit Storage
- name: outerClothing
slotTexture: suit
slotFlags: OUTERCLOTHING
stripTime: 6
uiWindowPos: 0,3
strippingWindowPos: 1,3
displayName: Suit
whitelist:
tags:
- ScurretWearable

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

@@ -26,7 +26,7 @@
id: Headphones
storage:
back:
- ClothingNeckHeadphones
- ClothingMultipleHeadphones
# Toys
- type: loadout

8
Resources/Prototypes/Maps/exo.yml
View File

@@ -2,8 +2,8 @@
id: Exo
mapName: 'Exo'
mapPath: /Maps/exo.yml
minPlayers: 30
maxPlayers: 70
minPlayers: 40
maxPlayers: 80
stations:
Exo:
stationProto: StandardNanotrasenStation
@@ -25,7 +25,7 @@
Bartender: [ 2, 2 ]
Botanist: [ 2, 2 ]
Chef: [ 2, 2 ]
Janitor: [ 1, 2 ]
Janitor: [ 2, 2 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
@@ -54,7 +54,7 @@
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 3 ]
CargoTechnician: [ 4, 4 ]
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]

15
Resources/Prototypes/Palettes/critters.yml
View File

@@ -41,3 +41,18 @@
HornA: "#d4c8bf"
hornB: "#eec7ab"
hornC: "#ad9584"
- type: palette
id: ScurretColors
name: ScurretColors
colors:
Normal: "#ffffff" # Sluggy
Innocent: "#f6f439" # Monky
Angry: "#dc5864" # Hunty
Perceptive: "#222222" # Watchy
Eldritch: "#dc5864"
Fat: "#fefcab"
Violent: "#ab3430"
Speedy: "#679cfe"
Mutated: "#7824a0"
Damned: "#98e652"

41
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
View File

@@ -27,12 +27,11 @@
- !type:AdjustReagent
reagent: Ethanol
amount: 0.05
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
conditions:
- !type:ReagentThreshold
min: 10
key: SeeingRainbows
component: SeeingRainbows
type: Add
time: 5
refresh: false
@@ -2018,9 +2017,9 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
fizziness: 0.25
@@ -2049,9 +2048,9 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
fizziness: 0.15
@@ -2080,9 +2079,9 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
fizziness: 0.15
@@ -2111,9 +2110,9 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
fizziness: 0.25
@@ -2142,9 +2141,9 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
fizziness: 0.15
@@ -2173,9 +2172,9 @@
- !type:AdjustReagent
reagent: Theobromine
amount: 0.05
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
fizziness: 0.25

30
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
View File

@@ -12,9 +12,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:GenericStatusEffect
key: Drowsiness
time: 2.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 2
type: Remove
- !type:AdjustReagent
reagent: Theobromine
@@ -105,9 +105,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:GenericStatusEffect
key: Drowsiness
time: 2.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 2
type: Remove
- type: reagent
@@ -161,9 +161,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:GenericStatusEffect
key: Drowsiness
time: 2.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 2
type: Remove
- type: reagent
@@ -342,9 +342,9 @@
effects:
- !type:SatiateThirst
factor: 6
- !type:GenericStatusEffect
key: Drowsiness
time: 3.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 3
type: Remove
Poison:
effects:
@@ -383,9 +383,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:GenericStatusEffect
key: Drowsiness
time: 2.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 2
type: Remove
- type: reagent

14
Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
View File

@@ -18,9 +18,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:GenericStatusEffect
key: Drowsiness
time: 1.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1
type: Remove
- type: reagent
@@ -80,9 +80,9 @@
effects:
- !type:SatiateThirst
factor: 2
- !type:GenericStatusEffect
key: Drowsiness
time: 2.0
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 2
type: Remove
- !type:AdjustReagent
reagent: Theobromine
@@ -261,7 +261,7 @@
state: icon_empty
metamorphicMaxFillLevels: 5
metamorphicFillBaseName: fill-
metamorphicChangeColor: false
metamorphicChangeColor: false
metabolisms:
Drink:
effects:

7
Resources/Prototypes/Reagents/cleaning.yml
View File

@@ -107,11 +107,10 @@
metabolisms:
Narcotic:
effects:
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
type: Add
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
time: 5
type: Add
refresh: false
Drink:
effects:

15
Resources/Prototypes/Reagents/gases.yml
View File

@@ -360,7 +360,7 @@
shouldHave: false
walkSpeedModifier: 0.65
sprintSpeedModifier: 0.65
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
conditions:
- !type:ReagentThreshold
reagent: NitrousOxide
@@ -368,8 +368,7 @@
- !type:OrganType
type: Slime
shouldHave: false
key: ForcedSleep
component: ForcedSleeping
effectProto: StatusEffectForcedSleeping
time: 3
type: Add
- !type:HealthChange
@@ -403,9 +402,8 @@
damage:
types:
Cellular: 1
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
type: Add
time: 15
refresh: false
@@ -440,13 +438,12 @@
damage:
types:
Cellular: 0.5
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
conditions:
- !type:ReagentThreshold
reagent: Frezon
min: 1
key: SeeingRainbows
component: SeeingRainbows
effectProto: StatusEffectSeeingRainbow
type: Add
time: 500
refresh: false

31
Resources/Prototypes/Reagents/medicine.yml
View File

@@ -83,9 +83,8 @@
key: Jitter
time: 3.0
type: Remove
- !type:GenericStatusEffect
key: Drowsiness
component: Drowsiness
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 1.5
type: Add
refresh: false
@@ -750,8 +749,8 @@
key: KnockedDown
time: 3.0
type: Remove
- !type:GenericStatusEffect
key: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
time: 15.0
type: Remove
@@ -923,8 +922,8 @@
- !type:GenericStatusEffect
key: Stutter
component: StutteringAccent
- !type:GenericStatusEffect
key: Drowsiness
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 10
type: Remove
- !type:ResetNarcolepsy
@@ -948,8 +947,8 @@
metabolisms:
Medicine:
effects:
- !type:GenericStatusEffect
key: Drowsiness
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 10
type: Remove
- !type:ResetNarcolepsy
@@ -1324,12 +1323,11 @@
damage:
types:
Poison: 2
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
conditions:
- !type:ReagentThreshold
min: 30
key: SeeingRainbows
component: SeeingRainbows
type: Add
time: 8
refresh: false
@@ -1390,9 +1388,8 @@
emote: Yawn
showInChat: true
probability: 0.1
- !type:GenericStatusEffect
key: Drowsiness
component: Drowsiness
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 4
type: Add
refresh: false
@@ -1400,8 +1397,8 @@
key: Jitter
time: 4.0
type: Remove
- !type:GenericStatusEffect
key: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
time: 10.0
type: Remove
- !type:AdjustReagent

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

@@ -40,12 +40,12 @@
key: KnockedDown
time: 3
type: Remove
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
conditions:
- !type:ReagentThreshold
reagent: Haloperidol
max: 0.01
key: Drowsiness
effectProto: StatusEffectDrowsiness
time: 10
type: Remove
Medicine:
@@ -88,12 +88,12 @@
key: KnockedDown
time: 1
type: Remove
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
conditions:
- !type:ReagentThreshold
reagent: Haloperidol
max: 0.01
key: Drowsiness
effectProto: StatusEffectDrowsiness
time: 10
type: Remove
- !type:PopupMessage
@@ -152,16 +152,16 @@
component: StaminaModifier
time: 3
type: Add
- !type:GenericStatusEffect
key: ForcedSleep
- !type:ModifyStatusEffect
effectProto: StatusEffectForcedSleeping
time: 3
type: Remove
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
conditions:
- !type:ReagentThreshold
reagent: Haloperidol
max: 0.01
key: Drowsiness
effectProto: StatusEffectDrowsiness
time: 10
type: Remove
Medicine:
@@ -198,11 +198,10 @@
metabolisms:
Narcotic:
effects:
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
type: Add
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
time: 16
type: Add
refresh: false
- type: reagent
@@ -236,11 +235,10 @@
damage:
types:
Poison: 2
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
type: Add
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
time: 10
type: Add
refresh: false
- !type:ChemVomit # Vomiting is a symptom of brain damage
probability: 0.05
@@ -258,9 +256,8 @@
metabolisms:
Narcotic:
effects:
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
type: Add
time: 5
refresh: false
@@ -276,9 +273,8 @@
metabolisms:
Narcotic:
effects:
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
type: Add
time: 5
refresh: false
@@ -296,14 +292,13 @@
metabolisms:
Narcotic:
effects:
- !type:GenericStatusEffect
- !type:ModifyStatusEffect
conditions:
- !type:ReagentThreshold
reagent: Nocturine
min: 8
key: ForcedSleep
component: ForcedSleeping
refresh: false
effectProto: StatusEffectForcedSleeping
time: 3
type: Add
- type: reagent
@@ -468,9 +463,8 @@
conditions:
- !type:ReagentThreshold
max: 20
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
type: Add
time: 5
refresh: false

10
Resources/Prototypes/Reagents/toxins.yml
View File

@@ -63,9 +63,8 @@
- !type:MovespeedModifier
walkSpeedModifier: 0.65
sprintSpeedModifier: 0.65
- !type:GenericStatusEffect
key: Drowsiness
component: Drowsiness
- !type:ModifyStatusEffect
effectProto: StatusEffectDrowsiness
time: 4
type: Add
refresh: false
@@ -340,9 +339,8 @@
metabolisms:
Poison:
effects:
- !type:GenericStatusEffect
key: SeeingRainbows
component: SeeingRainbows
- !type:ModifyStatusEffect
effectProto: StatusEffectSeeingRainbow
type: Add
time: 10
refresh: false

12
Resources/Prototypes/Recipes/Construction/Graphs/furniture/tables.yml
View File

@@ -404,3 +404,15 @@
steps:
- tool: Prying
doAfter: 1
- node: TableXeno
entity: TableXeno
edges:
- to: TableFrame
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 1
steps:
- tool: Anchoring
doAfter: 1

22
Resources/Prototypes/Recipes/Construction/Graphs/utilities/atmos_binary.yml
View File

@@ -22,6 +22,12 @@
amount: 2
doAfter: 1
- to: pressureregulator
steps:
- material: Steel
amount: 2
doAfter: 1
- to: valve
steps:
- material: Steel
@@ -106,6 +112,22 @@
- tool: Welding
doAfter: 1
- node: pressureregulator
entity: GasPressureRegulator
edges:
- to: start
conditions:
- !type:EntityAnchored
anchored: false
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity
steps:
- tool: Welding
doAfter: 1
- node: valve
entity: GasValve
edges:

11
Resources/Prototypes/Recipes/Construction/utilities.yml
View File

@@ -572,6 +572,17 @@
conditions:
- !type:NoUnstackableInTile
- type: construction
id: GasPressureRegulator
graph: GasBinary
startNode: start
targetNode: pressureregulator
category: construction-category-utilities
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:NoUnstackableInTile
- type: construction
id: GasValve
graph: GasBinary

2
Resources/Prototypes/Recipes/Lathes/tiles.yml
View File

@@ -229,7 +229,7 @@
result: FloorTileItemSteelMaint
- type: latheRecipe
parent: BaseTileRecipe
parent: BaseMaintTileRecipe
id: FloorTileItemTechmaintDark
result: FloorTileItemTechmaintDark

2
Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
View File

@@ -32,6 +32,6 @@
equipment:
head: ClothingHeadHatTophat
mask: ClothingMaskBreath
neck: ClothingNeckHeadphones
neck: ClothingMultipleHeadphones
outerClothing: ClothingOuterWinterMusician
gloves: ClothingHandsGlovesColorBlack

7
Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
View File

@@ -103,6 +103,13 @@
jumpsuit: ClothingUniformJumpsuitJacketMonkey
id: PunPunIDCard
# Emotional Support Scurret
- type: startingGear
id: EmotionalSupportScurretGear
equipment:
id: ScurretPDA
# DeathMatch Gear
- type: startingGear

11
Resources/Prototypes/Shaders/Stencils.yml
View File

@@ -7,6 +7,7 @@
op: Replace
func: Always
# Draws to the stencil buffer if the alpha is not set to 0.
- type: shader
id: StencilMask
kind: source
@@ -16,6 +17,7 @@
op: Replace
func: Always
# Draws if the texture in the stencil buffer is not equal to white.
- type: shader
id: StencilDraw
kind: canvas
@@ -23,3 +25,12 @@
ref: 1
op: Keep
func: NotEqual
# Draws if the texture in the stencil buffer is equal to white.
- type: shader
id: StencilEqualDraw
kind: canvas
stencil:
ref: 1
op: Keep
func: Equal

7
Resources/Prototypes/Shaders/displacement.yml
View File

@@ -8,3 +8,10 @@
func: NotEqual
params:
displacementSize: 127
- type: shader
id: DisplacedDraw
kind: source
path: "/Textures/Shaders/displacement.swsl"
params:
displacementSize: 127

5
Resources/Prototypes/SoundCollections/drink_close_sounds.yml
View File

@@ -2,3 +2,8 @@
id: bottleCloseSounds
files:
- /Audio/Items/bottle_close1.ogg
- type: soundCollection
id: flaskCloseSounds
files:
- /Audio/Items/flask_close1.ogg

5
Resources/Prototypes/SoundCollections/drink_open_sounds.yml
View File

@@ -19,3 +19,8 @@
id: pop
files:
- /Audio/Items/pop.ogg
- type: soundCollection
id: flaskOpenSounds
files:
- /Audio/Items/flask_open1.ogg

34
Resources/Prototypes/SoundCollections/scurret.yml Normal file
View File

@@ -0,0 +1,34 @@
- type: soundCollection
id: WawaLaugh
files:
- /Audio/Animals/wawa_mock.ogg
- type: soundCollection
id: WawaSneeze
files:
- /Audio/Animals/wawa_achoo.ogg
- type: soundCollection
id: WawaSigh
files:
- /Audio/Animals/wawa_depression.ogg
- type: soundCollection
id: WawaScream
files:
- /Audio/Animals/wawa_protest.ogg
- type: soundCollection
id: WawaCry
files:
- /Audio/Animals/wawa_despair.ogg
- type: soundCollection
id: WawaYawn
files:
- /Audio/Animals/wawa_yawn.ogg
- type: soundCollection
id: WawaDeath
files:
- /Audio/Animals/wawa_the_end.ogg

2
Resources/Prototypes/Tiles/planet.yml
View File

@@ -1,6 +1,6 @@
- type: tile
id: FloorPlanetDirt
name: tiles-dirt-floor
name: tiles-dirt-planet-floor
sprite: /Textures/Tiles/Planet/dirt.rsi/dirt.png
variants: 4
placementVariants:

6
Resources/Prototypes/Traits/disabilities.yml
View File

@@ -45,9 +45,9 @@
cloneable: true
- type: trait
id: Monochromancy
name: trait-monochromancy-name
description: trait-monochromancy-desc
id: Monochromacy
name: trait-monochromacy-name
description: trait-monochromacy-desc
category: Disabilities
components:
- type: BlackAndWhiteOverlay

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

@@ -575,3 +575,51 @@
path: /Audio/Animals/goat_bah.ogg
params:
variation: 0.125
- type: emoteSounds
id: Scurret
params:
variation: 0.125
sounds:
Thump:
path: /Audio/Effects/soft_thump.ogg
params:
variation: 0.125
Clap:
collection: Claps
ClapSingle:
collection: ClapSingle
Snap:
collection: Snaps
params:
volume: -6
Salute:
collection: Salutes
Laugh:
collection: WawaLaugh
Sneeze:
collection: WawaSneeze
Cough:
collection: MaleCoughs
Whistle:
collection: Whistles
Sigh:
collection: WawaSigh
Scream:
collection: WawaScream
Yawn:
collection: WawaYawn
Crying:
collection: WawaCry
Snore:
collection: Snores
Weh:
collection: Weh
Hew:
collection: Hew
Honk:
collection: BikeHorn
Gasp:
collection: MaleGasp
DefaultDeathgasp:
collection: WawaDeath

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

@@ -410,6 +410,12 @@
icon: Interface/Emotes/deathgasp.png
chatMessages: ["chat-emote-msg-deathgasp-monkey"]
- type: emote
id: ScurretDeathgasp
name: chat-emote-name-deathgasp
icon: Interface/Emotes/deathgasp.png
chatMessages: ["chat-emote-msg-deathgasp-scurret"]
- type: emote
id: Buzz
name: chat-emote-name-buzz

9
Resources/Prototypes/Voice/speech_sounds.yml
View File

@@ -177,3 +177,12 @@
path: /Audio/Animals/goat_bah.ogg
exclaimSound:
path: /Audio/Animals/goat_bah.ogg
- type: speechSounds
id: Wawa
saySound:
path: /Audio/Animals/wawa_statement.ogg
askSound:
path: /Audio/Animals/wawa_question.ogg
exclaimSound:
path: /Audio/Animals/wawa_exclaim.ogg

9
Resources/Prototypes/Voice/speech_verbs.yml
View File

@@ -172,3 +172,12 @@
- chat-speech-verb-electricity-1
- chat-speech-verb-electricity-2
- chat-speech-verb-electricity-3
- type: speechVerb
id: Wawa
name: chat-speech-verb-name-wawa
speechVerbStrings:
- chat-speech-verb-wawa-1
- chat-speech-verb-wawa-2
- chat-speech-verb-wawa-3
- chat-speech-verb-wawa-4

12
Resources/Prototypes/status_effects.yml
View File

@@ -1,6 +1,9 @@
# Status effect prototypes.
# Holds no actual logic, just some basic data about the effect.
# Note: We have a new status effect system that needs all of these status effects to be fully ported to.
# Adding new status effects under the old system is NOT RECOMMENDED.
- type: statusEffect
id: Stun
alert: Stun
@@ -22,9 +25,6 @@
- type: statusEffect
id: AllCaps
- type: statusEffect
id: SeeingRainbows
- type: statusEffect
id: Electrocution
@@ -45,9 +45,6 @@
id: Corporeal
alert: Corporeal
- type: statusEffect
id: ForcedSleep #I.e., they will not wake on damage or similar
- type: statusEffect
id: TemporaryBlindness
@@ -66,9 +63,6 @@
- type: statusEffect
id: RadiationProtection
- type: statusEffect
id: Drowsiness #blurs your vision and makes you randomly fall asleep
- type: statusEffect
id: Adrenaline
alert: Adrenaline

5
Resources/Prototypes/tags.yml
View File

@@ -225,7 +225,6 @@
- type: Tag
id: CanPilot
- type: Tag
id: CaptainSabre
@@ -1203,6 +1202,9 @@
- type: Tag
id: Screwdriver
- type: Tag # Flags items that scurrets can wear in their back and outerwear slots.
id: ScurretWearable
- type: Tag
id: SecBeltEquip
@@ -1514,5 +1516,4 @@
- type: Tag
id: XenoborgModuleStealth
# ALPHABETICAL