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-20-11-2024-upstream-sync

Browse Source 
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml
This commit is contained in:
Ed
2024-11-23 01:48:24 +03:00
parent 8ad951183c 09ca45a621
commit 677e5194d6
598 changed files with 31718 additions and 11076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
View File

@@ -230,6 +230,7 @@
stealthy: true
- type: ToggleClothing
action: ActionToggleNinjaGloves
disableOnUnequip: true
- type: NinjaGloves
abilities:
- components:

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

@@ -452,6 +452,7 @@
delay: 1.0
- type: ToggleClothing
action: ActionToggleJusticeHelm
mustEquip: false
- type: ItemTogglePointLight
- type: ToggleableLightVisuals
clothingVisuals:

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

@@ -155,6 +155,7 @@
# phase cloak
- type: ToggleClothing
action: ActionTogglePhaseCloak
disableOnUnequip: true
- type: ComponentToggler
parent: true
components:

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

@@ -14,8 +14,7 @@
sprite: Clothing/Shoes/Boots/magboots.rsi
- type: ToggleClothing
action: ActionToggleMagboots
- type: ToggleVerb
text: toggle-magboots-verb-get-data-text
mustEquip: false
- type: ComponentToggler
components:
- type: NoSlip

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

@@ -222,24 +222,24 @@
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
layers:
- state: icon
color: "#79CC26"
color: "#007923"
- state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#79CC26"
color: "#007923"
- state: trinkets-inhand-left
right:
- state: inhand-right
color: "#79CC26"
color: "#007923"
- state: trinkets-inhand-right
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
clothingVisuals:
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#79CC26"
color: "#007923"
- state: trinkets-equipped-INNERCLOTHING
# Orange Jumpskirt

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

@@ -222,24 +222,24 @@
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
layers:
- state: icon
color: "#79CC26"
color: "#007923"
- state: trinkets-icon
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#79CC26"
color: "#007923"
- state: trinkets-inhand-left
right:
- state: inhand-right
color: "#79CC26"
color: "#007923"
- state: trinkets-inhand-right
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
clothingVisuals:
jumpsuit:
- state: equipped-INNERCLOTHING
color: "#79CC26"
color: "#007923"
- state: trinkets-equipped-INNERCLOTHING
# Orange Jumpsuit

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

@@ -822,6 +822,36 @@
- state: equipped-INNERCLOTHING-shirt
color: "#b30000"
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtCasualGreen
name: casual green jumpskirt
description: A loose worn green shirt with a grey skirt, perfect for someone looking to relax.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
layers:
- state: icon-jumpskirt
- state: icon-shirt
color: "#00661D"
- type: Item
inhandVisuals:
left:
- state: inhand-left-jumpskirt
- state: inhand-left-shirt
color: "#00661D"
right:
- state: inhand-right-jumpskirt
- state: inhand-right-shirt
color: "#00661D"
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
clothingVisuals:
jumpsuit:
- state: equipped-INNERCLOTHING-jumpskirt
- state: equipped-INNERCLOTHING-shirt
color: "#00661D"
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtOldDress

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

@@ -1347,6 +1347,36 @@
- state: equipped-INNERCLOTHING-shirt
color: "#b30000"
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCasualGreen
name: casual green jumpsuit
description: A loose worn green shirt with a grey pants, perfect for someone looking to relax.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
layers:
- state: icon-jumpsuit
- state: icon-shirt
color: "#00661D"
- type: Item
inhandVisuals:
left:
- state: inhand-left-jumpsuit
- state: inhand-left-shirt
color: "#00661D"
right:
- state: inhand-right-jumpsuit
- state: inhand-right-shirt
color: "#00661D"
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/casual.rsi
clothingVisuals:
jumpsuit:
- state: equipped-INNERCLOTHING-jumpsuit
- state: equipped-INNERCLOTHING-shirt
color: "#00661D"
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitFamilyGuy

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

@@ -69,6 +69,9 @@
type: BorgBoundUserInterface
enum.StrippingUiKey.Key:
type: StrippableBoundUserInterface
# Only used for NT borgs that can switch type, defined here to avoid copy-pasting the rest of this component.
enum.BorgSwitchableTypeUiKey.SelectBorgType:
type: BorgSelectTypeUserInterface
- type: ActivatableUI
key: enum.BorgUiKey.Key
- type: SiliconLawBound
@@ -157,6 +160,7 @@
collection: FootstepBorg
- type: Construction
graph: Cyborg
node: cyborg
containers:
- part-container
- cell_slot
@@ -285,6 +289,9 @@
- type: AccessReader
access: [["Command"], ["Research"]]
- type: ShowJobIcons
- type: InteractionPopup
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: entity
id: BaseBorgChassisSyndicate

319
Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
View File

@@ -1,23 +1,22 @@
- type: entity
id: BorgChassisGeneric
id: BorgChassisSelectable
parent: BaseBorgChassisNT
components:
- type: Sprite
layers:
- state: robot
map: ["enum.BorgVisualLayers.Body", "movement"]
- state: robot_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: robot_l
shader: unshaded
map: ["light"]
map: ["light","enum.BorgVisualLayers.LightStatus"]
visible: false
- type: BorgChassis
maxModules: 6
moduleWhitelist:
tags:
- BorgModuleGeneric
# Default borg can take no modules until selected type.
maxModules: 0
hasMindState: robot_e
noMindState: robot_e_r
- type: BorgTransponder
@@ -25,308 +24,62 @@
sprite: Mobs/Silicon/chassis.rsi
state: robot
name: cyborg
- type: Construction
node: cyborg
- type: Speech
speechVerb: Robotic
- type: InteractionPopup
interactSuccessString: petting-success-generic-cyborg
interactFailureString: petting-failure-generic-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: BorgSwitchableType
inherentRadioChannels:
- Common
- Binary
- type: entity
id: BorgChassisGeneric
parent: BorgChassisSelectable
name: generic cyborg
suffix: type picked
components:
- type: BorgSwitchableType
selectedBorgType: generic
- type: entity
id: BorgChassisMining
parent: BaseBorgChassisNT
parent: BorgChassisSelectable
name: salvage cyborg
components:
- type: Sprite
layers:
- state: miner
map: ["movement"]
- state: miner_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: miner_l
shader: unshaded
map: ["light"]
visible: false
- type: SpriteMovement
movementLayers:
movement:
state: miner_moving
noMovementLayers:
movement:
state: miner
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleCargo
hasMindState: miner_e
noMindState: miner_e_r
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: miner
name: salvage cyborg
- type: Construction
node: mining
- type: IntrinsicRadioTransmitter
channels:
- Supply
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Supply
- Binary
- Common
- Science
- type: AccessReader
access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
- type: Inventory
templateId: borgTall
- type: InteractionPopup
interactSuccessString: petting-success-salvage-cyborg
interactFailureString: petting-failure-salvage-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: BorgSwitchableType
selectedBorgType: mining
- type: entity
id: BorgChassisEngineer
parent: BaseBorgChassisNT
parent: BorgChassisSelectable
name: engineer cyborg
components:
- type: Sprite
layers:
- state: engineer
- state: engineer_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: engineer_l
shader: unshaded
map: ["light"]
visible: false
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleEngineering
hasMindState: engineer_e
noMindState: engineer_e_r
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: engineer
name: engineer cyborg
- type: Construction
node: engineer
- type: IntrinsicRadioTransmitter
channels:
- Engineering
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Engineering
- Binary
- Common
- Science
- type: AccessReader
access: [["Engineering"], ["Command"], ["Research"]]
- type: Inventory
templateId: borgShort
- type: InteractionPopup
interactSuccessString: petting-success-engineer-cyborg
interactFailureString: petting-failure-engineer-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: BorgSwitchableType
selectedBorgType: engineering
- type: entity
id: BorgChassisJanitor
parent: BaseBorgChassisNT
parent: BorgChassisSelectable
name: janitor cyborg
components:
- type: Sprite
layers:
- state: janitor
map: ["movement"]
- state: janitor_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: janitor_l
shader: unshaded
map: ["light"]
visible: false
- type: SpriteMovement
movementLayers:
movement:
state: janitor_moving
noMovementLayers:
movement:
state: janitor
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleJanitor
hasMindState: janitor_e
noMindState: janitor_e_r
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: janitor
name: janitor cyborg
- type: Construction
node: janitor
- type: IntrinsicRadioTransmitter
channels:
- Service
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Service
- Binary
- Common
- Science
- type: AccessReader
access: [["Service"], ["Command"], ["Research"]]
- type: Inventory
templateId: borgShort
- type: InteractionPopup
interactSuccessString: petting-success-janitor-cyborg
interactFailureString: petting-failure-janitor-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: BorgSwitchableType
selectedBorgType: janitor
- type: entity
id: BorgChassisMedical
parent: [BaseBorgChassisNT, ShowMedicalIcons]
parent: BorgChassisSelectable
name: medical cyborg
components:
- type: Sprite
layers:
- state: medical
map: ["movement"]
- state: medical_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: medical_l
shader: unshaded
map: ["light"]
visible: false
- type: SpriteMovement
movementLayers:
movement:
state: medical_moving
noMovementLayers:
movement:
state: medical
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleMedical
hasMindState: medical_e
noMindState: medical_e_r
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: medical
name: medical cyborg
- type: Construction
node: medical
- type: IntrinsicRadioTransmitter
channels:
- Medical
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Medical
- Binary
- Common
- Science
- type: AccessReader
access: [["Medical"], ["Command"], ["Research"]]
- type: Inventory
templateId: borgDutch
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepHoverBorg
- type: SolutionScanner
- type: InteractionPopup
interactSuccessString: petting-success-medical-cyborg
interactFailureString: petting-failure-medical-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: BorgSwitchableType
selectedBorgType: medical
- type: entity
id: BorgChassisService
parent: BaseBorgChassisNT
parent: BorgChassisSelectable
name: service cyborg
components:
- type: Sprite
layers:
- state: service
- state: service_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: service_l
shader: unshaded
map: ["light"]
visible: false
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleService
hasMindState: service_e
noMindState: service_e_r
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: service
name: service cyborg
- type: Construction
node: service
- type: IntrinsicRadioTransmitter
channels:
- Service
- Binary
- Common
- Science
- type: ActiveRadio
channels:
- Service
- Binary
- Common
- Science
- type: AccessReader
access: [["Service"], ["Command"], ["Research"]]
- type: Inventory
templateId: borgTall
- type: InteractionPopup
interactSuccessString: petting-success-service-cyborg
interactFailureString: petting-failure-service-cyborg
interactSuccessSound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: BorgSwitchableType
selectedBorgType: service
- type: entity
id: BorgChassisSyndicateAssault
@@ -354,8 +107,6 @@
- BorgModuleSyndicateAssault
hasMindState: synd_sec_e
noMindState: synd_sec
- type: Construction
node: syndicateassault
- type: InteractionPopup
interactSuccessString: petting-success-syndicate-cyborg
interactFailureString: petting-failure-syndicate-cyborg
@@ -388,8 +139,6 @@
- BorgModuleSyndicate
hasMindState: synd_medical_e
noMindState: synd_medical
- type: Construction
node: syndicatemedical
- type: ShowHealthBars
- type: InteractionPopup
interactSuccessString: petting-success-syndicate-cyborg
@@ -429,8 +178,6 @@
- BorgModuleSyndicate
hasMindState: synd_engi_e
noMindState: synd_engi
- type: Construction
node: syndicatesaboteur
- type: ShowHealthBars
damageContainers:
- Inorganic

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

@@ -1360,7 +1360,7 @@
rules: ghost-role-information-nonantagonist-rules
- type: GhostTakeoverAvailable
- type: Clumsy
clumsyDamage:
gunShootFailDamage:
types:
Blunt: 5
Piercing: 4
@@ -1536,7 +1536,7 @@
description: Cousins to the sentient race of lizard people, kobolds blend in with their natural habitat and are as nasty as monkeys; ready to pull out your hair and stab you to death.
components:
- type: Clumsy
clumsyDamage:
gunShootFailDamage:
types:
Blunt: 2
Piercing: 7

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

@@ -50,12 +50,12 @@
Dead:
Base: goliath_dead
- type: MovementSpeedModifier
baseWalkSpeed : 2.50
baseSprintSpeed : 2.50
baseWalkSpeed : 2.00
baseSprintSpeed : 2.00
- type: MobThresholds
thresholds:
0: Alive
300: Dead
250: Dead
- type: MeleeWeapon
soundHit:
path: "/Audio/Weapons/smash.ogg"
@@ -64,7 +64,7 @@
animation: WeaponArcPunch
damage:
types:
Slash: 15
Slash: 10
Piercing: 10
- type: NpcFactionMember
factions:

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

@@ -231,7 +231,7 @@
- type: Hands
- type: ComplexInteraction
- type: Clumsy
clumsyDamage:
gunShootFailDamage:
types:
Blunt: 5
Piercing: 4

40
Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml Normal file
View File

@@ -0,0 +1,40 @@
- type: entity
name: jaunt
parent: [Incorporeal, BaseMob]
id: BaseMobJaunt
description: Faint traces of a humanoid figure linger here
suffix: Ethereal
components:
- type: ContentEye
maxZoom: 1.44,1.44
- type: Eye
drawFov: false
- type: Input
context: "ghost"
- type: InputMover
- type: MovementSpeedModifier
baseSprintSpeed: 12
baseWalkSpeed: 8
- type: Visibility
layer: 2
- type: Spectral
# Should be slow, for balance
- type: entity
name: jaunt
parent: BaseMobJaunt
id: EtherealJaunt
suffix: Wizard
components:
- type: Sprite
sprite: Mobs/Ghosts/ghost_human.rsi
color: "#60f7eb"
layers:
- state: animated
shader: unshaded
noRot: true
overrideContainerOcclusion: true
drawdepth: Ghosts
- type: MovementSpeedModifier
baseSprintSpeed: 6
baseWalkSpeed: 4

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

@@ -251,7 +251,7 @@
- type: entity
id: AntimovCircuitBoard
parent: BaseElectronics
parent: [BaseElectronics, BaseSyndicateContraband]
name: law board (Antimov)
description: An electronics board containing the Antimov lawset.
components:
@@ -301,6 +301,7 @@
unshaded:
Empty: { state: empty }
Occupied: { state: full }
- type: Intellicard
- type: entity
id: PlayerStationAiEmpty
@@ -428,28 +429,9 @@
map: ["base"]
# Borgs
- type: entity
id: PlayerBorgGeneric
parent: BorgChassisGeneric
suffix: Battery, Tools
components:
- type: ContainerFill
containers:
borg_brain:
- PositronicBrain
borg_module:
- BorgModuleTool
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMedium
- type: RandomMetadata
nameSegments: [names_borg]
- type: entity
id: PlayerBorgBattery
parent: BorgChassisGeneric
parent: BorgChassisSelectable
suffix: Battery
components:
- type: ContainerFill

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

@@ -701,6 +701,36 @@
- ReagentId: Water
Quantity: 4 #It makes saline if you add salt!
- type: entity
name: anomalous meat mass
parent: FoodMeatRawBase
id: FoodMeatAnomaly
description: An impossibly dense slab of meat. Just looking at it makes you uncomfortable.
components:
- type: Sprite
state: anomalymeat
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: UncookedAnimalProteins
Quantity: 90
- ReagentId: Fat
Quantity: 90
- type: SliceableFood
count: 10
sliceTime: 5
slice: FoodMeat #That's... So much meat
- type: InternalTemperature
conductivity: 0.43
- type: Construction
graph: AnomalyMeatSteak
node: start
defaultTarget: anomaly steak
- type: Tag
tags:
- Meat
# Cooked
- type: entity
@@ -1173,6 +1203,35 @@
Burger: MeatSnail
Taco: MeatSnail
- type: entity
name: anomalous steak
parent: FoodMeatBase
id: FoodMeatAnomalyCooked
description: A gigantic mass of cooked meat. A meal for a dinner party, or someone REALLY hungry.
components:
- type: Tag
tags:
- Cooked
- Meat
- type: Sprite
layers:
- state: anomalymeat-cooked #Kinda hard to cook this... thing evenly
- type: SolutionContainerManager
solutions:
food:
reagents:
- ReagentId: Nutriment
Quantity: 100
- ReagentId: Protein
Quantity: 50
- type: SliceableFood
count: 10
sliceTime: 5
slice: FoodMeatCooked
- type: Construction
graph: AnomalyMeatSteak
node: anomaly steak
# Cutlets
# Raw

25
Resources/Prototypes/Entities/Objects/Decoration/flora.yml
View File

@@ -475,7 +475,7 @@
- type: entity
parent: BaseTreeConifer
id: FloraTreeChristmas02
suffix: PresentsGiver
suffix: Safe Presents
name: christmas tree
components:
- type: Sprite
@@ -493,16 +493,33 @@
spawnEntries:
- id: PresentRandom
orGroup: present
- id: PresentRandomCash
prob: 0.20
- id: PresentRandomCash # buy your own.
prob: 0.1
orGroup: present
- id: PresentRandomAsh
- id: PresentRandomCoal # naughty
prob: 0.05
orGroup: present
receivedPopup: christmas-tree-got-gift
deniedPopup: christmas-tree-no-gift
requiredHoliday: FestiveSeason
- type: entity
parent: FloraTreeChristmas02
id: FloraTreeChristmas03
suffix: Insane Presents
name: christmas tree
components:
- type: LimitedItemGiver
spawnEntries:
- id: PresentRandom
orGroup: present
- id: PresentRandomUnsafe
prob: 0.5
orGroup: present
- id: PresentRandomInsane
prob: 0.2
orGroup: present
- type: entity
parent: BaseTreeConifer
id: FloraTreeStumpConifer

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

@@ -374,14 +374,23 @@
path: /Audio/Effects/unwrap.ogg
- type: entity
id: PresentRandomAsh
id: PresentRandomCoal
parent: [PresentBase, BaseItem]
suffix: Filled Ash
suffix: Filled Coal
components:
- type: SpawnItemsOnUse
items:
- id: PresentTrash
- id: Ash # No coal yet!
- id: Coal1
orGroup: GiftPool
- id: Coal5
prob: .4
orGroup: GiftPool
- id: Coal10
prob: .2
orGroup: GiftPool
- id: Coal15
prob: .1
orGroup: GiftPool
sound:
path: /Audio/Effects/unwrap.ogg

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

@@ -215,4 +215,22 @@
layers:
- state: fax-machine
- type: Flatpack
entity: FaxMachineBase
entity: FaxMachineBase
- type: entity
parent: BaseFlatpack
id: CrewMonitoringServerFlatpack
name: crew monitoring server flatpack
description: A flatpack used for constructing a crew monitoring server.
components:
- type: Flatpack
entity: CrewMonitoringServer
- type: entity
parent: BaseFlatpack
id: CrewMonitoringComputerFlatpack
name: crew monitoring computer flatpack
description: A flatpack used for constructing a crew monitoring console.
components:
- type: Flatpack
entity: ComputerCrewMonitoring

2
Resources/Prototypes/Entities/Objects/Fun/darts.yml
View File

@@ -195,7 +195,7 @@
id: HypoDartBox
name: hypodart box
suffix: HypoDart
description: A small box containing an hypodart. Packaging disintegrates when opened, leaving no evidence behind.
description: A small box containing a hypodart. Packaging disintegrates when opened, leaving no evidence behind.
components:
- type: Sprite
sprite: Objects/Fun/Darts/dartbox.rsi

24
Resources/Prototypes/Entities/Objects/Materials/ore.yml
View File

@@ -333,6 +333,30 @@
- type: Stack
count: 1
- type: entity
parent: Coal
id: Coal5
suffix: Five
components:
- type: Stack
count: 5
- type: entity
parent: Coal
id: Coal10
suffix: Ten
components:
- type: Stack
count: 10
- type: entity
parent: Coal
id: Coal15
suffix: Fifteen
components:
- type: Stack
count: 15
- type: entity
parent: OreBase
id: SaltOre

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

@@ -47,8 +47,8 @@
params:
variation: 0.125
volume: -4
- type: ToggleVerb
text: fire-extinguisher-component-verb-text
verbToggleOn: fire-extinguisher-component-verb-remove
verbToggleOff: fire-extinguisher-component-verb-engage
- type: SpraySafety
- type: MeleeWeapon
wideAnimationRotation: 180

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

@@ -597,6 +597,10 @@
damage:
types:
Blunt: 10
- type: Tag
tags:
- Folder
- HighRiskItem
- type: StealTarget
stealGroup: BoxFolderQmClipboard

17
Resources/Prototypes/Entities/Objects/Power/lights.yml
View File

@@ -150,6 +150,23 @@
- LightBulb
- Trash
- type: entity
parent: BaseLightbulb
name: dim light bulb
id: DimLightBulb
description: A dim light bulb for populating the darkness of maintenance.
components:
- type: LightBulb
bulb: Bulb
color: "#ba473f"
lightEnergy: 0.5
lightRadius: 5
lightSoftness: 3
- type: Tag
tags:
- LightBulb
- Trash
- type: entity
parent: LightBulb
name: old incandescent light bulb

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

@@ -1036,7 +1036,7 @@
id: SyringeStimulants
components:
- type: Label
currentLabel: reagent-name-hyperzine
currentLabel: reagent-name-stimulants
- type: SolutionContainerManager
solutions:
injector:

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

@@ -448,7 +448,7 @@
name: hyperzine microinjector
parent: [ChemicalMedipen, BaseSyndicateContraband]
id: StimpackMini
description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects.
description: A microinjector of hyperzine that give you about 15 seconds of the chemical's effects.
components:
- type: Sprite
sprite: Objects/Specific/Medical/medipen.rsi

5
Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
View File

@@ -126,6 +126,9 @@
state: icon
- type: Item
size: Large
storedSprite:
state: storage
sprite: Objects/Weapons/Melee/gorilla.rsi
- type: MeleeWeapon
attackRate: 0.5
angle: 0
@@ -134,6 +137,8 @@
damage:
types:
Blunt: 20
soundHit:
path: "/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg"
- type: CorePoweredThrower
- type: MeleeThrowOnHit
unanchorOnHit: true

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

@@ -568,7 +568,7 @@
- type: entity
id: BorgModuleOperative
parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
name: operative cyborg module
description: A module that comes with a crowbar, an Emag and a syndicate pinpointer.
components:
@@ -586,7 +586,7 @@
- type: entity
id: BorgModuleEsword
parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule ]
parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ]
name: energy sword cyborg module
description: A module that comes with a double energy sword.
components:
@@ -603,7 +603,7 @@
- type: entity
id: BorgModuleL6C
parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule ]
parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ]
name: L6C ROW cyborg module
description: A module that comes with a L6C.
components:

503
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
View File

@@ -1,503 +0,0 @@
# generic parts
- type: entity
id: LeftArmBorg
parent: BaseBorgArmLeft
components:
- type: Sprite
state: borg_l_arm
- type: Icon
state: borg_l_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgGenericLArm
- type: entity
id: RightArmBorg
parent: BaseBorgArmRight
components:
- type: Sprite
state: borg_r_arm
- type: Icon
state: borg_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgGenericRArm
- type: entity
id: LeftLegBorg
parent: BaseBorgLegLeft
components:
- type: Sprite
state: borg_l_leg
- type: Icon
state: borg_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgGenericLLeg
- type: entity
id: RightLegBorg
parent: BaseBorgLegRight
components:
- type: Sprite
state: borg_r_leg
- type: Icon
state: borg_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgGenericRLeg
- type: entity
id: LightHeadBorg
parent: BaseBorgHead
components:
- type: Sprite
state: borg_head
- type: Icon
state: borg_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgGenericHead
- type: entity
id: TorsoBorg
parent: BaseBorgTorso
components:
- type: Sprite
state: borg_chest
- type: Icon
state: borg_chest
- type: Tag
tags:
- Trash
- BorgGenericTorso
# engineer parts
- type: entity
id: LeftArmBorgEngineer
parent: BaseBorgArmLeft
name: engineer cyborg left arm
components:
- type: Sprite
state: engineer_l_arm
- type: Icon
state: engineer_l_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgEngineerLArm
- type: entity
id: RightArmBorgEngineer
parent: BaseBorgArmRight
name: engineer cyborg right arm
components:
- type: Sprite
state: engineer_r_arm
- type: Icon
state: engineer_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgEngineerRArm
- type: entity
id: LeftLegBorgEngineer
parent: BaseBorgLegLeft
name: engineer cyborg left leg
components:
- type: Sprite
state: engineer_l_leg
- type: Icon
state: engineer_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgEngineerLLeg
- type: entity
id: RightLegBorgEngineer
parent: BaseBorgLegRight
name: engineer cyborg right leg
components:
- type: Sprite
state: engineer_r_leg
- type: Icon
state: engineer_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgEngineerRLeg
- type: entity
id: HeadBorgEngineer
parent: BaseBorgHead
name: engineer cyborg head
components:
- type: Sprite
state: engineer_head
- type: Icon
state: engineer_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgEngineerHead
- type: entity
id: TorsoBorgEngineer
parent: BaseBorgTorso
name: engineer cyborg torso
components:
- type: Sprite
state: engineer_chest
- type: Icon
state: engineer_chest
- type: Tag
tags:
- Trash
- BorgEngineerTorso
# janitor parts
- type: entity
id: LeftLegBorgJanitor
parent: BaseBorgLegLeft
name: janitor cyborg left leg
components:
- type: Sprite
state: janitor_l_leg
- type: Icon
state: janitor_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgJanitorLLeg
- type: entity
id: RightLegBorgJanitor
parent: BaseBorgLegRight
name: janitor cyborg right leg
components:
- type: Sprite
state: janitor_r_leg
- type: Icon
state: janitor_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgJanitorRLeg
- type: entity
id: HeadBorgJanitor
parent: BaseBorgHead
name: janitor cyborg head
components:
- type: Sprite
state: janitor_head
- type: Icon
state: janitor_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgJanitorHead
- type: entity
id: TorsoBorgJanitor
parent: BaseBorgTorso
name: janitor cyborg torso
components:
- type: Sprite
state: janitor_chest
- type: Icon
state: janitor_chest
- type: Tag
tags:
- Trash
- BorgJanitorTorso
# medical parts
- type: entity
id: LeftArmBorgMedical
parent: BaseBorgArmLeft
name: medical cyborg left arm
components:
- type: Sprite
state: medical_l_arm
- type: Icon
state: medical_l_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgMedicalLArm
- type: entity
id: RightArmBorgMedical
parent: BaseBorgArmRight
name: medical cyborg right arm
components:
- type: Sprite
state: medical_r_arm
- type: Icon
state: medical_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgMedicalRArm
- type: entity
id: LeftLegBorgMedical
parent: BaseBorgLegLeft
name: medical cyborg left leg
components:
- type: Sprite
state: medical_l_leg
- type: Icon
state: medical_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgMedicalLLeg
- type: entity
id: RightLegBorgMedical
parent: BaseBorgLegRight
name: medical cyborg right leg
components:
- type: Sprite
state: medical_r_leg
- type: Icon
state: medical_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgMedicalRLeg
- type: entity
id: HeadBorgMedical
parent: BaseBorgHead
name: medical cyborg head
components:
- type: Sprite
state: medical_head
- type: Icon
state: medical_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgMedicalHead
- type: entity
id: TorsoBorgMedical
parent: BaseBorgTorso
name: medical cyborg torso
components:
- type: Sprite
state: medical_chest
- type: Icon
state: medical_chest
- type: Tag
tags:
- Trash
- BorgMedicalTorso
# mining parts
- type: entity
id: LeftArmBorgMining
parent: BaseBorgArmLeft
name: mining cyborg left arm
components:
- type: Sprite
state: mining_l_arm
- type: Icon
state: mining_l_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgMiningLArm
- type: entity
id: RightArmBorgMining
parent: BaseBorgArmRight
name: mining cyborg right arm
components:
- type: Sprite
state: mining_r_arm
- type: Icon
state: mining_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgMiningRArm
- type: entity
id: LeftLegBorgMining
parent: BaseBorgLegLeft
name: mining cyborg left leg
components:
- type: Sprite
state: mining_l_leg
- type: Icon
state: mining_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgMiningLLeg
- type: entity
id: RightLegBorgMining
parent: BaseBorgLegRight
name: mining cyborg right leg
components:
- type: Sprite
state: mining_r_leg
- type: Icon
state: mining_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgMiningRLeg
- type: entity
id: HeadBorgMining
parent: BaseBorgHead
name: mining cyborg head
components:
- type: Sprite
state: mining_head
- type: Icon
state: mining_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgMiningHead
- type: entity
id: TorsoBorgMining
parent: BaseBorgTorso
name: mining cyborg torso
components:
- type: Sprite
state: mining_chest
- type: Icon
state: mining_chest
- type: Tag
tags:
- Trash
- BorgMiningTorso
# service parts
- type: entity
id: LeftArmBorgService
parent: BaseBorgArmLeft
name: service cyborg left arm
components:
- type: Sprite
state: service_l_arm
- type: Icon
state: service_l_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgServiceLArm
- type: entity
id: RightArmBorgService
parent: BaseBorgArmRight
name: service cyborg right arm
components:
- type: Sprite
state: service_r_arm
- type: Icon
state: service_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgServiceRArm
- type: entity
id: LeftLegBorgService
parent: BaseBorgLegLeft
name: service cyborg left leg
components:
- type: Sprite
state: service_l_leg
- type: Icon
state: service_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgServiceLLeg
- type: entity
id: RightLegBorgService
parent: BaseBorgLegRight
name: service cyborg right leg
components:
- type: Sprite
state: service_r_leg
- type: Icon
state: service_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgServiceRLeg
- type: entity
id: HeadBorgService
parent: BaseBorgHead
name: service cyborg head
components:
- type: Sprite
state: service_head
- type: Icon
state: service_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgServiceHead
- type: entity
id: TorsoBorgService
parent: BaseBorgTorso
name: service cyborg torso
components:
- type: Sprite
state: service_chest
- type: Icon
state: service_chest
- type: Tag
tags:
- Trash
- BorgServiceTorso

169
Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
View File

@@ -33,139 +33,27 @@
borg_l_arm+o:
whitelist:
tags:
- BorgGenericLArm
- BorgLArm
borg_r_arm+o:
whitelist:
tags:
- BorgGenericRArm
- BorgRArm
borg_l_leg+o:
whitelist:
tags:
- BorgGenericLLeg
- BorgLLeg
borg_r_leg+o:
whitelist:
tags:
- BorgGenericRLeg
- BorgRLeg
borg_head+o:
whitelist:
tags:
- BorgGenericHead
- BorgHead
borg_chest+o:
whitelist:
tags:
- BorgGenericTorso
service_l_arm+o:
whitelist:
tags:
- BorgServiceLArm
service_r_arm+o:
whitelist:
tags:
- BorgServiceRArm
service_l_leg+o:
whitelist:
tags:
- BorgServiceLLeg
service_r_leg+o:
whitelist:
tags:
- BorgServiceRLeg
service_head+o:
whitelist:
tags:
- BorgServiceHead
service_chest+o:
whitelist:
tags:
- BorgServiceTorso
engineer_l_arm+o:
whitelist:
tags:
- BorgEngineerLArm
engineer_r_arm+o:
whitelist:
tags:
- BorgEngineerRArm
engineer_l_leg+o:
whitelist:
tags:
- BorgEngineerLLeg
engineer_r_leg+o:
whitelist:
tags:
- BorgEngineerRLeg
engineer_head+o:
whitelist:
tags:
- BorgEngineerHead
engineer_chest+o:
whitelist:
tags:
- BorgEngineerTorso
mining_l_arm+o:
whitelist:
tags:
- BorgMiningLArm
mining_r_arm+o:
whitelist:
tags:
- BorgMiningRArm
mining_l_leg+o:
whitelist:
tags:
- BorgMiningLLeg
mining_r_leg+o:
whitelist:
tags:
- BorgMiningRLeg
mining_head+o:
whitelist:
tags:
- BorgMiningHead
mining_chest+o:
whitelist:
tags:
- BorgMiningTorso
medical_l_arm+o:
whitelist:
tags:
- BorgMedicalLArm
medical_r_arm+o:
whitelist:
tags:
- BorgMedicalRArm
medical_l_leg+o:
whitelist:
tags:
- BorgMedicalLLeg
medical_r_leg+o:
whitelist:
tags:
- BorgMedicalRLeg
medical_head+o:
whitelist:
tags:
- BorgMedicalHead
medical_chest+o:
whitelist:
tags:
- BorgMedicalTorso
janitor_l_leg+o:
whitelist:
tags:
- BorgJanitorLLeg
janitor_r_leg+o:
whitelist:
tags:
- BorgJanitorRLeg
janitor_head+o:
whitelist:
tags:
- BorgJanitorHead
janitor_chest+o:
whitelist:
tags:
- BorgJanitorTorso
- BorgTorso
- type: ContainerContainer
containers:
part-container: !type:Container
@@ -173,45 +61,12 @@
- type: PartAssembly
parts:
generic:
- BorgGenericLArm
- BorgGenericRArm
- BorgGenericLLeg
- BorgGenericRLeg
- BorgGenericHead
- BorgGenericTorso
service:
- BorgServiceLArm
- BorgServiceRArm
- BorgServiceLLeg
- BorgServiceRLeg
- BorgServiceHead
- BorgServiceTorso
engineer:
- BorgEngineerLArm
- BorgEngineerRArm
- BorgEngineerLLeg
- BorgEngineerRLeg
- BorgEngineerHead
- BorgEngineerTorso
medical:
- BorgMedicalLArm
- BorgMedicalRArm
- BorgMedicalLLeg
- BorgMedicalRLeg
- BorgMedicalHead
- BorgMedicalTorso
janitor:
- BorgJanitorLLeg
- BorgJanitorRLeg
- BorgJanitorHead
- BorgJanitorTorso
mining:
- BorgMiningLArm
- BorgMiningRArm
- BorgMiningLLeg
- BorgMiningRLeg
- BorgMiningHead
- BorgMiningTorso
- BorgLArm
- BorgRArm
- BorgLLeg
- BorgRLeg
- BorgHead
- BorgTorso
- type: Construction
graph: Cyborg
node: start

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

@@ -284,6 +284,7 @@
- type: Injector
injectOnly: false
ignoreMobs: true
ignoreClosed: false
minTransferAmount: 1
maxTransferAmount: 5
transferAmount: 1

95
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
View File

@@ -16,114 +16,145 @@
id: AmmoProviderShotgunShell
abstract: true
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi
- type: BallisticAmmoProvider
mayTransfer: true
whitelist:
tags:
- ShellShotgun
capacity: 16
- type: MagazineVisuals
magState: mag
steps: 5
zeroVisible: false
- type: Appearance
# Shotgun Shells
- type: entity
name: shotgun beanbag cartridges dispenser
parent: AmmoProviderShotgunShell
id: BoxBeanbag
description: A dispenser box full of beanbag shots, designed for riot shotguns.
name: shell box (beanbag)
components:
- type: BallisticAmmoProvider
proto: ShellShotgunBeanbag
- type: Sprite
layers:
- state: boxwide
- state: shellbeanbag
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: beanbag
- type: entity
name: shotgun lethal cartridges dispenser
name: shell box (lethal)
parent: AmmoProviderShotgunShell
id: BoxLethalshot
description: A dispenser box full of lethal pellet shots, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellShotgun
- type: Sprite
layers:
- state: boxwide
- state: shelllethal
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: lethal
- type: entity
name: shotgun slug cartridges dispenser
name: shell box (slug)
parent: AmmoProviderShotgunShell
id: BoxShotgunSlug
description: A dispenser box full of slugs, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellShotgunSlug
- type: MagazineVisuals
magState: mag-alt
steps: 5
zeroVisible: false
- type: Sprite
layers:
- state: boxwide
- state: shellslug
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-alt-1
map: ["enum.GunVisualLayers.Mag"]
- state: slug
- type: entity
name: shotgun flare cartridges dispenser
name: shell box (flare)
parent: AmmoProviderShotgunShell
id: BoxShotgunFlare
description: A dispenser box full of flare cartridges, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellShotgunFlare
- type: Sprite
layers:
- state: boxwide
- state: shellflare
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: flare
- type: entity
name: shotgun incendiary cartridges dispenser
name: shell box (incendiary)
parent: AmmoProviderShotgunShell
id: BoxShotgunIncendiary
description: A dispenser box full of incendiary cartridges, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellShotgunIncendiary
- type: Sprite
layers:
- state: boxwide
- state: shellincendiary
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: incendiary
- type: entity
name: shotgun uranium cartridges dispenser
name: shell box (uranium)
parent: AmmoProviderShotgunShell
id: BoxShotgunUranium
description: A dispenser box full of uranium cartridges, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellShotgunUranium
- type: MagazineVisuals
magState: mag-alt
steps: 5
zeroVisible: false
- type: Sprite
layers:
- state: boxwide
- state: shelluranium
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-alt-1
map: ["enum.GunVisualLayers.Mag"]
- state: uranium
- type: entity
name: shotgun practice cartridges dispenser
name: shell box (practice)
parent: AmmoProviderShotgunShell
id: BoxShotgunPractice
description: A dispenser box full of practice cartridges, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellShotgunPractice
- type: Sprite
layers:
- state: boxwide
- state: shellpractice
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: practice
- type: entity
name: tranquilizer cartridges dispenser
name: shell box (tranquilizer)
parent: AmmoProviderShotgunShell
id: BoxShellTranquilizer
description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns.
components:
- type: BallisticAmmoProvider
proto: ShellTranquilizer
- type: Sprite
layers:
- state: boxwide
- state: shelltranquilizer
- state: base
map: ["enum.GunVisualLayers.Base"]
- state: mag-1
map: ["enum.GunVisualLayers.Mag"]
- state: tranquilizer

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

@@ -82,7 +82,7 @@
- type: Appearance
- type: entity
name: C-20r sub machine gun
name: C-20r submachine gun
parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband]
id: WeaponSubMachineGunC20r
description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.

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

@@ -27,7 +27,7 @@
gun_chamber: !type:ContainerSlot
- type: ChamberMagazineAmmoProvider
autoCycle: false
boltClosed: true
boltClosed: false
canRack: false
soundBoltClosed: /Audio/Weapons/Guns/Cock/revolver_cock.ogg
soundBoltOpened: /Audio/Weapons/Guns/Cock/revolver_cock.ogg

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

@@ -269,7 +269,7 @@
name: throwing knife
parent: [BaseKnife, BaseSyndicateContraband]
id: ThrowingKnife
description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
description: This blood-red knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand.
components:
- type: Tag
tags:

6
Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
View File

@@ -42,9 +42,9 @@
- type: Ensnaring
freeTime: 2.0
breakoutTime: 3.5 #all bola should generally be fast to remove
walkSpeed: 0.7 #makeshift bola shouldn't slow too much
sprintSpeed: 0.7
staminaDamage: 55 # Sudden weight increase sapping stamina
walkSpeed: 0.5 #makeshift bola shouldn't slow too much
sprintSpeed: 0.5
staminaDamage: 0 # anything but this is gamebreaking
canThrowTrigger: true
canMoveBreakout: true
- type: LandAtCursor

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

@@ -60,6 +60,7 @@
maxCount: 2
stationGrid: false
paths:
- /Maps/Ruins/abandoned_outpost.yml
- /Maps/Ruins/chunked_tcomms.yml
- /Maps/Ruins/biodome_satellite.yml
- /Maps/Ruins/derelict.yml
@@ -72,7 +73,7 @@
vgroid: !type:DungeonSpawnGroup
minimumDistance: 300
maximumDistance: 350
nameDataset: names_borer
nameDataset: NamesBorer
stationGrid: false
addComponents:
- type: Gravity

22
Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
View File

@@ -104,6 +104,28 @@
- type: Wires
layoutId: AirlockEngineering
- type: entity
parent: AirlockExternal
id: AirlockExternalCommandLocked
suffix: External, Command, Locked
components:
- type: ContainerFill
containers:
board: [ DoorElectronicsCommand ]
- type: Wires
layoutId: AirlockCommand
- type: entity
parent: AirlockExternalGlass
id: AirlockExternalGlassCommandLocked
suffix: External, Glass, Command, Locked
components:
- type: ContainerFill
containers:
board: [ DoorElectronicsCommand ]
- type: Wires
layoutId: AirlockCommand
- type: entity
parent: AirlockExternal
id: AirlockExternalAtmosphericsLocked

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

@@ -20,6 +20,7 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit

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

@@ -16,6 +16,7 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit

1
Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
View File

@@ -37,6 +37,7 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit

1
Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
View File

@@ -37,6 +37,7 @@
- type: Appearance
- type: Weldable
time: 2
weldedExamineMessage: null
- type: Airtight
- type: Damageable
damageContainer: StructuralInorganic

6
Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
View File

@@ -32,6 +32,7 @@
- state: closed_unlit
shader: unshaded
map: ["enum.DoorVisualLayers.BaseUnlit"]
visible: false
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- state: bolted_unlit
@@ -164,6 +165,7 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -224,6 +226,7 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -279,6 +282,7 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -339,6 +343,7 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit
@@ -394,6 +399,7 @@
- state: closed_unlit
shader: unshaded
map: [ "enum.DoorVisualLayers.BaseUnlit" ]
visible: false
- state: welded
map: [ "enum.WeldableLayers.BaseWelded" ]
- state: bolted_unlit

2
Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
View File

@@ -32,8 +32,6 @@
bonkDamage:
types:
Blunt: 4
bonkSound: !type:SoundCollectionSpecifier
collection: TrayHit
- type: Clickable
- type: FootstepModifier
footstepSoundCollection:

21
Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
View File

@@ -346,6 +346,27 @@
Heat: 1
popupText: powered-light-component-burn-hand
- type: entity
id: PoweredDimSmallLight
suffix: Dim
parent: PoweredSmallLightEmpty
components:
- type: Sprite
state: base
- type: PointLight
enabled: true
radius: 5
energy: 0.5
softness: 3
color: "#ba473f"
- type: PoweredLight
hasLampOnSpawn: DimLightBulb
- type: DamageOnInteract
damage:
types:
Heat: 1
popupText: powered-light-component-burn-hand
- type: entity
id: PoweredSmallLight
suffix: ""

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

@@ -150,6 +150,7 @@
- ExteriorLightTube
- LightBulb
- LedLightBulb
- DimLightBulb
- Bucket
- DrinkMug
- DrinkMugMetal
@@ -572,11 +573,6 @@
- BorgModuleFireExtinguisher
- BorgModuleRadiationDetection
- BorgModuleTool
- BorgModuleAppraisal
- BorgModuleConstruction
- BorgModuleService
- BorgModuleTreatment
- BorgModuleCleaning
- CyborgEndoskeleton
- LeftArmBorg
- RightArmBorg
@@ -584,50 +580,15 @@
- RightLegBorg
- LightHeadBorg
- TorsoBorg
- LeftArmBorgEngineer
- RightArmBorgEngineer
- LeftLegBorgEngineer
- RightLegBorgEngineer
- HeadBorgEngineer
- TorsoBorgEngineer
- LeftLegBorgJanitor
- RightLegBorgJanitor
- HeadBorgJanitor
- TorsoBorgJanitor
- LeftArmBorgMedical
- RightArmBorgMedical
- LeftLegBorgMedical
- RightLegBorgMedical
- HeadBorgMedical
- TorsoBorgMedical
- LeftArmBorgMining
- RightArmBorgMining
- LeftLegBorgMining
- RightLegBorgMining
- HeadBorgMining
- TorsoBorgMining
- LeftArmBorgService
- RightArmBorgService
- LeftLegBorgService
- RightLegBorgService
- HeadBorgService
- TorsoBorgService
dynamicRecipes:
- ProximitySensor
- BorgModuleLightReplacer
- BorgModuleAdvancedCleaning
- BorgModuleMining
- BorgModuleGrapplingGun
- BorgModuleAdvancedTool
- BorgModuleGPS
- BorgModuleRCD
- BorgModuleArtifact
- BorgModuleAnomaly
- BorgModuleGardening
- BorgModuleHarvesting
- BorgModuleMusique
- BorgModuleClowning
- BorgModuleDiagnosis
- BorgModuleDefibrillator
- BorgModuleAdvancedTreatment
- RipleyHarness

84
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml Normal file
View File

@@ -0,0 +1,84 @@
- type: entity
parent: [AirSensorBase, GasPipeBase]
id: GasPipeSensor
name: gas pipe sensor
description: Reports on the status of the gas in the attached pipe network.
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
drawdepth: BelowFloor
layers:
- sprite: Structures/Piping/Atmospherics/pipe.rsi
map: [ "enum.PipeVisualLayers.Pipe" ]
state: pipeStraight
- map: ["base"]
state: base
- map: [ "enum.PowerDeviceVisualLayers.Powered" ]
state: lights
shader: unshaded
- type: Appearance
- type: GenericVisualizer
visuals:
enum.PowerDeviceVisuals.Powered:
enum.PowerDeviceVisualLayers.Powered:
False: { state: blank }
True: { state: lights }
- type: AtmosMonitor
monitorsPipeNet: true
- type: ApcPowerReceiver
- type: ExtensionCableReceiver
- type: Construction
graph: GasPipeSensor
node: sensor
- type: NodeContainer
nodes:
monitored:
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: Longitudinal
- type: Tag
tags:
- AirSensor
- Unstackable
- type: entity
parent: GasPipeSensor
id: GasPipeSensorDistribution
suffix: Distribution
components:
- type: Label
currentLabel: gas-pipe-sensor-distribution-loop
- type: entity
parent: GasPipeSensor
id: GasPipeSensorWaste
suffix: Waste
components:
- type: Label
currentLabel: gas-pipe-sensor-waste-loop
- type: entity
parent: GasPipeSensor
id: GasPipeSensorMixedAir
suffix: Mixed air
components:
- type: Label
currentLabel: gas-pipe-sensor-mixed-air
- type: entity
parent: GasPipeSensor
id: GasPipeSensorTEGHot
suffix: TEG hot
components:
- type: Label
currentLabel: gas-pipe-sensor-teg-hot-loop
- type: entity
parent: GasPipeSensor
id: GasPipeSensorTEGCold
suffix: TEG cold
components:
- type: Label
currentLabel: gas-pipe-sensor-teg-cold-loop

2
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
View File

@@ -1,7 +1,7 @@
- type: entity
id: SingularityGenerator
name: gravitational singularity generator
description: An Odd Device which produces a Gravitational Singularity when set up.
description: An Odd Device which produces a Gravitational Singularity when set up. Comes with a temporary shutdown containment failsafe.
placement:
mode: SnapgridCenter
components:

4
Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml
View File

@@ -2,12 +2,12 @@
id: TeslaGenerator
name: tesla generator
parent: BaseStructureDynamic
description: An Odd Device which produces a powerful Tesla ball when set up.
description: An Odd Device which produces a powerful Tesla ball when set up. Comes with a temporary shutdown containment failsafe.
components:
- type: Sprite
noRot: true
sprite: Structures/Power/Generation/Tesla/generator.rsi
state: icon
state: icon
- type: SingularityGenerator # TODO: rename the generator
spawnId: TeslaEnergyBall
- type: InteractionOutline

6
Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml
View File

@@ -79,6 +79,7 @@
- type: entity
parent: BaseAnomalyCore
id: AnomalyCoreFlesh
description: The core of a destroyed flesh anomaly. Pulsates sickeningly, but might be a hearty meal if cooked.
suffix: Flesh
components:
- type: Sprite
@@ -241,7 +242,8 @@
- type: entity
parent: BaseAnomalyInertCore
id: AnomalyCoreFleshInert
id: AnomalyCoreFleshInert # Can be microwaved to turn it into a massive piece of meat
description: The inert core of a destroyed flesh anomaly. Pulsates sickeningly, but might be good food in the right hands?
suffix: Flesh, Inert
components:
- type: Sprite
@@ -306,7 +308,7 @@
- type: entity
parent: BaseAnomalyInertCore
id: AnomalyCoreFloraInert
id: AnomalyCoreFloraInert #Turns into a seed that grows into artifexium
suffix: Flora, Inert
components:
- type: Seed

5
Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
View File

@@ -20,6 +20,11 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
visible: false
sprite: Structures/Storage/closet_labels.rsi
offset: "-0.065,0"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Destructible
thresholds:
- trigger:

19
Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
View File

@@ -19,6 +19,10 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
visible: false
sprite: Structures/Storage/closet_labels.rsi
map: ["enum.PaperLabelVisuals.Layer"]
- type: MovedByPressure
- type: PaperLabel
labelSlot:
@@ -86,6 +90,21 @@
SheetSteel1:
min: 1
max: 1
- type: GenericVisualizer
visuals:
enum.PaperLabelVisuals.HasLabel:
enum.PaperLabelVisuals.Layer:
True: { visible: true }
False: { visible: false }
enum.StorageVisuals.Open:
enum.PaperLabelVisuals.Layer:
True: { visible: false }
enum.PaperLabelVisuals.LabelType:
enum.PaperLabelVisuals.Layer:
Paper: { state: paper }
Bounty: { state: bounty }
CaptainsPaper: { state: captains_paper }
Invoice: { state: invoice }
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: generic