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

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

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
This commit is contained in:
Ed
2024-06-17 14:20:38 +03:00
parent 2b577ebfbe efbcce21bd
commit 04d29b6268
351 changed files with 27677 additions and 9596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,16 @@
category: cargoproduct-category-name-service
group: market
- type: cargoProduct
id: ServiceFaxMachine
icon:
sprite: Structures/Machines/fax_machine.rsi
state: icon
product: CrateServiceFaxMachine
cost: 2000
category: cargoproduct-category-name-service
group: market
- type: cargoProduct
id: ServicePersonnel
icon:

2
Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
View File

@@ -43,7 +43,7 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockAutoDrobeFilled
cost: 1200
cost: 1300
category: cargoproduct-category-name-service
group: market

4
Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
View File

@@ -54,7 +54,7 @@
name: deathrattle implant box
parent: BoxCardboard
id: BoxDeathRattleImplants
description: Six deathrattle implants and handheld GPS devices for the whole squad.
description: Six deathrattle implants for the whole squad.
components:
- type: Sprite
layers:
@@ -67,5 +67,3 @@
contents:
- id: DeathRattleImplanter
amount: 6
- id: HandheldGPSBasic
amount: 6

11
Resources/Prototypes/Catalog/Fills/Crates/service.yml
View File

@@ -129,6 +129,17 @@
- id: BoxFolderYellow
- id: NewtonCradle
- type: entity
id: CrateServiceFaxMachine
parent: CrateGenericSteel
name: fax machine crate
description: A fax machine and a screwdriver to set the name with.
components:
- type: StorageFill
contents:
- id: Screwdriver
- id: FaxMachineFlatpack
- type: entity
id: CrateServicePersonnel
parent: CrateCommandSecure

4
Resources/Prototypes/Catalog/Fills/Crates/vending.yml
View File

@@ -132,8 +132,8 @@
- type: entity
id: CrateVendingMachineRestockRobustSoftdrinksFilled
parent: CratePlastic
name: Robust Softdrinks restock crate
description: Contains two restock boxes for the Robust Softdrinks LLC vending machine.
name: beverage vendor restock crate
description: Contains restock boxes for beverage vending machines.
components:
- type: StorageFill
contents:

34
Resources/Prototypes/Catalog/Fills/Items/misc.yml
View File

@@ -1,12 +1,32 @@
- type: entity
id: ClothingShoesBootsCombatFilled
parent: ClothingShoesBootsCombat
suffix: Filled
components:
- type: ContainerFill
containers:
item:
- CombatKnife
parent:
- ClothingShoesBootsCombat
- ClothingShoesBootsSecFilled
- type: entity
id: ClothingShoesBootsJackFilled
parent:
- ClothingShoesBootsJack
- ClothingShoesBootsSecFilled
- type: entity
id: ClothingShoesBootsWinterSecFilled
parent:
- ClothingShoesBootsWinterSec
- ClothingShoesBootsSecFilled
- type: entity
id: ClothingShoesBootsCowboyBlackFilled
parent:
- ClothingShoesBootsCowboyBlack
- ClothingShoesBootsSecFilled
- type: entity
id: ClothingShoesHighheelBootsFilled
parent:
- ClothingShoesHighheelBoots
- ClothingShoesBootsSecFilled
- type: entity
id: ClothingShoesBootsMercFilled

4
Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View File

@@ -19,9 +19,7 @@
ClothingOuterWinterSec: 2
ClothingOuterArmorBasic: 2
ClothingNeckScarfStripedRed: 3
ClothingOuterArmorBasicSlim: 2
ClothingOuterArmorBasicSlim: 2
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingShoesBootsCowboyBlack: 1
ClothingHeadHatCowboyBlack: 1

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

@@ -29,6 +29,8 @@
ClothingHeadHatShrineMaidenWig: 2
ClothingOuterSuitShrineMaiden: 2
Gohei: 2
ClothingOuterSuitWitchRobes: 2
ClothingHeadHatWitch1: 2
ClothingHeadHatRedRacoon: 2
ClothingOuterRedRacoon: 2
ClothingHeadPaperSack: 2

23
Resources/Prototypes/Catalog/uplink_catalog.yml
View File

@@ -904,7 +904,7 @@
name: uplink-reinforcement-radio-name
description: uplink-reinforcement-radio-desc
productEntity: ReinforcementRadioSyndicate
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
cost:
Telecrystal: 16
categories:
@@ -920,7 +920,7 @@
name: uplink-reinforcement-radio-name
description: uplink-reinforcement-radio-desc
productEntity: ReinforcementRadioSyndicateNukeops
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist }
cost:
Telecrystal: 16
categories:
@@ -936,7 +936,7 @@
name: uplink-reinforcement-radio-cyborg-assault-name
description: uplink-reinforcement-radio-cyborg-assault-desc
productEntity: ReinforcementRadioSyndicateCyborgAssault
icon: { sprite: Mobs/Silicon/chassis.rsi, state: synd_sec }
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault }
cost:
Telecrystal: 65
categories:
@@ -952,7 +952,7 @@
name: uplink-reinforcement-radio-ancestor-name
description: uplink-reinforcement-radio-ancestor-desc
productEntity: ReinforcementRadioSyndicateAncestor
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
cost:
Telecrystal: 6
categories:
@@ -968,7 +968,7 @@
name: uplink-reinforcement-radio-ancestor-name
description: uplink-reinforcement-radio-ancestor-desc
productEntity: ReinforcementRadioSyndicateAncestorNukeops
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio }
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-ancestor }
cost:
Telecrystal: 6
categories:
@@ -998,7 +998,7 @@
id: UplinkMobCatMicrobomb
name: uplink-mobcat-microbomb-name
description: uplink-mobcat-microbomb-desc
icon: { sprite: /Textures/Mobs/Pets/cat.rsi, state: syndicat }
icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-syndicat }
productEntity: ReinforcementRadioSyndicateSyndiCat
cost:
Telecrystal: 6
@@ -1276,6 +1276,17 @@
categories:
- UplinkWearables
- type: listing
id: UplinkHardsuitCarp
name: uplink-hardsuit-carp-name
description: uplink-hardsuit-carp-desc
icon: { sprite: /Textures/Clothing/OuterClothing/Suits/carpsuit.rsi, state: icon }
productEntity: ClothingOuterHardsuitCarp
cost:
Telecrystal: 4
categories:
- UplinkWearables
- type: listing
id: UplinkHardsuitSyndie
name: uplink-hardsuit-syndie-name

39
Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
View File

@@ -10,3 +10,42 @@
- type: Item
size: Small
storedRotation: -90
- type: entity
parent: [ClothingEyesBase, BaseFoldable]
id: ClothingHeadEyeBaseFlippable
abstract: true
components:
- type: Appearance
- type: FlippableClothingVisuals
- type: Foldable
canFoldInsideContainer: true
unfoldVerbText: fold-flip-verb
foldVerbText: fold-flip-verb
- type: FoldableClothing
- type: Sprite
layers:
- map: [ "unfoldedLayer" ]
state: icon
- map: ["foldedLayer"]
state: icon
visible: false
scale: -1,1
- type: entity
parent: ClothingHeadEyeBaseFlippable
id: ClothingHeadEyeBaseFlipped
suffix: flipped
abstract: true
components:
- type: Foldable
folded: true
- type: Sprite
layers:
- map: [ "unfoldedLayer" ]
state: icon
visible: false
- map: ["foldedLayer"]
state: icon
visible: true
scale: -1,1

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

@@ -220,7 +220,7 @@
suffix: Syndicate
- type: entity
parent: ClothingEyesHudMedical
parent: [ClothingEyesHudMedical, ClothingHeadEyeBaseFlippable]
id: ClothingEyesEyepatchHudMedical
name: medical hud eyepatch
description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. For true patriots.
@@ -231,7 +231,12 @@
sprite: Clothing/Eyes/Hud/medpatch.rsi
- type: entity
parent: ClothingEyesHudSecurity
parent: [ClothingEyesEyepatchHudMedical, ClothingHeadEyeBaseFlipped]
id: ClothingEyesEyepatchHudMedicalFlipped
name: medical hud eyepatch
- type: entity
parent: [ClothingEyesHudSecurity, ClothingHeadEyeBaseFlippable]
id: ClothingEyesEyepatchHudSecurity
name: security hud eyepatch
description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. For true patriots.
@@ -242,7 +247,12 @@
sprite: Clothing/Eyes/Hud/secpatch.rsi
- type: entity
parent: ClothingEyesHudBeer
parent: [ClothingEyesEyepatchHudSecurity, ClothingHeadEyeBaseFlipped]
id: ClothingEyesEyepatchHudSecurityFlipped
name: security hud eyepatch
- type: entity
parent: [ClothingEyesHudBeer, ClothingHeadEyeBaseFlippable]
id: ClothingEyesEyepatchHudBeer
name: beer hud eyepatch
description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. For true patriots.
@@ -253,7 +263,12 @@
sprite: Clothing/Eyes/Hud/beerpatch.rsi
- type: entity
parent: ClothingEyesBase
parent: [ClothingEyesEyepatchHudBeer, ClothingHeadEyeBaseFlipped]
id: ClothingEyesEyepatchHudBeerFlipped
name: beer hud eyepatch
- type: entity
parent: [ClothingEyesHudDiagnostic, ClothingHeadEyeBaseFlippable]
id: ClothingEyesEyepatchHudDiag
name: diagnostic hud eyepatch
description: A heads-up display capable of analyzing the integrity and status of robotics and exosuits. Made out of see-borg-ium.
@@ -262,7 +277,8 @@
sprite: Clothing/Eyes/Hud/diagpatch.rsi
- type: Clothing
sprite: Clothing/Eyes/Hud/diagpatch.rsi
- type: ShowHealthBars
damageContainers:
- Inorganic
- Silicon
- type: entity
parent: [ClothingEyesEyepatchHudDiag, ClothingHeadEyeBaseFlipped]
id: ClothingEyesEyepatchHudDiagFlipped
name: diagnostic hud eyepatch

31
Resources/Prototypes/Entities/Clothing/Eyes/misc.yml
View File

@@ -1,16 +1,3 @@
- type: entity
parent: ClothingEyesBase
id: ClothingEyesEyepatch
name: eyepatch
description: Yarr.
components:
- type: Sprite
sprite: Clothing/Eyes/Misc/eyepatch.rsi
- type: Clothing
sprite: Clothing/Eyes/Misc/eyepatch.rsi
- type: EyeProtection
protectionTime: 5
- type: entity
parent: ClothingEyesBase
id: ClothingEyesBlindfold
@@ -26,3 +13,21 @@
graph: Blindfold
node: blindfold
- type: FlashImmunity
- type: entity
parent: ClothingHeadEyeBaseFlippable
id: ClothingEyesEyepatch
name: eyepatch
description: Yarr.
components:
- type: Sprite
sprite: Clothing/Eyes/Misc/eyepatch.rsi
- type: Clothing
sprite: Clothing/Eyes/Misc/eyepatch.rsi
- type: EyeProtection
protectionTime: 5
- type: entity
parent: [ClothingEyesEyepatch, ClothingHeadEyeBaseFlipped]
id: ClothingEyesEyepatchFlipped
suffix: flipped

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

@@ -206,6 +206,22 @@
slots:
- Hair
- type: entity
parent: ClothingHeadHatHoodCarp
id: ClothingHeadHelmetHardsuitCarp
noSpawn: true
components:
- type: PressureProtection
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.2
- type: BreathMask
# this is on the hood so you only fool the fish if you wear the whole set
# wear carp suit and security helmet, they'll know you are fake
- type: FactionClothing
faction: Dragon
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatHoodMoth

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

@@ -190,6 +190,17 @@
- type: Clothing
sprite: Clothing/OuterClothing/Suits/shrine-maiden.rsi
- type: entity
parent: ClothingOuterBase
id: ClothingOuterSuitWitchRobes
name: witch robes
description: Magic is all about the spell power, ZE!
components:
- type: Sprite
sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Suits/witchrobe.rsi
- type: entity
parent: ClothingOuterBase
id: ClothingOuterSuitMonkey
@@ -246,3 +257,16 @@
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
- type: entity
parent: ClothingOuterSuitCarp
id: ClothingOuterHardsuitCarp
suffix: Hardsuit, DO NOT MAP
components:
- type: PressureProtection
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: TemperatureProtection
coefficient: 0.01
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitCarp

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

@@ -52,6 +52,16 @@
- Knife
- Sidearm
- type: entity
abstract: true
id: ClothingShoesBootsSecFilled
suffix: Filled
components:
- type: ContainerFill
containers:
item:
- CombatKnife
- type: entity
abstract: true
parent: ClothingShoesBaseButcherable

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

@@ -143,7 +143,7 @@
sprite: Clothing/Shoes/Boots/winterbootssci.rsi
- type: entity
parent: ClothingShoesBaseWinterBoots
parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase]
id: ClothingShoesBootsWinterSec
name: security winter boots
components:

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

@@ -81,7 +81,7 @@
price: 3000
- type: entity
parent: ClothingShoesBase
parent: [ClothingShoesBootsMag, BaseJetpack]
id: ClothingShoesBootsMagSyndie
name: blood-red magboots
description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters.
@@ -106,27 +106,9 @@
moles:
- 0.153853429 # oxygen
- 0.153853429 # nitrogen
- type: ActivatableUI
key: enum.SharedGasTankUiKey.Key
- type: UserInterface
interfaces:
enum.SharedGasTankUiKey.Key:
type: GasTankBoundUserInterface
- type: Explosive
explosionType: Default
maxIntensity: 20
- type: Jetpack
moleUsage: 0.00085
- type: CanMoveInAir
- type: InputMover
toParent: true
- type: MovementSpeedModifier
weightlessAcceleration: 1
weightlessFriction: 0.3
weightlessModifier: 1.2
- type: Tag
tags:
- WhitelistChameleon
- type: Item
sprite: null
size: Normal
- type: entity
id: ActionBaseToggleMagboots

18
Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
View File

@@ -134,3 +134,21 @@
event: !type:ToggleClothingSpeedEvent
icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon }
iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on }
- type: entity
parent: ClothingShoesBase
id: ClothingShoesBootsMoon
name: moon boots
description: Special anti-gravity boots developed with a speciality blend of lunar rock gel. Shipped from the Netherlands.
components:
- type: Sprite
sprite: Clothing/Shoes/Boots/moonboots.rsi
layers:
- state: icon
- type: Clothing
sprite: Clothing/Shoes/Boots/moonboots.rsi
- type: AntiGravityClothing
- type: StaticPrice
price: 75
- type: Tag
tags: [ ]

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

@@ -294,6 +294,15 @@
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_bighorn
- type: marking
id: LizardHornsDemonic
bodyPart: HeadTop
markingCategory: HeadTop
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
state: horns_demonic
- type: marking
id: LizardHornsKoboldEars
bodyPart: HeadTop

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

@@ -227,9 +227,20 @@
deviceNetId: Wireless
receiveFrequencyId: CyborgControl
transmitFrequencyId: RoboticsConsole
- type: OnUseTimerTrigger
delay: 10
examinable: false
beepSound:
path: /Audio/Effects/Cargo/buzz_two.ogg
params:
volume: -4
# prevent any funnies if someone makes a cyborg item...
- type: AutomatedTimer
- type: ExplodeOnTrigger
# explosion does most of its damage in the center and less at the edges
- type: Explosive
explosionType: Minibomb
deleteAfterExplosion: false # let damage threshold gib the borg
totalIntensity: 30
intensitySlope: 20
maxIntensity: 20

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

@@ -181,6 +181,9 @@
- MobMask
layer:
- MobLayer
- type: Speech
speechVerb: SmallMob
speechSounds: Cluck
- type: Tag
tags:
- DoorBumpOpener
@@ -2226,7 +2229,7 @@
solution: melee
generated:
reagents:
- ReagentId: Toxin
- ReagentId: Mechanotoxin
Quantity: 1
- type: MeleeChemicalInjector
transferAmount: 0.75

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

@@ -15,7 +15,7 @@
true
- type: NpcFactionMember
factions:
- SimpleHostile
- Dragon
- type: Sprite
drawdepth: Mobs
sprite: Mobs/Aliens/Carps/space.rsi

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

@@ -1021,6 +1021,20 @@
tags:
- MicrowaveMachineBoard
- type: entity
id: SyndicateMicrowaveMachineCircuitboard
parent: BaseMachineCircuitboard
name: donk co. microwave machine board
components:
- type: Sprite
state: service
- type: MachineBoard
prototype: SyndicateMicrowave
stackRequirements:
Capacitor: 1
Glass: 2
Cable: 2
- type: entity
id: FatExtractorMachineCircuitboard
parent: BaseMachineCircuitboard

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

@@ -204,3 +204,15 @@
components:
- type: Flatpack
entity: SpaceHeaterAnchored
- type: entity
parent: BaseFlatpack
id: FaxMachineFlatpack
name: fax machine flatpack
description: A flatpack used for constructing a fax machine.
components:
- type: Sprite
layers:
- state: fax-machine
- type: Flatpack
entity: FaxMachineBase

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

@@ -27,7 +27,7 @@
guides:
- Security
- type: UseDelay
delay: 6
delay: 3
- type: entity
name: makeshift handcuffs

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

@@ -571,7 +571,7 @@
amount: 5
- type: entity
name: space drugs
name: space mirage
parent: Pill
id: PillSpaceDrugs
components:
@@ -958,7 +958,7 @@
Quantity: 15
- type: entity
name: stimulants syringe
name: hyperzine syringe
parent: PrefilledSyringe
id: SyringeStimulants
components:

8
Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
View File

@@ -318,10 +318,10 @@
tags: []
- type: entity
name: stimulant injector
name: hyperzine injector
parent: ChemicalMedipen
id: Stimpack
description: Contains enough stimulants for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
components:
- type: Sprite
sprite: Objects/Specific/Medical/medipen.rsi
@@ -350,10 +350,10 @@
tags: []
- type: entity
name: stimulant microinjector
name: hyperzine microinjector
parent: ChemicalMedipen
id: StimpackMini
description: A microinjector of stimulants that give you about fifteen seconds of the chemical's effects.
description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects.
components:
- type: Sprite
sprite: Objects/Specific/Medical/medipen.rsi

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

@@ -79,7 +79,6 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Label
originalName: jug
- type: Tag
tags:
- ChemDispensable

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
View File

@@ -361,7 +361,7 @@
whitelist:
tags:
- CartridgeRocket
proto: MeteorLarge
proto: MeteorMedium
- type: entity
name: immovable rod launcher

204
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
View File

@@ -1,40 +1,206 @@
- type: entity
id: MeteorLarge
id: BaseMeteor
name: meteor
noSpawn: true
description: You prefer them when they're burning up in the atmosphere.
abstract: true
components:
- type: Sprite
noRot: false
sprite: Objects/Weapons/Guns/Projectiles/meteor.rsi
scale: 4,4
layers:
- state: large
shader: unshaded
- type: ExplodeOnTrigger
- type: DeleteOnTrigger
- type: TriggerOnCollide
fixtureID: projectile
sprite: Objects/Misc/meteor.rsi
- type: Projectile
damage: {}
deleteOnCollide: false
- type: Explosive
explosionType: Default
totalIntensity: 600.0
intensitySlope: 30
maxIntensity: 45
- type: Meteor
damageTypes:
types:
Blunt: 1
- type: TimedDespawn
lifetime: 120
- type: Clickable
- type: Physics
bodyType: Dynamic
bodyStatus: InAir
angularDamping: 0
linearDamping: 0
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeCircle
radius: 0.8
radius: 0.4
density: 100
hard: true
# Didn't use MapGridComponent for now as the bounds are stuffed.
hard: false
layer:
- LargeMobLayer
mask:
- Impassable
- BulletImpassable
- type: Damageable
damageContainer: Inorganic
- type: Explosive
explosionType: Default
intensitySlope: 4
maxIntensity: 100
- type: entity
parent: BaseMeteor
id: MeteorSpaceDust
name: space dust
description: Makes a station sneeze.
components:
- type: Sprite
state: space_dust
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeCircle
radius: 0.45
density: 100
hard: false
layer:
- LargeMobLayer
mask:
- Impassable
- BulletImpassable
- type: Explosive
totalIntensity: 25
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ExplodeBehavior
- type: entity
parent: BaseMeteor
id: MeteorSmall
suffix: Small
components:
- type: Sprite
state: small
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeCircle
radius: 0.25
density: 100
hard: false
layer:
- LargeMobLayer
mask:
- Impassable
- BulletImpassable
- type: Explosive
totalIntensity: 100
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1250
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ExplodeBehavior
- type: entity
parent: BaseMeteor
id: MeteorMedium
suffix: Medium
components:
- type: Sprite
state: medium
- type: Fixtures
fixtures:
projectile:
shape:
!type:PhysShapeCircle
radius: 0.3
density: 100
hard: false
layer:
- LargeMobLayer
mask:
- Impassable
- BulletImpassable
- type: Explosive
totalIntensity: 200
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 1750
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ExplodeBehavior
- type: entity
parent: BaseMeteor
id: MeteorLarge
suffix: Large
components:
- type: Sprite
state: big
- type: Explosive
totalIntensity: 300
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 2500
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: MetalBreak
- !type:ExplodeBehavior
- type: entity
parent: BaseMeteor
id: MeteorUrist
name: Urist McMeteor
description: As a successful member of society with a stable unflinching psyche and limitless drive, natural affinity for finance and domination, you have been selected, no, you have been effortlessly guided by divine (biological) trauma towards this moment. The gates of destiny fling open, and once again you're left standing on pulsating nothingness. A strobing headache of the soul.
suffix: Meteor
components:
- type: Sprite
state: human_pixel
- type: SolutionContainerManager
solutions:
blood:
maxVol: 1000
reagents:
- ReagentId: Blood
Quantity: 1000
- type: Explosive
totalIntensity: 25
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 3000
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:PlaySoundBehavior
sound:
collection: MaleScreams
params:
volume: 10
- !type:SpillBehavior
solution: blood
- !type:ExplodeBehavior

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

@@ -400,6 +400,7 @@
# Short lifespan
- type: TimedDespawn
lifetime: 0.4
- type: GatheringProjectile
- type: entity
id: BulletKineticShuttle

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -94,6 +94,7 @@
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -19
maxAngle: -16
@@ -131,6 +132,7 @@
- type: Clothing
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -19
maxAngle: -16

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

@@ -69,11 +69,12 @@
maxCount: 2
stationGrid: false
paths:
- /Maps/Ruins/chunked_tcomms.yml
- /Maps/Ruins/biodome_satellite.yml
- /Maps/Ruins/derelict.yml
- /Maps/Ruins/djstation.yml
- /Maps/Ruins/empty_flagship.yml
- /Maps/Ruins/old_ai_sat.yml
- /Maps/Ruins/relaystation.yml
- /Maps/Ruins/syndicate_dropship.yml
- /Maps/Ruins/whiteship_ancient.yml
- /Maps/Ruins/whiteship_bluespacejumper.yml

95
Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml Normal file
View File

@@ -0,0 +1,95 @@
- type: entity
id: Mannequin
parent: BaseStructureDynamic
name: mannequin
description: It can wear any clothing with style.
components:
- type: Appearance
- type: Sprite
sprite: Structures/Decoration/mannequin.rsi
state: mannequin
noRot: true
layers:
- map: [ "mannequin" ]
sprite: Structures/Decoration/mannequin.rsi
state: mannequin
- map: [ "jumpsuit" ]
- map: [ "outerClothing" ]
- map: [ "eyes" ]
- map: [ "neck" ]
- map: [ "back" ]
- map: [ "mask" ]
- map: [ "head" ]
- type: Rotatable
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeCircle
radius: 0.2
density: 200
mask:
- MachineMask
layer:
- MidImpassable
- BulletImpassable
- type: InteractionOutline
- type: Construction
graph: Mannequin
node: mannequin
- type: Damageable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 200
behaviors:
- !type:PlaySoundBehavior
sound:
collection: WoodDestroy
- !type:EmptyAllContainersBehaviour
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: ContainerContainer
containers:
jumpsuit: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
outerClothing: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
neck: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
mask: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
eyes: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
head: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
suitstorage: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
back: !type:ContainerSlot
showEnts: False
occludes: False
ent: null
- type: Inventory
templateId: mannequin
- type: InventorySlots
- type: Strippable
- type: UserInterface
interfaces:
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface

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

@@ -109,6 +109,12 @@
access: [ [ "Engineering" ] ]
- type: PryUnpowered
pryModifier: 0.5
- type: PointLight
energy: 0.5
radius: 1.75
color: Red
enabled: false
castShadows: false
- type: entity
id: Firelock

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

@@ -201,13 +201,14 @@
- BoxLethalshot
- BoxShotgunFlare
- BoxShotgunSlug
- CombatKnife
- MagazineBoxLightRifle
- MagazineBoxMagnum
- MagazineBoxPistol
- MagazineBoxRifle
- MagazineLightRifle
- MagazineLightRifleEmpty
- MagazinePistol
- MagazinePistol
- MagazinePistolEmpty
- MagazinePistolSubMachineGun
- MagazinePistolSubMachineGunEmpty
@@ -307,6 +308,7 @@
- WeaponGauntletGorilla
- SynthesizerInstrument
- ClothingShoesBootsMagSci
- ClothingShoesBootsMoon
- ClothingShoesBootsSpeed
- NodeScanner
- HolofanProjector
@@ -706,9 +708,10 @@
staticRecipes:
- BoxLethalshot
- BoxShotgunFlare
- BoxShotgunPractice
- BoxShotgunPractice
- BoxShotgunSlug
- ClothingEyesHudSecurity
- CombatKnife
- Flash
- ForensicPad
- Handcuffs
@@ -722,7 +725,7 @@
- MagazineBoxRiflePractice
- MagazineLightRifle
- MagazineLightRifleEmpty
- MagazinePistol
- MagazinePistol
- MagazinePistolEmpty
- MagazinePistolSubMachineGun
- MagazinePistolSubMachineGunEmpty
@@ -835,8 +838,8 @@
- MagazineBoxRifle
- MagazineLightRifle
- MagazineLightRifleEmpty
- MagazinePistol
- MagazinePistolEmpty
- MagazinePistol
- MagazinePistolEmpty
- MagazineRifle
- MagazineRifleEmpty
- MagazineShotgun

18
Resources/Prototypes/Entities/Structures/Machines/microwave.yml
View File

@@ -105,3 +105,21 @@
- type: GuideHelp
guides:
- Chef
- type: entity
id: SyndicateMicrowave
parent: KitchenMicrowave
name: donk co. microwave
description: So advanced, it can cook donk-pockets in a mere 2.5 seconds!
components:
- type: Microwave
cookTimeMultiplier: 0.5
capacity: 10
canMicrowaveIdsSafely: false
explosionChance: 0.3
- type: Sprite
sprite: Structures/Machines/microwave_syndie.rsi
drawdepth: SmallObjects
snapCardinals: true
- type: Machine
board: SyndicateMicrowaveMachineCircuitboard

14
Resources/Prototypes/Entities/Structures/Machines/nuke.yml
View File

@@ -16,6 +16,9 @@
map: ["enum.NukeVisualLayers.Unlit"]
shader: unshaded
visible: false
- state: nuclearbomb_gay
map: ["pride"]
visible: false
- state: nukefestive
map: ["christmas"]
visible: false
@@ -24,11 +27,15 @@
holidays:
festive:
- FestiveSeason
pride:
- PrideMonth
- type: GenericVisualizer
visuals:
enum.HolidayVisuals.Holiday:
christmas:
festive: { visible: true }
pride:
pride: { visible: true }
enum.NukeVisuals.Deployed:
enum.NukeVisualLayers.Base:
False: { state: nuclearbomb_base }
@@ -129,16 +136,23 @@
- state: nukefestive
map: ["christmas"]
visible: false
- state: nuclearbomb_gay
map: [ "pride" ]
visible: false
- type: Appearance
- type: HolidayVisuals
holidays:
festive:
- FestiveSeason
pride:
- PrideMonth
- type: GenericVisualizer
visuals:
enum.HolidayVisuals.Holiday:
christmas:
festive: { visible: true }
pride:
pride: { visible: true }
- type: Physics
bodyType: Dynamic
- type: Fixtures

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

@@ -35,21 +35,26 @@
- state: display-charging
shader: unshaded
map: ["enum.ApcVisualLayers.ChargeState"]
- state: lock0-unlocked
- state: lock0-locked
shader: unshaded
map: ["enum.ApcVisualLayers.InterfaceLock"]
- state: lock1-unlocked
visible: false
- state: lock1-locked
shader: unshaded
map: ["enum.ApcVisualLayers.PanelLock"]
- state: channel0-auto_on
visible: false
- state: lock1-locked #when these are implemented get actual sprites.
shader: unshaded
map: ["enum.ApcVisualLayers.Equipment"]
- state: channel1-auto_on
visible: false
- state: lock1-locked
shader: unshaded
map: ["enum.ApcVisualLayers.Lighting"]
- state: channel2-auto_on
visible: false
- state: lock1-locked
shader: unshaded
map: ["enum.ApcVisualLayers.Environment"]
visible: false
- type: Appearance
- type: ApcVisuals
- type: Battery

11
Resources/Prototypes/Entities/Structures/Power/substation.yml
View File

@@ -23,8 +23,8 @@
- type: ExaminableBattery
- type: PointLight
radius: 1.5
energy: 1.6
color: "#3db83b"
energy: 1
color: "#ff6900"
castShadows: false
- type: NodeContainer
examinable: true
@@ -126,10 +126,11 @@
path: /Audio/Ambience/Objects/buzzing.ogg
- type: PointLight
radius: 1.5
energy: 1.6
color: "#3db83b"
energy: 1
color: "#ff6900"
netsync: false
castShadows: false
offset: 0, -0.2
- type: Clickable
- type: AccessReader
access: [["Engineering"]]
@@ -151,7 +152,7 @@
sprite: Structures/Power/substation.rsi
layers:
- state: substation_wall
- state: screen
- state: screen_wall
shader: unshaded
- type: Battery
maxCharge: 2000000

1
Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
View File

@@ -124,6 +124,7 @@
shader: unshaded
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.5,0"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Damageable
damageContainer: StructuralInorganic

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

@@ -196,23 +196,6 @@
duration: 240
- type: KudzuGrowthRule
- type: entity
id: MeteorSwarm
parent: BaseStationEventLongDelay
components:
- type: StationEvent
earliestStart: 30
weight: 7.5
minimumPlayers: 10 #Enough to hopefully have at least one engineering guy
startAnnouncement: station-event-meteor-swarm-start-announcement
endAnnouncement: station-event-meteor-swarm-end-announcement
startAudio:
path: /Audio/Announcements/meteors.ogg
params:
volume: -4
duration: null #ending is handled by MeteorSwarmRule
- type: MeteorSwarmRule
- type: entity
id: MouseMigration
parent: BaseStationEventShortDelay
@@ -234,6 +217,30 @@
prob: 0.02
- id: MobMouseCancer
prob: 0.001
# Events always spawn a critter regardless of Probability https://github.com/space-wizards/space-station-14/issues/28480 I added the Rat King to their own event with a player cap.
- type: entity
id: KingRatMigration
parent: BaseStationEventShortDelay
components:
- type: StationEvent
startAnnouncement: station-event-vent-creatures-start-announcement
startAudio:
path: /Audio/Announcements/attention.ogg
earliestStart: 15
weight: 6
duration: 50
minimumPlayers: 15 # Hopefully this is enough for the Rat King's potential Army
- type: VentCrittersRule
entries:
- id: MobMouse
prob: 0.02
- id: MobMouse1
prob: 0.02
- id: MobMouse2
prob: 0.02
- id: MobMouseCancer
prob: 0.001
specialEntries:
- id: SpawnPointGhostRatKing
prob: 0.001
@@ -270,19 +277,7 @@
duration: 60
maxDuration: 120
- type: PowerGridCheckRule
- type: entity
id: RandomSentience
parent: BaseGameRule
components:
- type: StationEvent
weight: 6
duration: 1
maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it
startAudio:
path: /Audio/Announcements/attention.ogg
- type: RandomSentienceRule
- type: entity
parent: BaseGameRule
id: SolarFlare

105
Resources/Prototypes/GameRules/meteorswarms.yml Normal file
View File

@@ -0,0 +1,105 @@
- type: entity
parent: BaseGameRule
id: GameRuleMeteorScheduler
components:
- type: GameRule
minPlayers: 25
cancelPresetOnTooFewPlayers: false
- type: MeteorScheduler
- type: weightedRandomEntity
id: DefaultConfig
weights:
GameRuleSpaceDustMinor: 44
GameRuleSpaceDustMajor: 22
GameRuleMeteorSwarmSmall: 18
GameRuleMeteorSwarmMedium: 10
GameRuleMeteorSwarmLarge: 5
GameRuleUristSwarm: 0.05
- type: entity
parent: BaseGameRule
id: GameRuleMeteorSwarm
abstract: true
components:
- type: GameRule
- type: MeteorSwarm
- type: entity
parent: GameRuleMeteorSwarm
id: GameRuleSpaceDustMinor
components:
- type: MeteorSwarm
announcement: null
announcementSound: null
nonDirectional: true
meteors:
MeteorSpaceDust: 1
waves:
min: 2
max: 3
meteorsPerWave:
min: 3
max: 5
- type: entity
parent: GameRuleMeteorSwarm
id: GameRuleSpaceDustMajor
components:
- type: MeteorSwarm
announcement: station-event-space-dust-start-announcement
announcementSound: /Audio/Announcements/attention.ogg
nonDirectional: true
meteors:
MeteorSpaceDust: 1
waves:
min: 2
max: 3
meteorsPerWave:
min: 8
max: 12
- type: entity
parent: GameRuleMeteorSwarm
id: GameRuleMeteorSwarmSmall
components:
- type: MeteorSwarm
meteors:
MeteorSmall: 7
MeteorMedium: 3
- type: entity
parent: GameRuleMeteorSwarm
id: GameRuleMeteorSwarmMedium
components:
- type: MeteorSwarm
meteors:
MeteorSmall: 3
MeteorMedium: 6
MeteorLarge: 1
- type: entity
parent: GameRuleMeteorSwarm
id: GameRuleMeteorSwarmLarge
components:
- type: MeteorSwarm
meteors:
MeteorSmall: 2
MeteorMedium: 4
MeteorLarge: 4
- type: entity
parent: GameRuleMeteorSwarm
id: GameRuleUristSwarm
components:
- type: MeteorSwarm
announcement: station-event-meteor-urist-start-announcement
announcementSound: /Audio/Announcements/attention.ogg
meteors:
MeteorUrist: 1
waves:
min: 3
max: 3
meteorsPerWave:
min: 10
max: 10

64
Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml Normal file
View File

@@ -0,0 +1,64 @@
- type: inventoryTemplate
id: mannequin
slots:
- name: jumpsuit
slotTexture: uniform
slotFlags: INNERCLOTHING
stripTime: 3
uiWindowPos: 0,1
strippingWindowPos: 1,2
displayName: Jumpsuit
- name: outerClothing
slotTexture: suit
slotFlags: OUTERCLOTHING
stripTime: 3
uiWindowPos: 1,1
strippingWindowPos: 2,2
displayName: Suit
- name: neck
slotTexture: neck
slotFlags: NECK
stripTime: 3
uiWindowPos: 0,2
strippingWindowPos: 0,1
displayName: Neck
- name: mask
stripTime: 3
slotTexture: mask
slotFlags: MASK
uiWindowPos: 1,2
strippingWindowPos: 1,1
displayName: Mask
- name: eyes
slotTexture: glasses
slotFlags: EYES
stripTime: 3
uiWindowPos: 0,3
strippingWindowPos: 0,0
displayName: Eyes
- name: head
slotTexture: head
slotFlags: HEAD
stripTime: 3
uiWindowPos: 1,3
strippingWindowPos: 1,0
displayName: Head
- name: suitstorage
slotTexture: suit_storage
slotFlags: SUITSTORAGE
slotGroup: MainHotbar
stripTime: 3
uiWindowPos: 2,0
strippingWindowPos: 1,3
dependsOn: outerClothing
dependsOnComponents:
- type: AllowSuitStorage
displayName: Suit Storage
- name: back
slotTexture: back
fullTextureName: template_small
slotFlags: BACK
stripTime: 3
uiWindowPos: 3,0
strippingWindowPos: 0,2
displayName: Back

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

@@ -6,4 +6,4 @@
- type: startingGear
id: MusicianWintercoat
equipment:
outerClothing: ClothingOuterWinterMusician
outerClothing: ClothingOuterWinterMusician

11
Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
View File

@@ -187,6 +187,15 @@
equipment:
shoes: ClothingShoesBootsCombatFilled
- type: loadout
id: JackBoots
equipment: JackBoots
- type: startingGear
id: JackBoots
equipment:
shoes: ClothingShoesBootsJackFilled
- type: loadout
id: SecurityWinterBoots
equipment: SecurityWinterBoots
@@ -194,7 +203,7 @@
- type: startingGear
id: SecurityWinterBoots
equipment:
shoes: ClothingShoesBootsWinterSec
shoes: ClothingShoesBootsWinterSecFilled
# PDA
- type: loadout

280
Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml Normal file
View File

@@ -0,0 +1,280 @@
# Instruments
- type: loadout
id: Glockenspiel
equipment: Glockenspiel
- type: startingGear
id: Glockenspiel
storage:
back:
- GlockenspielInstrument
- type: loadout
id: MusicBox
equipment: MusicBox
- type: startingGear
id: MusicBox
storage:
back:
- MusicBoxInstrument
- type: loadout
id: Xylophone
equipment: Xylophone
- type: startingGear
id: Xylophone
storage:
back:
- XylophoneInstrument
- type: loadout
id: Microphone
equipment: Microphone
- type: startingGear
id: Microphone
storage:
back:
- MicrophoneInstrument
- type: loadout
id: Synthesizer
equipment: Synthesizer
- type: startingGear
id: Synthesizer
storage:
back:
- SynthesizerInstrument
- type: loadout
id: Kalimba
equipment: Kalimba
- type: startingGear
id: Kalimba
storage:
back:
- KalimbaInstrument
- type: loadout
id: Woodblock
equipment: Woodblock
- type: startingGear
id: Woodblock
storage:
back:
- WoodblockInstrument
- type: loadout
id: ElectricGuitar
equipment: ElectricGuitar
- type: startingGear
id: ElectricGuitar
storage:
back:
- ElectricGuitarInstrument
- type: loadout
id: BassGuitar
equipment: BassGuitar
- type: startingGear
id: BassGuitar
storage:
back:
- BassGuitarInstrument
- type: loadout
id: RockGuitar
equipment: RockGuitar
- type: startingGear
id: RockGuitar
storage:
back:
- RockGuitarInstrument
- type: loadout
id: AcousticGuitar
equipment: AcousticGuitar
- type: startingGear
id: AcousticGuitar
storage:
back:
- AcousticGuitarInstrument
- type: loadout
id: Banjo
equipment: Banjo
- type: startingGear
id: Banjo
storage:
back:
- BanjoInstrument
- type: loadout
id: Violin
equipment: Violin
- type: startingGear
id: Violin
storage:
back:
- ViolinInstrument
- type: loadout
id: Viola
equipment: Viola
- type: startingGear
id: Viola
storage:
back:
- ViolaInstrument
- type: loadout
id: Cello
equipment: Cello
- type: startingGear
id: Cello
storage:
back:
- CelloInstrument
- type: loadout
id: Trumpet
equipment: Trumpet
- type: startingGear
id: Trumpet
storage:
back:
- TrumpetInstrument
- type: loadout
id: Trombone
equipment: Trombone
- type: startingGear
id: Trombone
storage:
back:
- TromboneInstrument
- type: loadout
id: FrenchHorn
equipment: FrenchHorn
- type: startingGear
id: FrenchHorn
storage:
back:
- FrenchHornInstrument
- type: loadout
id: Euphonium
equipment: Euphonium
- type: startingGear
id: Euphonium
storage:
back:
- EuphoniumInstrument
- type: loadout
id: Saxophone
equipment: Saxophone
- type: startingGear
id: Saxophone
storage:
back:
- SaxophoneInstrument
- type: loadout
id: Accordion
equipment: Accordion
- type: startingGear
id: Accordion
storage:
back:
- AccordionInstrument
- type: loadout
id: Harmonica
equipment: Harmonica
- type: startingGear
id: Harmonica
storage:
back:
- HarmonicaInstrument
- type: loadout
id: Clarinet
equipment: Clarinet
- type: startingGear
id: Clarinet
storage:
back:
- ClarinetInstrument
- type: loadout
id: Flute
equipment: Flute
- type: startingGear
id: Flute
storage:
back:
- FluteInstrument
- type: loadout
id: Recorder
equipment: Recorder
- type: startingGear
id: Recorder
storage:
back:
- RecorderInstrument
- type: loadout
id: PanFlute
equipment: PanFlute
- type: startingGear
id: PanFlute
storage:
back:
- PanFluteInstrument
- type: loadout
id: Ocarina
equipment: Ocarina
- type: startingGear
id: Ocarina
storage:
back:
- OcarinaInstrument
- type: loadout
id: Bagpipe
equipment: Bagpipe
- type: startingGear
id: Bagpipe
storage:
back:
- BagpipeInstrument

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

@@ -402,7 +402,6 @@
- type: loadoutGroup
id: MimeMask
name: loadout-group-mime-mask
minLimit: 0
loadouts:
- MimeMask
- MimeMaskSad
@@ -437,6 +436,41 @@
loadouts:
- MusicianWintercoat
- type: loadoutGroup
id: Instruments
name: loadout-group-instruments
minLimit: 0
maxLimit: 2
loadouts:
- Glockenspiel
- MusicBox
- Xylophone
- Microphone
- Synthesizer
- Kalimba
- Woodblock
- ElectricGuitar
- BassGuitar
- RockGuitar
- AcousticGuitar
- Banjo
- Violin
- Viola
- Cello
- Trumpet
- Trombone
- FrenchHorn
- Euphonium
- Saxophone
- Accordion
- Harmonica
- Clarinet
- Flute
- Recorder
- PanFlute
- Ocarina
- Bagpipe
# Cargo
- type: loadoutGroup
id: QuartermasterHead
@@ -883,6 +917,7 @@
name: loadout-group-security-shoes
loadouts:
- CombatBoots
- JackBoots
- SecurityWinterBoots
- type: loadoutGroup

1
Resources/Prototypes/Loadouts/role_loadouts.yml
View File

@@ -141,6 +141,7 @@
- MusicianOuterClothing
- Glasses
- Trinkets
- Instruments
# Cargo
- type: roleLoadout

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

@@ -662,3 +662,46 @@
Poison: 2
- !type:SatiateHunger
factor: -6
# inspired by the spider neurotoxin GsMtx-4
# poisons non-spiders and slows you down at high doses
- type: reagent
id: Mechanotoxin
name: reagent-name-mechanotoxin
group: Toxins
desc: reagent-desc-mechanotoxin
flavor: sweet
color: "#00b408"
physicalDesc: reagent-physical-desc-nondescript
metabolisms:
Poison:
metabolismRate: 0.2 # Slower metabolism so it can build up over time for slowdown
effects:
- !type:HealthChange
conditions:
- !type:OrganType
type: Arachnid
shouldHave: false
damage:
types:
Poison: 1.6
- !type:MovespeedModifier
conditions:
- !type:ReagentThreshold
reagent: Mechanotoxin
min: 2
- !type:OrganType
type: Arachnid
shouldHave: false
walkSpeedModifier: 0.8
sprintSpeedModifier: 0.8
- !type:MovespeedModifier
conditions:
- !type:ReagentThreshold
reagent: Mechanotoxin
min: 4
- !type:OrganType
type: Arachnid
shouldHave: false
walkSpeedModifier: 0.4
sprintSpeedModifier: 0.4

31
Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml Normal file
View File

@@ -0,0 +1,31 @@
- type: constructionGraph
id: Mannequin
start: start
graph:
- node: start
actions:
- !type:DestroyEntity {}
edges:
- to: mannequin
completed:
- !type:SnapToGrid { }
steps:
- material: WoodPlank
amount: 5
- material: MetalRod
amount: 2
doAfter: 2
- node: mannequin
entity: Mannequin
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank
amount: 5
- !type:SpawnPrototype
prototype: PartRodMetal
amount: 2
steps:
- tool: Screwing
doAfter: 3

18
Resources/Prototypes/Recipes/Construction/furniture.yml
View File

@@ -902,3 +902,21 @@
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
id: Mannequin
name: mannequin
description: Wooden mannequin designed for clothing displaying
graph: Mannequin
startNode: start
targetNode: mannequin
category: construction-category-furniture
icon:
sprite: Structures/Decoration/mannequin.rsi
state: mannequin
objectType: Structure
placementMode: SnapgridCenter
canRotate: true
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked

7
Resources/Prototypes/Recipes/Lathes/misc.yml
View File

@@ -126,6 +126,13 @@
Steel: 1000
Plastic: 500
- type: latheRecipe
id: ClothingShoesBootsMoon
result: ClothingShoesBootsMoon
completetime: 2
materials:
Steel: 600
- type: latheRecipe
id: ClothingShoesBootsSpeed
result: ClothingShoesBootsSpeed

1
Resources/Prototypes/Research/experimental.yml
View File

@@ -68,6 +68,7 @@
cost: 7500
recipeUnlocks:
- ClothingShoesBootsMagSci
- ClothingShoesBootsMoon
- type: technology
id: AnomalyCoreHarnessing

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

@@ -26,5 +26,3 @@
storage:
back:
- BoxSurvival
- AcousticGuitarInstrument
- SaxophoneInstrument

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

@@ -150,3 +150,12 @@
path: /Audio/Animals/dog_bark3.ogg
exclaimSound:
path: /Audio/Animals/dog_bark2.ogg
- type: speechSounds
id: Cluck
saySound:
path: /Audio/Animals/chicken_cluck_happy.ogg
askSound:
path: /Audio/Animals/chicken_cluck_happy.ogg
exclaimSound:
path: /Audio/Animals/chicken_cluck_happy.ogg

9
Resources/Prototypes/game_presets.yml
View File

@@ -7,6 +7,7 @@
description: survival-description
rules:
- RampingStationEventScheduler
- GameRuleMeteorScheduler
- BasicRoundstartVariation
- type: gamePreset
@@ -20,6 +21,7 @@
- Revolutionary
- Zombie
- RampingStationEventScheduler
- GameRuleMeteorScheduler
- type: gamePreset
id: Extended
@@ -31,6 +33,7 @@
description: extended-description
rules:
- BasicStationEventScheduler
- GameRuleMeteorScheduler
- BasicRoundstartVariation
- type: gamePreset
@@ -43,6 +46,7 @@
description: greenshift-description
rules:
- BasicRoundstartVariation
- GameRuleMeteorScheduler
- type: gamePreset
id: Secret
@@ -64,6 +68,7 @@
description: secret-description
rules:
- BasicStationEventScheduler
- GameRuleMeteorScheduler
- type: gamePreset
id: SecretGreenshift #For Admin Use: Runs Greenshift but shows "Secret" in lobby.
@@ -95,6 +100,7 @@
- Traitor
- SubGamemodesRule
- BasicStationEventScheduler
- GameRuleMeteorScheduler
- BasicRoundstartVariation
- type: gamePreset
@@ -121,6 +127,7 @@
- Nukeops
- SubGamemodesRule
- BasicStationEventScheduler
- GameRuleMeteorScheduler
- BasicRoundstartVariation
- type: gamePreset
@@ -136,6 +143,7 @@
- Revolutionary
- SubGamemodesRule
- BasicStationEventScheduler
- GameRuleMeteorScheduler
- BasicRoundstartVariation
- type: gamePreset
@@ -152,4 +160,5 @@
rules:
- Zombie
- BasicStationEventScheduler
- GameRuleMeteorScheduler
- BasicRoundstartVariation

7
Resources/Prototypes/holidays.yml
View File

@@ -437,3 +437,10 @@
name: holiday-name-friday-thirteenth
shouldCelebrate:
!type:FridayThirteenth { }
- type: holiday
id: PrideMonth
name: holiday-name-pride-month
beginDay: 1
endDay: 31
beginMonth: June

2
Resources/Prototypes/tags.yml
View File

@@ -254,7 +254,7 @@
- type: Tag
id: CableCoil
- type: Tag
id: Candle