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-13-06-2024-upstream2

Browse Source 
# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml
This commit is contained in:
Ed
2024-06-13 12:35:00 +03:00
parent d462ce85f8 e02ef68259
commit 8ff09f552b
475 changed files with 23765 additions and 12166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,7 @@
id: ClothingHeadEVAHelmetBase
name: base space helmet
components:
- type: BreathMask
- type: Item
size: Normal
- type: PressureProtection
@@ -150,6 +151,7 @@
name: base hardsuit helmet
noSpawn: true
components:
- type: BreathMask
- type: Sprite
state: icon # default state used by most inheritors
- type: Clickable

6
Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
View File

@@ -5,7 +5,6 @@
name: EVA helmet
description: An old-but-gold helmet designed for extravehicular activites. Infamous for making security officers paranoid.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Helmets/eva.rsi
- type: Clothing
@@ -22,7 +21,6 @@
name: EVA helmet
description: An old-but-gold helmet designed for extravehicular activites.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Helmets/eva_large.rsi
- type: Clothing
@@ -35,7 +33,6 @@
name: syndicate EVA helmet
description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Helmets/eva_syndicate.rsi
- type: Clothing
@@ -48,7 +45,6 @@
name: cosmonaut helmet
description: Ancient design, but advanced manufacturing. #Description here originally started with " A deceptively well armored space helmet." Potentially had armor values in SS13 that weren't brought over?
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Helmets/cosmonaut.rsi
- type: Clothing
@@ -61,7 +57,6 @@
name: paramedic void helmet
description: A void helmet made for paramedics.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Helmets/paramedhelm.rsi
- type: Clothing
@@ -81,7 +76,6 @@
name: NTSRA void helmet
description: An ancient space helmet, designed by the NTSRA branch of CentCom.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi
- type: Clothing

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

@@ -12,7 +12,6 @@
name: basic hardsuit helmet
description: A basic-looking hardsuit helmet that provides minor protection against most sources of damage.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/basic.rsi
- type: Clothing
@@ -28,7 +27,6 @@
name: atmos hardsuit helmet
description: A special hardsuit helmet designed for working in low-pressure, high thermal environments.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/atmospherics.rsi
layers:
@@ -68,7 +66,6 @@
name: engineering hardsuit helmet
description: An engineering hardsuit helmet designed for working in low-pressure, high radioactive environments.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/engineering.rsi
- type: Clothing
@@ -86,7 +83,6 @@
name: spationaut hardsuit helmet
description: A sturdy helmet designed for complex industrial operations in space.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
layers:
@@ -121,7 +117,6 @@
name: salvage hardsuit helmet
description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/salvage.rsi
- type: Clothing
@@ -140,7 +135,6 @@
name: salvager maxim helmet
description: A predication of decay washes over your mind.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/maxim.rsi
- type: Clothing
@@ -163,7 +157,6 @@
name: security hardsuit helmet
description: Armored hardsuit helmet for security needs.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/security.rsi
- type: Clothing
@@ -188,7 +181,6 @@
name: brigmedic hardsuit helmet
description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/brigmedic.rsi
- type: Clothing
@@ -215,7 +207,6 @@
name: warden's hardsuit helmet
description: A modified riot helmet. Oddly comfortable.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-warden.rsi
- type: Clothing
@@ -240,7 +231,6 @@
name: captain's hardsuit helmet
description: Special hardsuit helmet, made for the captain of the station.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/capspace.rsi
- type: Clothing
@@ -256,7 +246,6 @@
name: chief engineer's hardsuit helmet
description: Special hardsuit helmet, made for the chief engineer of the station.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/engineering-white.rsi
- type: Clothing
@@ -274,7 +263,6 @@
name: chief medical officer's hardsuit helmet
description: Lightweight medical hardsuit helmet that doesn't restrict your head movements.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/medical.rsi
- type: Clothing
@@ -292,7 +280,6 @@
name: experimental research hardsuit helmet
description: Lightweight hardsuit helmet that doesn't restrict your head movements.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/rd.rsi
- type: Clothing
@@ -310,7 +297,6 @@
name: head of security's hardsuit helmet
description: Security hardsuit helmet with the latest top secret NT-HUD software. Belongs to the HoS.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-red.rsi
- type: Clothing
@@ -335,7 +321,6 @@
name: luxury mining hardsuit helmet
description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/luxury.rsi
- type: Clothing
@@ -355,7 +340,6 @@
name: blood-red hardsuit helmet
description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndicate.rsi
- type: Clothing
@@ -380,7 +364,6 @@
name: blood-red medic hardsuit helmet
description: An advanced red hardsuit helmet specifically designed for field medic operations.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndiemedic.rsi
- type: Clothing
@@ -405,7 +388,6 @@
name: syndicate elite helmet
description: An elite version of the blood-red hardsuit's helmet, with improved armor and fireproofing. Property of Gorlex Marauders.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndieelite.rsi
- type: Clothing
@@ -434,7 +416,6 @@
name: syndicate commander helmet
description: A bulked up version of the blood-red hardsuit's helmet, purpose-built for the commander of a syndicate operative squad. Has significantly improved armor for those deadly front-lines firefights.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/syndiecommander.rsi
- type: Clothing
@@ -459,7 +440,6 @@
name: cybersun juggernaut helmet
description: Made of compressed red matter, this helmet was designed in the Tau chromosphere facility.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/cybersun.rsi
- type: Clothing
@@ -482,7 +462,6 @@
name: wizard hardsuit helmet
description: A bizarre gem-encrusted helmet that radiates magical energies.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/wizard.rsi
- type: Clothing
@@ -507,7 +486,6 @@
name: organic space helmet
description: A spaceworthy biomass of pressure and temperature resistant tissue.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/lingspacehelmet.rsi
- type: Clothing
@@ -524,7 +502,6 @@
suffix: Pirate
description: A deep space EVA helmet, very heavy but provides good protection.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/pirateeva.rsi
- type: Clothing
@@ -541,7 +518,6 @@
suffix: Pirate
description: A special hardsuit helmet, made for the captain of a pirate ship.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/piratecaptainhelm.rsi
- type: Clothing
@@ -558,7 +534,6 @@
name: ERT leader hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
- type: Clothing
@@ -580,7 +555,6 @@
name: ERT chaplain hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertchaplain.rsi
- type: Clothing
@@ -595,7 +569,6 @@
name: ERT engineer hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
- type: Clothing
@@ -617,7 +590,6 @@
name: ERT medic hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
- type: Clothing
@@ -632,7 +604,6 @@
name: ERT security hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
- type: Clothing
@@ -654,7 +625,6 @@
name: ERT janitor hardsuit helmet
description: A special hardsuit helmet worn by members of an emergency response team.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
- type: Clothing
@@ -669,7 +639,6 @@
name: CBURN exosuit helmet
description: A pressure resistant and fireproof hood worn by special cleanup units.
components:
- type: BreathMask
- type: Sprite
sprite: Clothing/Head/Hardsuits/cburn.rsi
layers:

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

@@ -263,6 +263,7 @@
slots:
- Hair
- Snout
- type: BreathMask
#Chitinous Helmet
- type: entity

11
Resources/Prototypes/Entities/Markers/map_text.yml Normal file
View File

@@ -0,0 +1,11 @@
- type: entity
id: MapText
parent: MarkerBase
name: map text
placement:
mode: PlaceFree
components:
- type: MapText
- type: Sprite
state: pink

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

@@ -1533,6 +1533,7 @@
state: mouse-0
- type: Item
size: Tiny
heldPrefix: 0
- type: Clothing
quickEquip: false
sprite: Mobs/Animals/mouse.rsi
@@ -1706,6 +1707,9 @@
Base: dead-1
Dead:
Base: splat-1
- type: Item
size: Tiny
heldPrefix: 1
- type: entity
parent: MobMouse
@@ -1732,6 +1736,9 @@
Base: dead-2
Dead:
Base: splat-2
- type: Item
size: Tiny
heldPrefix: 2
- type: entity
name: cancer mouse

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

@@ -107,6 +107,8 @@
proto: robot
- type: ZombieImmune
- type: StepTriggerImmune
- type: NoSlip
- type: Insulated
- type: entity
parent: MobSiliconBase
@@ -233,7 +235,6 @@
- type: MovementSpeedModifier
baseWalkSpeed: 2
baseSprintSpeed: 3
- type: NoSlip
- type: HTN
rootTask:
task: CleanbotCompound
@@ -280,7 +281,6 @@
- type: Construction
graph: MediBot
node: bot
- type: NoSlip
- type: Anchorable
- type: InteractionPopup
interactSuccessString: petting-success-medibot

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

@@ -84,7 +84,7 @@
scaleByQuantity: true
damage:
types:
Heat: 3
Heat: 0.15
- !type:PopupMessage
type: Local
messages: [ "slime-hurt-by-water-popup" ]

8
Resources/Prototypes/Entities/Mobs/Species/diona.yml
View File

@@ -49,9 +49,9 @@
scaleByQuantity: true
damage:
types:
Blunt: 2
Slash: 2
Piercing: 3
Blunt: 0.1
Slash: 0.1
Piercing: 0.15
- !type:PopupMessage
type: Local
visualType: Large
@@ -64,7 +64,7 @@
scaleByQuantity: true
damage:
types:
Poison: 5
Poison: 0.25
- !type:PopupMessage
type: Local
visualType: Large

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

@@ -91,7 +91,7 @@
scaleByQuantity: true
damage:
types:
Heat: 2
Heat: 0.1
- !type:PopupMessage
type: Local
visualType: Large

2
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
View File

@@ -130,7 +130,7 @@
Quantity: 50
- type: Drink
- type: Label
currentLabel: coconut water
currentLabel: reagent-name-coconut-water
- type: Sprite
sprite: Objects/Consumable/Drinks/coconutwater.rsi

62
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
View File

@@ -210,7 +210,7 @@
- ReagentId: Cognac
Quantity: 100
- type: Label
currentLabel: cognac
currentLabel: reagent-name-cognac
- type: Sprite
sprite: Objects/Consumable/Drinks/cognacbottle.rsi
- type: Sealable
@@ -228,7 +228,7 @@
- ReagentId: Cola
Quantity: 100
- type: Label
currentLabel: cola
currentLabel: reagent-name-cola
- type: Sprite
sprite: Objects/Consumable/Drinks/colabottle.rsi
- type: Sealable
@@ -266,7 +266,7 @@
- ReagentId: Gin
Quantity: 100
- type: Label
currentLabel: gin
currentLabel: reagent-name-gin
- type: Sprite
sprite: Objects/Consumable/Drinks/ginbottle.rsi
- type: Sealable
@@ -300,7 +300,7 @@
- ReagentId: CoffeeLiqueur
Quantity: 100
- type: Label
currentLabel: coffee liqueur
currentLabel: reagent-name-coffeeliqueur
- type: Sprite
sprite: Objects/Consumable/Drinks/coffeeliqueurbottle.rsi
- type: Sealable
@@ -377,7 +377,7 @@
- ReagentId: Rum
Quantity: 100
- type: Label
currentLabel: rum
currentLabel: reagent-name-rum
- type: Sprite
sprite: Objects/Consumable/Drinks/rumbottle.rsi
- type: Sealable
@@ -396,7 +396,7 @@
Quantity: 100
- type: Drink
- type: Label
currentLabel: space mountain wind
currentLabel: reagent-name-space-mountain-wind
- type: Sprite
sprite: Objects/Consumable/Drinks/space_mountain_wind_bottle.rsi
- type: Sealable
@@ -415,7 +415,7 @@
Quantity: 100
- type: Drink
- type: Label
currentLabel: space-up
currentLabel: reagent-name-space-up
- type: Sprite
sprite: Objects/Consumable/Drinks/space-up_bottle.rsi
- type: Sealable
@@ -433,7 +433,7 @@
- ReagentId: Tequila
Quantity: 100
- type: Label
currentLabel: tequila
currentLabel: reagent-name-tequila
- type: Sprite
sprite: Objects/Consumable/Drinks/tequillabottle.rsi
- type: Sealable
@@ -451,7 +451,7 @@
- ReagentId: Vermouth
Quantity: 100
- type: Label
currentLabel: vermouth
currentLabel: reagent-name-vermouth
- type: Sprite
sprite: Objects/Consumable/Drinks/vermouthbottle.rsi
- type: Sealable
@@ -469,7 +469,7 @@
- ReagentId: Vodka
Quantity: 100
- type: Label
currentLabel: vodka
currentLabel: reagent-name-vodka
- type: Sprite
sprite: Objects/Consumable/Drinks/vodkabottle.rsi
- type: Sealable
@@ -487,7 +487,7 @@
- ReagentId: Whiskey
Quantity: 100
- type: Label
currentLabel: whiskey
currentLabel: reagent-name-whiskey
- type: Sprite
sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
- type: Sealable
@@ -505,7 +505,7 @@
- ReagentId: Wine
Quantity: 100
- type: Label
currentLabel: wine
currentLabel: reagent-name-wine
- type: Sprite
sprite: Objects/Consumable/Drinks/winebottle.rsi
- type: Sealable
@@ -554,7 +554,7 @@
- ReagentId: Beer
Quantity: 150
- type: Label
currentLabel: beer
currentLabel: reagent-name-beer
- type: Sprite
sprite: Objects/Consumable/Drinks/beer.rsi
- type: Openable
@@ -598,7 +598,7 @@
- ReagentId: Ale
Quantity: 150
- type: Label
currentLabel: ale
currentLabel: reagent-name-ale
- type: Sprite
sprite: Objects/Consumable/Drinks/alebottle.rsi
- type: Openable
@@ -650,7 +650,7 @@
- ReagentId: SodaWater
Quantity: 150
- type: Label
currentLabel: soda water
currentLabel: reagent-name-soda-water
- type: entity
parent: DrinkWaterBottleFull
@@ -666,7 +666,7 @@
- ReagentId: TonicWater
Quantity: 150
- type: Label
currentLabel: tonic water
currentLabel: reagent-name-tonic-water
- type: entity
parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
@@ -681,7 +681,7 @@
- ReagentId: Sake
Quantity: 50
- type: Label
currentLabel: Sake
currentLabel: reagent-name-sake
- type: Sprite
sprite: Objects/Consumable/Drinks/sakebottle.rsi
- type: Sealable
@@ -703,7 +703,7 @@
Quantity: 150
- type: Drink
- type: Label
currentLabel: lime juice
currentLabel: reagent-name-juice-lime
- type: Sprite
sprite: Objects/Consumable/Drinks/limejuice.rsi
@@ -722,7 +722,7 @@
Quantity: 150
- type: Drink
- type: Label
currentLabel: orange juice
currentLabel: reagent-name-juice-orange
- type: Sprite
sprite: Objects/Consumable/Drinks/orangejuice.rsi
@@ -741,7 +741,7 @@
Quantity: 150
- type: Drink
- type: Label
currentLabel: cream
currentLabel: reagent-name-cream
- type: Sprite
sprite: Objects/Consumable/Drinks/cream.rsi
@@ -778,7 +778,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: lemon-lime
currentLabel: reagent-name-lemon-lime
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -795,7 +795,7 @@
Quantity: 150
- type: Drink
- type: Label
currentLabel: mead
currentLabel: reagent-name-mead
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -812,7 +812,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: ice
currentLabel: reagent-name-ice
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -829,7 +829,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: coconut water
currentLabel: reagent-name-coconut-water
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -846,7 +846,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: coffee
currentLabel: reagent-name-coffee
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -863,7 +863,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: tea
currentLabel: reagent-name-tea
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -880,7 +880,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: green tea
currentLabel: reagent-name-green-tea
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -896,6 +896,8 @@
- ReagentId: IcedTea
Quantity: 300
- type: Drink
- type: Label
currentLabel: reagent-name-iced-tea
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -912,7 +914,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: dr gibb
currentLabel: reagent-name-dr-gibb
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -929,7 +931,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: root beer
currentLabel: reagent-name-root-beer
- type: entity
parent: DrinkBottlePlasticBaseFull
@@ -946,7 +948,7 @@
Quantity: 300
- type: Drink
- type: Label
currentLabel: watermelon juice
currentLabel: reagent-name-juice-watermelon
- type: entity
parent: DrinkBottlePlasticBaseFull

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

@@ -18,6 +18,8 @@
equippedPrefix: unlit
- type: Item
size: Tiny
sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi
heldPrefix: unlit
- type: Construction
graph: smokeableCigarette
node: cigarette

2
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
View File

@@ -20,6 +20,8 @@
equippedPrefix: unlit
- type: Item
size: Tiny
sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi
heldPrefix: unlit
- type: entity
id: CigarSpent

17
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
View File

@@ -11,10 +11,9 @@
state: security
- type: MachineBoard
prototype: ShuttleGunSvalinnMachineGun
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 4
materialRequirements:
Steel: 5
CableHV: 5
@@ -29,10 +28,9 @@
state: security
- type: MachineBoard
prototype: ShuttleGunPerforator
requirements:
stackRequirements:
MatterBin: 4
Manipulator: 6
materialRequirements:
Steel: 10
CableHV: 5
@@ -47,10 +45,9 @@
state: security
- type: MachineBoard
prototype: ShuttleGunFriendship
requirements:
stackRequirements:
MatterBin: 3
Manipulator: 2
materialRequirements:
Steel: 7
CableHV: 5
@@ -65,10 +62,9 @@
state: security
- type: MachineBoard
prototype: ShuttleGunDuster
requirements:
stackRequirements:
MatterBin: 6
Manipulator: 4
materialRequirements:
Steel: 10
CableHV: 5
Uranium: 2
@@ -84,9 +80,8 @@
state: security
- type: MachineBoard
prototype: ShuttleGunKinetic
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 3
materialRequirements:
Steel: 5
CableHV: 2
CableHV: 2

17
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml
View File

@@ -8,7 +8,7 @@
state: engineering
- type: MachineBoard
prototype: ParticleAcceleratorEndCapUnfinished
materialRequirements:
stackRequirements:
Glass: 15
Steel: 15
@@ -24,10 +24,9 @@
prototype: ParticleAcceleratorFuelChamberUnfinished
componentRequirements:
AmeFuelContainer:
Amount: 1
DefaultPrototype: AmeJar
ExamineName: AME Fuel Jar
materialRequirements:
amount: 1
defaultPrototype: AmeJar
stackRequirements:
Glass: 10
Steel: 10
@@ -41,7 +40,7 @@
state: engineering
- type: MachineBoard
prototype: ParticleAcceleratorPowerBoxUnfinished
materialRequirements:
stackRequirements:
Glass: 5
Steel: 5
@@ -57,7 +56,7 @@
state: engineering
- type: MachineBoard
prototype: ParticleAcceleratorEmitterStarboardUnfinished
materialRequirements:
stackRequirements:
Glass: 5
Steel: 5
@@ -71,7 +70,7 @@
state: engineering
- type: MachineBoard
prototype: ParticleAcceleratorEmitterForeUnfinished
materialRequirements:
stackRequirements:
Glass: 5
Steel: 5
@@ -85,6 +84,6 @@
state: engineering
- type: MachineBoard
prototype: ParticleAcceleratorEmitterPortUnfinished
materialRequirements:
stackRequirements:
Glass: 5
Steel: 5

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

@@ -6,10 +6,9 @@
components:
- type: MachineBoard
prototype: Autolathe
requirements:
stackRequirements:
MatterBin: 3
Manipulator: 1
materialRequirements:
Glass: 1
- type: entity
@@ -20,15 +19,13 @@
components:
- type: MachineBoard
prototype: AutolatheHyperConvection
requirements:
stackRequirements:
MatterBin: 3
materialRequirements:
Glass: 1
tagRequirements:
Igniter:
Amount: 1
DefaultPrototype: Igniter
ExamineName: Igniter
amount: 1
defaultPrototype: Igniter
- type: entity
id: ProtolatheMachineCircuitboard
@@ -38,14 +35,13 @@
components:
- type: MachineBoard
prototype: Protolathe
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 2
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: entity
parent: BaseMachineCircuitboard
@@ -55,17 +51,15 @@
components:
- type: MachineBoard
prototype: ProtolatheHyperConvection
requirements:
stackRequirements:
MatterBin: 2
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
Igniter:
Amount: 1
DefaultPrototype: Igniter
ExamineName: Igniter
amount: 1
defaultPrototype: Igniter
- type: entity
id: BiofabricatorMachineCircuitboard
@@ -75,9 +69,8 @@
components:
- type: MachineBoard
prototype: Biofabricator
requirements:
stackRequirements:
MatterBin: 4
materialRequirements:
Glass: 1
- type: entity
@@ -90,14 +83,13 @@
state: security
- type: MachineBoard
prototype: SecurityTechFab
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 2
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: entity
id: AmmoTechFabCircuitboard
@@ -109,7 +101,7 @@
state: security
- type: MachineBoard
prototype: AmmoTechFab
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 1
@@ -123,14 +115,13 @@
state: medical
- type: MachineBoard
prototype: MedicalTechFab
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 2
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: StealTarget
stealGroup: MedicalTechFabCircuitboard
@@ -143,14 +134,13 @@
state: science
- type: MachineBoard
prototype: CircuitImprinter
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 1
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: entity
parent: BaseMachineCircuitboard
@@ -162,17 +152,15 @@
state: science
- type: MachineBoard
prototype: CircuitImprinterHyperConvection
requirements:
stackRequirements:
MatterBin: 2
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
Igniter:
Amount: 1
DefaultPrototype: Igniter
ExamineName: Igniter
amount: 1
defaultPrototype: Igniter
- type: entity
id: ExosuitFabricatorMachineCircuitboard
@@ -183,10 +171,9 @@
state: science
- type: MachineBoard
prototype: ExosuitFabricator
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 3
materialRequirements:
Glass: 5
- type: GuideHelp
guides:
@@ -203,7 +190,7 @@
state: science
- type: MachineBoard
prototype: ResearchAndDevelopmentServer
materialRequirements:
stackRequirements:
Plasma: 5
- type: entity
@@ -213,7 +200,7 @@
components:
- type: MachineBoard
prototype: UniformPrinter
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 2
@@ -226,16 +213,14 @@
state: medical
- type: MachineBoard
prototype: Vaccinator
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 1
materialRequirements:
Cable: 5
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 1
defaultPrototype: Beaker
- type: entity
id: DiagnoserMachineCircuitboard
@@ -246,18 +231,16 @@
state: medical
- type: MachineBoard
prototype: DiseaseDiagnoser
materialRequirements:
stackRequirements:
Cable: 5
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 1
defaultPrototype: Beaker
componentRequirements:
DiseaseSwab:
Amount: 1
DefaultPrototype: DiseaseSwab
ExamineName: Swab
BotanySwab:
amount: 1
defaultPrototype: DiseaseSwab
- type: entity
id: ArtifactAnalyzerMachineCircuitboard
@@ -269,10 +252,9 @@
state: science
- type: MachineBoard
prototype: MachineArtifactAnalyzer
requirements:
stackRequirements:
Manipulator: 3
Capacitor: 1
materialRequirements:
Glass: 5
- type: entity
@@ -285,9 +267,8 @@
state: science
- type: MachineBoard
prototype: MachineArtifactCrusher
requirements:
stackRequirements:
Manipulator: 2
materialRequirements:
Glass: 1
Steel: 5
@@ -301,9 +282,8 @@
state: science
- type: MachineBoard
prototype: MachineAnomalyVessel
requirements:
stackRequirements:
Capacitor: 3
materialRequirements:
Cable: 1
PlasmaGlass: 10
@@ -317,9 +297,8 @@
state: science
- type: MachineBoard
prototype: MachineAnomalyVesselExperimental
requirements:
stackRequirements:
Capacitor: 3
materialRequirements:
Cable: 5
PlasmaGlass: 15
MetalRod: 4
@@ -334,10 +313,9 @@
state: science
- type: MachineBoard
prototype: MachineAnomalySynchronizer
requirements:
stackRequirements:
Manipulator: 2
Capacitor: 5
materialRequirements:
PlasmaGlass: 5
Cable: 5
@@ -351,9 +329,8 @@
state: science
- type: MachineBoard
prototype: MachineAPE
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
Cable: 1
Glass: 1
@@ -367,10 +344,9 @@
state: engineering
- type: MachineBoard
prototype: GasThermoMachineFreezer
requirements:
stackRequirements:
MatterBin: 2
Capacitor: 2
materialRequirements:
Cable: 5
- type: Construction
deconstructionTarget: null
@@ -387,10 +363,9 @@
state: engineering
- type: MachineBoard
prototype: GasThermoMachineHeater
requirements:
stackRequirements:
MatterBin: 2
Capacitor: 2
materialRequirements:
Cable: 5
- type: Construction
graph: ThermomachineBoard
@@ -407,10 +382,9 @@
state: engineering
- type: MachineBoard
prototype: GasThermoMachineHellfireFreezer
requirements:
stackRequirements:
MatterBin: 2
Capacitor: 2
materialRequirements:
Plasma: 1
- type: Construction
deconstructionTarget: null
@@ -427,10 +401,9 @@
state: engineering
- type: MachineBoard
prototype: GasThermoMachineHellfireHeater
requirements:
stackRequirements:
MatterBin: 2
Capacitor: 2
materialRequirements:
Plasma: 1
- type: Construction
graph: ThermomachineBoard
@@ -447,9 +420,8 @@
state: engineering
- type: MachineBoard
prototype: BaseGasCondenser
requirements:
stackRequirements:
MatterBin: 1
materialRequirements:
Glass: 1
- type: entity
@@ -462,10 +434,9 @@
state: engineering
- type: MachineBoard
prototype: PortableScrubber
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 2
materialRequirements:
Cable: 5
Glass: 2
@@ -479,10 +450,9 @@
state: engineering
- type: MachineBoard
prototype: SpaceHeater
requirements:
stackRequirements:
MatterBin: 1
Capacitor: 2
materialRequirements:
Cable: 5
- type: entity
@@ -495,10 +465,9 @@
state: medical
- type: MachineBoard
prototype: CloningPod
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 2
materialRequirements:
Glass: 1
Cable: 1
@@ -512,9 +481,8 @@
state: medical
- type: MachineBoard
prototype: MedicalScanner
requirements:
stackRequirements:
Capacitor: 1
materialRequirements:
Glass: 5
Cable: 1
@@ -526,7 +494,7 @@
components:
- type: MachineBoard
prototype: CrewMonitoringServer
materialRequirements:
stackRequirements:
Steel: 1
Cable: 2
@@ -540,7 +508,7 @@
state: medical
- type: MachineBoard
prototype: CryoPod
materialRequirements:
stackRequirements:
Glass: 5
Cable: 1
@@ -554,16 +522,14 @@
state: medical
- type: MachineBoard
prototype: ChemMaster
requirements:
stackRequirements:
Capacitor: 1
materialRequirements:
Glass: 1
Cable: 1
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: entity
id: ChemDispenserMachineCircuitboard
@@ -575,16 +541,14 @@
state: medical
- type: MachineBoard
prototype: ChemDispenserEmpty
requirements:
stackRequirements:
Capacitor: 1
materialRequirements:
Glass: 1
Steel: 3
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: entity
id: BiomassReclaimerMachineCircuitboard
@@ -594,16 +558,15 @@
components:
- type: MachineBoard
prototype: BiomassReclaimer
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 1
Steel: 5
tagRequirements:
Knife:
Amount: 2
DefaultPrototype: KitchenKnife
ExamineName: Knife
materialRequirements:
Steel: 5
amount: 2
defaultPrototype: KitchenKnife
examineName: construction-insert-info-examine-name-knife
- type: entity
id: HydroponicsTrayMachineCircuitboard
@@ -615,15 +578,14 @@
state: service
- type: MachineBoard
prototype: HydroponicsTrayEmpty
materialRequirements:
stackRequirements:
# replacing the console screen
Glass: 5
Cable: 2
tagRequirements:
GlassBeaker:
Amount: 2
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 2
defaultPrototype: Beaker
- type: entity
id: SeedExtractorMachineCircuitboard
@@ -635,10 +597,9 @@
state: service
- type: MachineBoard
prototype: SeedExtractor
requirements:
stackRequirements:
Manipulator: 2
Capacitor: 1
materialRequirements:
# replacing the console screen
Glass: 1
Cable: 2
@@ -654,11 +615,13 @@
state: power_mod
- type: MachineBoard
prototype: SMESBasicEmpty
requirements:
stackRequirements:
Capacitor: 1
PowerCell: 4
materialRequirements:
CableHV: 10
componentRequirements:
PowerCell:
amount: 4
defaultPrototype: PowerCellSmall
- type: entity
id: CellRechargerCircuitboard
@@ -671,9 +634,8 @@
state: charger_APC
- type: MachineBoard
prototype: PowerCellRecharger
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
Cable: 5
- type: PhysicalComposition
materialComposition:
@@ -693,9 +655,8 @@
state: charger_APC
- type: MachineBoard
prototype: PowerCageRecharger
requirements:
stackRequirements:
Capacitor: 4
materialRequirements:
Steel: 5
Cable: 10
- type: PhysicalComposition
@@ -716,9 +677,8 @@
state: charger_APC
- type: MachineBoard
prototype: BorgCharger
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
Cable: 5
- type: PhysicalComposition
materialComposition:
@@ -738,9 +698,8 @@
state: charger_APC
- type: MachineBoard
prototype: WeaponCapacitorRecharger
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
CableMV: 5
- type: PhysicalComposition
materialComposition:
@@ -760,9 +719,8 @@
state: charger_APC
- type: MachineBoard
prototype: TurboItemRecharger
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
CableMV: 5
- type: PhysicalComposition
materialComposition:
@@ -777,12 +735,14 @@
components:
- type: MachineBoard
prototype: SubstationBasicEmpty
requirements:
stackRequirements:
Capacitor: 1
PowerCell: 1
materialRequirements:
CableMV: 5
CableHV: 5
componentRequirements:
PowerCell:
amount: 1
defaultPrototype: PowerCellSmall
- type: PhysicalComposition
materialComposition:
Glass: 200
@@ -798,31 +758,31 @@
components:
- type: MachineBoard
prototype: DawInstrument
materialRequirements:
stackRequirements:
Glass: 1
Cable: 1
tagRequirements:
# One instrument to bring them all and in the darkness bind them...
KeyedInstrument:
Amount: 1
DefaultPrototype: SynthesizerInstrument
ExamineName: Keyed Instrument
amount: 1
defaultPrototype: SynthesizerInstrument
examineName: construction-insert-info-examine-name-instrument-keyed
StringInstrument:
Amount: 1
DefaultPrototype: AcousticGuitarInstrument
ExamineName: String Instrument
amount: 1
defaultPrototype: AcousticGuitarInstrument
examineName: construction-insert-info-examine-name-instrument-string
PercussionInstrument:
Amount: 1
DefaultPrototype: GlockenspielInstrument
ExamineName: Percussion Instrument
amount: 1
defaultPrototype: GlockenspielInstrument
examineName: construction-insert-info-examine-name-instrument-percussion
BrassInstrument:
Amount: 1
DefaultPrototype: TrumpetInstrument
ExamineName: Brass Instrument
amount: 1
defaultPrototype: TrumpetInstrument
examineName: construction-insert-info-examine-name-instrument-brass
WoodwindInstrument:
Amount: 1
DefaultPrototype: SaxophoneInstrument
ExamineName: Woodwind Instrument
amount: 1
defaultPrototype: SaxophoneInstrument
examineName: construction-insert-info-examine-name-instrument-woodwind
- type: entity
id: PortableGeneratorPacmanMachineCircuitboard
@@ -833,9 +793,8 @@
state: engineering
- type: MachineBoard
prototype: PortableGeneratorPacman
requirements:
stackRequirements:
Capacitor: 1
materialRequirements:
CableHV: 5
- type: PhysicalComposition
materialComposition:
@@ -852,9 +811,8 @@
components:
- type: MachineBoard
prototype: Thruster
requirements:
stackRequirements:
Capacitor: 4
materialRequirements:
Steel: 5
- type: entity
@@ -864,10 +822,9 @@
components:
- type: MachineBoard
prototype: Gyroscope
requirements:
stackRequirements:
Manipulator: 2
Capacitor: 1
materialRequirements:
Glass: 2
- type: entity
@@ -879,9 +836,8 @@
state: engineering
- type: MachineBoard
prototype: PortableGeneratorSuperPacman
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
CableHV: 10
- type: PhysicalComposition
materialComposition:
@@ -900,9 +856,8 @@
state: engineering
- type: MachineBoard
prototype: PortableGeneratorJrPacman
requirements:
stackRequirements:
Capacitor: 1
materialRequirements:
Cable: 10
- type: PhysicalComposition
materialComposition:
@@ -920,14 +875,13 @@
components:
- type: MachineBoard
prototype: KitchenReagentGrinder
requirements:
stackRequirements:
MatterBin: 2
Manipulator: 2
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 1
defaultPrototype: Beaker
- type: entity
id: HotplateMachineCircuitboard
@@ -937,9 +891,8 @@
components:
- type: MachineBoard
prototype: ChemistryHotplate
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
Glass: 1
- type: entity
@@ -950,9 +903,8 @@
components:
- type: MachineBoard
prototype: KitchenElectricGrill
requirements:
stackRequirements:
Capacitor: 4
materialRequirements:
Glass: 2
Cable: 5
@@ -965,10 +917,9 @@
state: medical
- type: MachineBoard
prototype: StasisBed
requirements:
stackRequirements:
Capacitor: 1
Manipulator: 1
materialRequirements:
Cable: 3
Steel: 2
@@ -982,9 +933,8 @@
state: medical
- type: MachineBoard
prototype: MachineElectrolysisUnit
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
Cable: 1
- type: entity
@@ -997,9 +947,8 @@
state: medical
- type: MachineBoard
prototype: MachineCentrifuge
requirements:
stackRequirements:
Manipulator: 1
materialRequirements:
Steel: 1
- type: entity
@@ -1011,9 +960,8 @@
state: supply
- type: MachineBoard
prototype: MaterialReclaimer
requirements:
stackRequirements:
Manipulator: 2
materialRequirements:
Steel: 5
Plastic: 5
@@ -1026,10 +974,9 @@
state: supply
- type: MachineBoard
prototype: OreProcessor
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 3
materialRequirements:
Glass: 1
- type: entity
@@ -1041,10 +988,9 @@
state: supply
- type: MachineBoard
prototype: OreProcessorIndustrial
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 3
materialRequirements:
Glass: 1
- type: entity
@@ -1054,7 +1000,7 @@
components:
- type: MachineBoard
prototype: Sheetifier
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 1
@@ -1067,9 +1013,8 @@
state: service
- type: MachineBoard
prototype: KitchenMicrowave
requirements:
stackRequirements:
Capacitor: 1
materialRequirements:
Glass: 2
Cable: 2
- type: Tag
@@ -1085,13 +1030,13 @@
state: service
- type: MachineBoard
prototype: FatExtractor
requirements:
stackRequirements:
Manipulator: 1
componentRequirements:
Utensil:
Amount: 1
DefaultPrototype: ForkPlastic
ExamineName: Utensil
amount: 1
defaultPrototype: ForkPlastic
examineName: construction-insert-info-examine-name-utensil
- type: entity
parent: BaseMachineCircuitboard
@@ -1100,10 +1045,9 @@
components:
- type: MachineBoard
prototype: MachineFlatpacker
requirements:
stackRequirements:
Manipulator: 2
MatterBin: 1
materialRequirements:
Steel: 1
- type: entity
@@ -1115,9 +1059,8 @@
state: engineering
- type: MachineBoard
prototype: Emitter
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
CableHV: 5
Glass: 2
@@ -1129,7 +1072,7 @@
components:
- type: MachineBoard
prototype: SurveillanceCameraRouterConstructed
materialRequirements:
stackRequirements:
Cable: 1
- type: entity
@@ -1140,7 +1083,7 @@
components:
- type: MachineBoard
prototype: SurveillanceCameraWirelessRouterConstructed
materialRequirements:
stackRequirements:
Cable: 2
Glass: 1
@@ -1152,7 +1095,7 @@
components:
- type: MachineBoard
prototype: SurveillanceWirelessCameraMovableConstructed
materialRequirements:
stackRequirements:
Glass: 2
Cable: 2
@@ -1164,7 +1107,7 @@
components:
- type: MachineBoard
prototype: SurveillanceWirelessCameraAnchoredConstructed
materialRequirements:
stackRequirements:
Cable: 2
Glass: 1
@@ -1176,10 +1119,9 @@
components:
- type: MachineBoard
prototype: GasRecycler
requirements:
stackRequirements:
Capacitor: 1
Manipulator: 1
materialRequirements:
Steel: 10
Plasma: 5
@@ -1193,13 +1135,12 @@
state: service
- type: MachineBoard
prototype: BoozeDispenserEmpty
materialRequirements:
stackRequirements:
Steel: 5
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 1
defaultPrototype: Beaker
- type: entity
id: CargoTelepadMachineCircuitboard
@@ -1211,9 +1152,8 @@
state: supply
- type: MachineBoard
prototype: CargoTelepad
requirements:
stackRequirements:
Capacitor: 2
materialRequirements:
Steel: 5
- type: entity
@@ -1226,13 +1166,12 @@
state: service
- type: MachineBoard
prototype: SodaDispenserEmpty
materialRequirements:
stackRequirements:
Steel: 5
tagRequirements:
GlassBeaker:
Amount: 1
DefaultPrototype: Beaker
ExamineName: Glass Beaker
amount: 1
defaultPrototype: Beaker
- type: entity
id: TelecomServerCircuitboard
@@ -1242,7 +1181,7 @@
components:
- type: MachineBoard
prototype: TelecomServer
materialRequirements:
stackRequirements:
Steel: 1
Cable: 2
@@ -1254,9 +1193,8 @@
components:
- type: MachineBoard
prototype: SalvageMagnet
requirements:
stackRequirements:
Capacitor: 4
materialRequirements:
Steel: 5
CableHV: 5
Cable: 2
@@ -1269,10 +1207,9 @@
components:
- type: MachineBoard
prototype: GravityGeneratorMini
requirements:
stackRequirements:
Capacitor: 4
MatterBin: 3
materialRequirements:
Steel: 5
CableHV: 5
Uranium: 2
@@ -1284,10 +1221,9 @@
components:
- type: MachineBoard
prototype: ReagentGrinderIndustrial
requirements:
stackRequirements:
MatterBin: 1
Manipulator: 3
materialRequirements:
Glass: 1
- type: entity
@@ -1298,7 +1234,7 @@
components:
- type: MachineBoard
prototype: Jukebox
materialRequirements:
stackRequirements:
WoodPlank: 5
Steel: 2
Glass: 5

3
Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
abstract: true
parent: BaseItem
id: BaseHandheldInstrument
@@ -71,6 +71,7 @@
- BulletImpassable
- type: StaticPrice
price: 300
- type: RequireProjectileTarget
- type: entity
parent: BasePlaceableInstrument

6
Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
View File

@@ -59,7 +59,7 @@
size: Small
- type: Prayable
sentMessage: prayer-popup-notify-centcom-sent
notifiactionPrefix: prayer-chat-notify-centcom
notificationPrefix: prayer-chat-notify-centcom
verb: prayer-verbs-call
verbImage: null
@@ -74,7 +74,7 @@
state: icon
- type: Prayable
sentMessage: prayer-popup-notify-syndicate-sent
notifiactionPrefix: prayer-chat-notify-syndicate
notificationPrefix: prayer-chat-notify-syndicate
- type: entity
parent: BaseHandheldInstrument
@@ -185,6 +185,6 @@
- ItemMask
- type: Prayable
sentMessage: prayer-popup-notify-honkmother-sent
notifiactionPrefix: prayer-chat-notify-honkmother
notificationPrefix: prayer-chat-notify-honkmother
verb: prayer-verbs-call
verbImage: null

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

@@ -140,7 +140,8 @@
respectMidiLimits: false
- type: Sprite
sprite: Objects/Fun/Instruments/h_synthesizer.rsi
state: icon
state: supersynth
- type: Item
heldPrefix: super
size: Normal
sprite: Objects/Fun/Instruments/h_synthesizer.rsi

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

@@ -1222,6 +1222,7 @@
- type: StaminaDamageOnHit
damage: 8
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 0

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

@@ -76,7 +76,7 @@
scaleByQuantity: true
damage:
types:
Heat: 10
Heat: 0.5
- type: AtmosExposed
- type: Kudzu
growthTickChance: 0.3

11
Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
View File

@@ -21,9 +21,6 @@
components:
- type: Sprite
state: capacitor
- type: MachinePart
part: Capacitor
rating: 1
- type: Tag
tags:
- CapacitorStockPart
@@ -39,11 +36,8 @@
components:
- type: Sprite
state: micro_mani
- type: MachinePart
part: Manipulator
rating: 1
- type: Stack
stackType: MicroManipulator
stackType: Manipulator
- type: entity
id: MatterBinStockPart
@@ -54,8 +48,5 @@
components:
- type: Sprite
state: matter_bin
- type: MachinePart
part: MatterBin
rating: 1
- type: Stack
stackType: MatterBin

12
Resources/Prototypes/Entities/Objects/Power/powercells.yml
View File

@@ -73,9 +73,6 @@
- type: Battery
maxCharge: 360
startingCharge: 360
- type: MachinePart
part: PowerCell
rating: 1
- type: Tag
tags:
- PowerCellSmall
@@ -114,9 +111,6 @@
- type: Battery
maxCharge: 720
startingCharge: 720
- type: MachinePart
part: PowerCell
rating: 2
- type: entity
id: PowerCellMediumPrinted
@@ -152,9 +146,6 @@
- type: Battery
maxCharge: 1080
startingCharge: 1080
- type: MachinePart
part: PowerCell
rating: 3
- type: entity
id: PowerCellHighPrinted
@@ -190,9 +181,6 @@
- type: Battery
maxCharge: 1800
startingCharge: 1800
- type: MachinePart
part: PowerCell
rating: 4
- type: entity
id: PowerCellHyperPrinted

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

@@ -6,7 +6,17 @@
components:
- type: Sprite
sprite: Objects/Specific/Janitorial/mop.rsi
state: mop
layers:
- state: mop
- map: ["enum.SolutionContainerLayers.Fill"]
state: fill-3
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 3
fillBaseName: fill-
inHandsFillBaseName: -fill-
inHandsMaxFillLevels: 2
- type: MeleeWeapon
damage:
types:
@@ -49,7 +59,17 @@
components:
- type: Sprite
sprite: Objects/Specific/Janitorial/advmop.rsi
state: advmop
layers:
- state: advmop
- map: ["enum.SolutionContainerLayers.Fill"]
state: fill-2
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 2
fillBaseName: fill-
inHandsFillBaseName: -fill-
inHandsMaxFillLevels: 2
- type: MeleeWeapon
damage:
types:
@@ -244,7 +264,15 @@
components:
- type: Sprite
sprite: Objects/Specific/Janitorial/rag.rsi
state: rag
layers:
- state: rag
- map: ["enum.SolutionContainerLayers.Fill"]
state: fill-3
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 3
fillBaseName: fill-
- type: Spillable
solution: absorbed
- type: MeleeWeapon

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

@@ -126,4 +126,4 @@
- type: Sprite
layers:
- state: boxwide
- state: shellslug
- state: shelltranquilizer

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: BaseShellShotgun
name: shell (.50)
parent: BaseCartridge
@@ -114,7 +114,7 @@
components:
- type: Sprite
layers:
- state: practice
- state: tranquilizer
map: [ "enum.AmmoVisualLayers.Base" ]
- type: CartridgeAmmo
proto: PelletShotgunTranquilizer
@@ -129,7 +129,7 @@
- type: SolutionTransfer
maxTransferAmount: 7
- type: SpentAmmoVisuals
state: "practice"
state: "tranquilizer"
- type: entity
id: ShellShotgunImprovised

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

@@ -128,7 +128,7 @@
shader: unshaded
map: [ "blade" ]
- type: MeleeWeapon
wideAnimationRotation: -135
wideAnimationRotation: 145
attackRate: 1
hidden: true
damage:

4
Resources/Prototypes/Entities/Structures/Decoration/banners.yml
View File

@@ -91,7 +91,7 @@
id: BannerScience
parent: BannerBase
name: science banner
description: A banner displaying the colors of the science department. Where stupidity is proven greater than the universe.
description: A banner displaying the colors of the science department. Where science has no bounds, and regulations are rarely followed.
components:
- type: Sprite
sprite: Structures/Decoration/banner.rsi
@@ -101,7 +101,7 @@
id: BannerSecurity
parent: BannerBase
name: security banner
description: A banner displaying the colors of the shitcurity department. Security, my bad.
description: A banner displaying the colors of the security department. You're surprised it's not vandalised.
components:
- type: Sprite
sprite: Structures/Decoration/banner.rsi

2
Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
View File

@@ -1,7 +1,7 @@
- type: entity
abstract: true
id: ReagentDispenserBase
parent: ConstructibleMachine
parent: SmallConstructibleMachine
placement:
mode: SnapgridCenter
components:

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

@@ -60,3 +60,4 @@
ents: []
- type: LightningTarget
priority: 1
- type: RequireProjectileTarget

2
Resources/Prototypes/Entities/Structures/Machines/Medical/chemistry_machines.yml
View File

@@ -1,6 +1,6 @@
- type: entity
id: BaseTabletopChemicalMachine
parent: [ BaseMachinePowered, ConstructibleMachine ]
parent: [ BaseMachinePowered, SmallConstructibleMachine ]
abstract: true
components:
- type: Transform

4
Resources/Prototypes/Entities/Structures/Machines/Medical/disease_diagnoser.yml
View File

@@ -1,6 +1,6 @@
- type: entity
id: DiseaseDiagnoser
parent: [ BaseMachinePowered, ConstructibleMachine ]
parent: [ BaseMachinePowered, SmallConstructibleMachine ]
name: Disease Diagnoser Delta Extreme
description: A machine that analyzes disease samples.
placement:
@@ -43,5 +43,3 @@
contentMargin: 12.0, 0.0, 12.0, 0.0
# This is a narrow piece of paper
maxWritableArea: 128.0, 0.0

1
Resources/Prototypes/Entities/Structures/Machines/Medical/vaccinator.yml
View File

@@ -24,3 +24,4 @@
containers:
machine_board: !type:Container
machine_parts: !type:Container
- type: RequireProjectileTarget

3
Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml
View File

@@ -1,6 +1,6 @@
- type: entity
id: MachineArtifactAnalyzer
parent: [ BaseMachinePowered, ConstructibleMachine ]
parent: [ BaseMachinePowered, SmallConstructibleMachine ]
name: artifact analyzer
description: A platform capable of performing analysis on various types of artifacts.
components:
@@ -35,6 +35,7 @@
- Impassable
- MidImpassable
- LowImpassable
- BulletImpassable
hard: False
- type: Transform
anchored: true

7
Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
View File

@@ -70,3 +70,10 @@
- machine_board
- type: LightningTarget
priority: 1
- type: entity
abstract: true
parent: ConstructibleMachine
id: SmallConstructibleMachine
components:
- type: RequireProjectileTarget

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

@@ -66,6 +66,7 @@
deviceNetId: Wireless
receiveFrequencyId: Fax
transmitFrequencyId: Fax
- type: RequireProjectileTarget
# Special
- type: entity

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

@@ -334,6 +334,7 @@
- BoxBeanbag
- BoxShotgunIncendiary
- BoxShotgunUranium
- BoxShellTranquilizer
- ExplosivePayload
- GrenadeBlast
- GrenadeEMP
@@ -361,7 +362,6 @@
- PowerCageHigh
- PowerCageMedium
- PowerCageSmall
- ShellTranquilizer
- SpeedLoaderMagnumIncendiary
- SpeedLoaderMagnumUranium
- TelescopicShield
@@ -508,6 +508,7 @@
- Sheet
- RawMaterial
- Ingot
- type: RequireProjectileTarget
- type: entity
id: CircuitImprinterHyperConvection
@@ -746,6 +747,7 @@
- BoxBeanbag
- BoxShotgunIncendiary
- BoxShotgunUranium
- BoxShellTranquilizer
- ExplosivePayload
- FlashPayload
- GrenadeBlast
@@ -773,7 +775,6 @@
- PowerCageHigh
- PowerCageMedium
- PowerCageSmall
- ShellTranquilizer
- ShuttleGunDusterCircuitboard
- ShuttleGunFriendshipCircuitboard
- ShuttleGunPerforatorCircuitboard
@@ -827,6 +828,7 @@
- BoxLethalshot
- BoxShotgunFlare
- BoxShotgunSlug
- BoxShellTranquilizer
- MagazineBoxLightRifle
- MagazineBoxMagnum
- MagazineBoxPistol
@@ -840,7 +842,6 @@
- MagazineShotgun
- MagazineShotgunEmpty
- MagazineShotgunSlug
- ShellTranquilizer
- SpeedLoaderMagnum
- SpeedLoaderMagnumEmpty
- type: MaterialStorage

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

@@ -1,6 +1,6 @@
- type: entity
- type: entity
id: KitchenMicrowave
parent: [ BaseMachinePowered, ConstructibleMachine ]
parent: [ BaseMachinePowered, SmallConstructibleMachine ]
name: microwave
description: It's magic.
components:

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

@@ -1,6 +1,6 @@
- type: entity
id: KitchenReagentGrinder
parent: [ BaseMachinePowered, ConstructibleMachine ]
parent: [ BaseMachinePowered, SmallConstructibleMachine ]
name: reagent grinder
description: From BlenderTech. Will It Blend? Let's find out!
suffix: grinder/juicer

4
Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
View File

@@ -1,6 +1,6 @@
- type: entity
abstract: true
parent: [ BaseStructureDynamic, ConstructibleMachine ]
parent: [ BaseStructureDynamic, SmallConstructibleMachine ]
id: SurveillanceWirelessCameraBase
name: wireless camera
description: A camera. It's watching you. Kinda.
@@ -23,6 +23,8 @@
density: 80
mask:
- MachineMask
layer:
- BulletImpassable
- type: SurveillanceCameraMicrophone
blacklist:
components:

2
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
View File

@@ -1,6 +1,6 @@
- type: entity
id: PortableScrubber
parent: [BaseMachinePowered, ConstructibleMachine, StructureWheeled]
parent: [BaseMachinePowered, SmallConstructibleMachine, StructureWheeled]
name: portable scrubber
description: It scrubs, portably!
components:

2
Resources/Prototypes/Entities/Structures/Piping/Atmospherics/unary.yml
View File

@@ -383,7 +383,7 @@
board: HellfireHeaterMachineCircuitBoard
- type: entity
parent: [ BaseMachinePowered, ConstructibleMachine ]
parent: [ BaseMachinePowered, SmallConstructibleMachine ]
id: BaseGasCondenser
name: condenser
description: Condenses gases into liquids. Now we just need some plumbing.

1
Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
View File

@@ -84,6 +84,7 @@
enum.DisposalUnitUiKey.Key:
type: DisposalUnitBoundUserInterface
- type: RatKingRummageable
- type: RequireProjectileTarget
- type: entity
id: MailingUnit

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

@@ -1,7 +1,7 @@
- type: entity
id: Emitter
name: emitter
parent: ConstructibleMachine
parent: SmallConstructibleMachine
description: A heavy duty industrial laser. Shoots non-stop when turned on.
placement:
mode: SnapgridCenter

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

@@ -1,4 +1,4 @@
#
#
# You can use this Desmos sheet to calculate fuel burn rate values:
# https://www.desmos.com/calculator/qcektq5dqs
#
@@ -6,7 +6,7 @@
- type: entity
abstract: true
id: PortableGeneratorBase
parent: [ BaseMachine, ConstructibleMachine, StructureWheeled]
parent: [ BaseMachine, SmallConstructibleMachine, StructureWheeled]
components:
# Basic properties
- type: Transform

3
Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
View File

@@ -49,6 +49,7 @@
onBump: false
requirePower: true
highVoltageNode: output
- type: RequireProjectileTarget
- type: entity
id: SolarPanel
@@ -157,6 +158,7 @@
graph: SolarPanel
node: solarassembly
defaultTarget: solarpanel
- type: RequireProjectileTarget
- type: entity
id: SolarTracker
@@ -201,3 +203,4 @@
- type: Construction
graph: SolarPanel
node: solartracker
- type: RequireProjectileTarget

3
Resources/Prototypes/Entities/Structures/Power/chargers.yml
View File

@@ -58,12 +58,15 @@
density: 500
mask:
- TabletopMachineMask
layer:
- BulletImpassable
- type: PowerChargerVisuals
- type: ContainerContainer
containers:
charger_slot: !type:ContainerSlot
machine_board: !type:Container
machine_parts: !type:Container
- type: RequireProjectileTarget
- type: entity
parent: BaseItemRecharger

4
Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
View File

@@ -32,7 +32,7 @@
- type: PacifismDangerousAttack
- type: Explosive
explosionType: Default
totalIntensity: 120 # ~ 5 tile radius
totalIntensity: 60 # Mediocre explosion. Not enough to do any meaningful structural damage to anything other then windows, provided you're only using one tank.
- type: entity
id: WeldingFuelTankFull
@@ -74,7 +74,7 @@
maxVol: 5000
- type: Explosive
explosionType: Default
totalIntensity: 140
totalIntensity: 120
# Water

1
Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
View File

@@ -156,6 +156,7 @@
node: chestDrawer
- type: StaticPrice
price: 15
- type: RequireProjectileTarget
- type: entity
abstract: true

19
Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
View File

@@ -72,7 +72,7 @@
acts: [ "Destruction" ]
- type: Climbable
delay: 2.5
- type: RequireProjectileTarget
#High
- type: entity
@@ -97,8 +97,10 @@
mask:
- FullTileMask
layer:
- Opaque
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: straight
@@ -125,8 +127,10 @@
mask:
- FullTileMask
layer:
- Opaque
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: end
@@ -162,8 +166,10 @@
mask:
- TableMask
layer:
- Opaque
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: corner
@@ -199,8 +205,10 @@
mask:
- TableMask
layer:
- Opaque
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: tjunction
@@ -226,8 +234,10 @@
mask:
- FullTileMask
layer:
- Opaque
- MidImpassable
- LowImpassable
- BulletImpassable
- type: InteractionOutline
- type: Door
openSpriteState: door_opened
@@ -279,6 +289,7 @@
layer:
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: straight_small
@@ -307,6 +318,7 @@
layer:
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: end_small
@@ -344,6 +356,7 @@
layer:
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: corner_small
@@ -381,6 +394,7 @@
layer:
- MidImpassable
- LowImpassable
- BulletImpassable
- type: Construction
graph: FenceWood
node: tjunction_small
@@ -408,6 +422,7 @@
layer:
- MidImpassable
- LowImpassable
- BulletImpassable
- type: InteractionOutline
- type: Door
openSpriteState: door_opened_small
@@ -432,4 +447,4 @@
path: /Audio/Effects/door_close.ogg
- type: Construction
graph: FenceWood
node: gate_small
node: gate_small

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

@@ -1,6 +1,6 @@
- type: entity
name: hydroponics tray
parent: [ hydroponicsSoil, ConstructibleMachine]
parent: [ hydroponicsSoil, SmallConstructibleMachine]
id: hydroponicsTray
description: An interstellar-grade space farmplot allowing for rapid growth and selective breeding of crops. Just... keep in mind the space weeds.
components:
@@ -14,6 +14,8 @@
hard: true
mask:
- MachineMask
layer:
- BulletImpassable
- type: Anchorable
- type: Pullable
- type: Sprite