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

13
Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
View File

@@ -27,17 +27,8 @@
sprite: Objects/Devices/communication.rsi
state: walkietalkie
doAfter: 5
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
doAfter: 5
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
- material: Capacitor
amount: 2
doAfter: 5
- node: medsecHud
entity: ClothingEyesHudMedSec

18
Resources/Prototypes/Recipes/Construction/Graphs/food/steak.yml
View File

@@ -174,6 +174,22 @@
- node: bacon
entity: FoodMeatBaconCooked
# anomaly meat steak
- type: constructionGraph
id: AnomalyMeatSteak
start: start
graph:
- node: start
edges:
- to: anomaly steak
completed:
- !type:PlaySound
sound: /Audio/Effects/sizzle.ogg
steps:
- minTemperature: 335
- node: anomaly steak
entity: FoodMeatAnomalyCooked
# cutlets
- type: constructionGraph
@@ -294,4 +310,4 @@
steps:
- minTemperature: 345
- node: xeno cutlet
entity: FoodMeatXenoCutletCooked
entity: FoodMeatXenoCutletCooked

173
Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
View File

@@ -5,18 +5,6 @@
- node: start
entity: CyborgEndoskeleton
edges:
# empty the parts via prying
- to: start
conditions:
- !type:ContainerNotEmpty
container: part-container
steps:
- tool: Prying
doAfter: 0.5
completed:
- !type:EmptyAllContainers
- to: cyborg
steps:
- assemblyId: generic
@@ -43,165 +31,6 @@
- tool: Screwing
doAfter: 0.5
- to: engineer
steps:
- assemblyId: engineer
guideString: borg-construction-guide-string
- material: Cable
amount: 1
doAfter: 1
store: part-container
- component: Flash
name: flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- component: Flash
name: second flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- tool: Screwing
doAfter: 0.5
- to: janitor
steps:
- assemblyId: janitor
guideString: borg-construction-guide-string
- material: Cable
amount: 1
doAfter: 1
store: part-container
- component: Flash
name: flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- component: Flash
name: second flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- tool: Screwing
doAfter: 0.5
- to: medical
steps:
- assemblyId: medical
guideString: borg-construction-guide-string
- material: Cable
amount: 1
doAfter: 1
store: part-container
- component: Flash
name: flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- component: Flash
name: second flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- tool: Screwing
doAfter: 0.5
- to: mining
steps:
- assemblyId: mining
guideString: borg-construction-guide-string
- material: Cable
amount: 1
doAfter: 1
store: part-container
- component: Flash
name: flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- component: Flash
name: second flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- tool: Screwing
doAfter: 0.5
- to: service
steps:
- assemblyId: service
guideString: borg-construction-guide-string
- material: Cable
amount: 1
doAfter: 1
store: part-container
- component: Flash
name: flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- component: Flash
name: second flash
store: part-container
icon:
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
- tool: Screwing
doAfter: 0.5
- node: cyborg
entity: BorgChassisGeneric
- node: engineer
entity: BorgChassisEngineer
- node: janitor
entity: BorgChassisJanitor
- node: mining
entity: BorgChassisMining
- node: medical
entity: BorgChassisMedical
- node: service
entity: BorgChassisService
- node: syndicateassault
entity: BorgChassisSyndicateAssault
- node: syndicatemedical
entity: BorgChassisSyndicateMedical
- node: syndicatesaboteur
entity: BorgChassisSyndicateSaboteur
entity: BorgChassisSelectable

7
Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
View File

@@ -46,11 +46,8 @@
doAfter: 1
- to: memory_cell
steps:
- tag: CapacitorStockPart
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
name: a capacitor
- material: Capacitor
amount: 1
- material: Cable
amount: 2
doAfter: 1

29
Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml Normal file
View File

@@ -0,0 +1,29 @@
- type: constructionGraph
id: GasPipeSensor
start: start
graph:
- node: start
edges:
- to: sensor
steps:
- material: Steel
amount: 2
doAfter: 1
- node: sensor
entity: GasPipeSensor
actions:
- !type:SetAnchor
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity
conditions:
- !type:EntityAnchored
anchored: false
steps:
- tool: Welding
doAfter: 1

10
Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
View File

@@ -28,7 +28,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalBlue
name: blue crystal shard
@@ -48,7 +48,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalPink
name: pink crystal shard
@@ -68,7 +68,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalOrange
name: orange crystal shard
@@ -88,7 +88,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalRed
name: red crystal shard
@@ -108,7 +108,7 @@
- to: icon
steps:
- material: Glass
amount: 2
amount: 1
doAfter: 1
- tag: CrystalGreen
name: green crystal shard

8
Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
View File

@@ -57,12 +57,8 @@
sprite: "Objects/Power/power_cells.rsi"
state: "medium"
doAfter: 0.5
- tag: CapacitorStockPart
name: a capacitor
store: capacitor
icon:
sprite: "Objects/Misc/stock_parts.rsi"
state: "capacitor"
- material: Capacitor
amount: 1
doAfter: 0.5
- to: frame
completed:

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

@@ -366,6 +366,21 @@
objectType: Structure
canRotate: true
- type: construction
name: gas pipe sensor
id: GasPipeSensor
graph: GasPipeSensor
startNode: start
targetNode: sensor
category: construction-category-structures
description: Reports on the status of the gas within the attached pipe network.
icon:
sprite: Structures/Piping/Atmospherics/gas_pipe_sensor.rsi
state: icon
placementMode: SnapgridCenter
objectType: Structure
canRotate: true
# ATMOS PIPES
- type: construction
name: gas pipe half

24
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
View File

@@ -2050,3 +2050,27 @@
FoodCroissantRaw: 1
FoodButterSlice: 1
ShardGlass: 1
- type: microwaveMealRecipe
id: RecipeInertAnomalyMeat
name: inert meat anomaly recipe
result: FoodMeatAnomaly
time: 5
solids:
AnomalyCoreFleshInert: 1
- type: microwaveMealRecipe
id: RecipeAnomalyMeat
name: meat anomaly recipe
result: FoodMeatAnomaly
time: 5
solids:
AnomalyCoreFlesh: 1
- type: microwaveMealRecipe
id: RecipeAnomalyMeatCooked
name: cooked meat anomaly recipe
result: FoodMeatAnomalyCooked
time: 5
solids:
FoodMeatAnomaly: 1

12
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
View File

@@ -60,15 +60,7 @@
- material: Cable
amount: 2
doAfter: 1
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
- tag: CapacitorStockPart
name: capacitor
icon:
sprite: Objects/Misc/stock_parts.rsi
state: capacitor
- material: Capacitor
amount: 2
- node: potatoaichip
entity: PotatoAIChip

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

@@ -52,6 +52,15 @@
Steel: 50
Glass: 50
- type: latheRecipe
id: DimLightBulb
result: DimLightBulb
category: Lights
completetime: 2
materials:
Steel: 50
Glass: 50
- type: latheRecipe
id: GlowstickRed
result: GlowstickRed

220
Resources/Prototypes/Recipes/Lathes/robotics.yml
View File

@@ -61,8 +61,6 @@
materials:
Steel: 1500
# Generic
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftArmBorg
@@ -93,162 +91,6 @@
id: TorsoBorg
result: TorsoBorg
# Engineer
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftArmBorgEngineer
result: LeftArmBorgEngineer
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightArmBorgEngineer
result: RightArmBorgEngineer
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftLegBorgEngineer
result: LeftLegBorgEngineer
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightLegBorgEngineer
result: RightLegBorgEngineer
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: HeadBorgEngineer
result: HeadBorgEngineer
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: TorsoBorgEngineer
result: TorsoBorgEngineer
# Medical
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftArmBorgMedical
result: LeftArmBorgMedical
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightArmBorgMedical
result: RightArmBorgMedical
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftLegBorgMedical
result: LeftLegBorgMedical
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightLegBorgMedical
result: RightLegBorgMedical
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: HeadBorgMedical
result: HeadBorgMedical
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: TorsoBorgMedical
result: TorsoBorgMedical
# Mining
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftArmBorgMining
result: LeftArmBorgMining
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightArmBorgMining
result: RightArmBorgMining
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftLegBorgMining
result: LeftLegBorgMining
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightLegBorgMining
result: RightLegBorgMining
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: HeadBorgMining
result: HeadBorgMining
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: TorsoBorgMining
result: TorsoBorgMining
# Service
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftArmBorgService
result: LeftArmBorgService
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightArmBorgService
result: RightArmBorgService
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftLegBorgService
result: LeftLegBorgService
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightLegBorgService
result: RightLegBorgService
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: HeadBorgService
result: HeadBorgService
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: TorsoBorgService
result: TorsoBorgService
# Janitor
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: LeftLegBorgJanitor
result: LeftLegBorgJanitor
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: RightLegBorgJanitor
result: RightLegBorgJanitor
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: HeadBorgJanitor
result: HeadBorgJanitor
materials:
Steel: 500
Glass: 200
- type: latheRecipe
parent: BaseBorgLimbRecipe
id: TorsoBorgJanitor
result: TorsoBorgJanitor
materials:
Steel: 500
Glass: 200
# Parts
- type: latheRecipe
@@ -304,23 +146,6 @@
id: BorgModuleTool
result: BorgModuleTool
# Mining Modules
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleAppraisal
result: BorgModuleAppraisal
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleMining
result: BorgModuleMining
- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleGrapplingGun
result: BorgModuleGrapplingGun
# Engineering Modules
- type: latheRecipe
@@ -328,28 +153,8 @@
id: BorgModuleAdvancedTool
result: BorgModuleAdvancedTool
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleConstruction
result: BorgModuleConstruction
- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleRCD
result: BorgModuleRCD
# Janitor Modules
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleLightReplacer
result: BorgModuleLightReplacer
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleCleaning
result: BorgModuleCleaning
- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleAdvancedCleaning
@@ -357,16 +162,6 @@
# Medical Modules
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleDiagnosis
result: BorgModuleDiagnosis
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleTreatment
result: BorgModuleTreatment
- type: latheRecipe
parent: BaseGoldBorgModuleRecipe
id: BorgModuleAdvancedTreatment
@@ -391,16 +186,6 @@
# Service Modules
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleService
result: BorgModuleService
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleMusique
result: BorgModuleMusique
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleGardening
@@ -410,8 +195,3 @@
parent: BaseBorgModuleRecipe
id: BorgModuleHarvesting
result: BorgModuleHarvesting
- type: latheRecipe
parent: BaseBorgModuleRecipe
id: BorgModuleClowning
result: BorgModuleClowning

2
Resources/Prototypes/Recipes/Reactions/drinks.yml
View File

@@ -953,7 +953,7 @@
LemonLime:
amount: 1
products:
SnowWhite: 3
SnowWhite: 2
- type: reaction
id: SodaWater