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-06-11-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Changelog/Changelog.yml
#	Resources/Credits/GitHub.txt
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
This commit is contained in:
Ed
2024-11-06 16:53:24 +03:00
parent ae27cf7e08 24e6b9f42c
commit 955145a9a5
207 changed files with 2180 additions and 1314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Resources/Prototypes/Recipes/Construction/Graphs/structures/lighting.yml
View File

@@ -24,6 +24,14 @@
- material: Steel
amount: 1
doAfter: 2.0
- to: emergencyLight
steps:
- material: Steel
amount: 1
doAfter: 1.0
- material: Glass
amount: 1
doAfter: 1.0
- node: tubeLight
entity: PoweredlightEmpty
edges:
@@ -83,4 +91,19 @@
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 1
- !type:DeleteEntity {}
- !type:DeleteEntity {}
- node: emergencyLight
entity: EmergencyLight
edges:
- to: start
steps:
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
prototype: SheetGlass1
amount: 1
- !type:DeleteEntity {}

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

@@ -1456,6 +1456,24 @@
# Same here. - 20kdc
- !type:TileNotBlocked
- type: construction
name: emergency light
id: EmergencyLightFixture
graph: LightFixture
startNode: start
targetNode: emergencyLight
category: construction-category-structures
description: An emergency light.
icon:
sprite: Structures/Wallmounts/Lighting/emergency_light.rsi
state: base
objectType: Structure
placementMode: SnapgridCenter
canRotate: true
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: ground light post
id: LightGroundFixture

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

@@ -1779,6 +1779,67 @@
FoodOrange: 1
FoodAmbrosiaVulgaris: 1
# Muffins
- type: microwaveMealRecipe
id: RecipeMuffin
name: muffin recipe
result: FoodBakedMuffin
time: 15
solids:
FoodPlateMuffinTin: 1
FoodDoughSlice: 1
reagents:
Sugar: 10
- type: microwaveMealRecipe
id: RecipeMuffinChocolate
name: chocolate muffin recipe
result: FoodBakedMuffinChocolate
time: 15
solids:
FoodPlateMuffinTin: 1
FoodDoughSlice: 1
FoodSnackChocolateBar: 1
reagents:
Sugar: 10
- type: microwaveMealRecipe
id: RecipeMuffinBerry
name: berry muffin recipe
result: FoodBakedMuffinBerry
time: 15
solids:
FoodPlateMuffinTin: 1
FoodDoughSlice: 1
FoodBerries: 1
reagents:
Sugar: 10
- type: microwaveMealRecipe
id: RecipeMuffinBanana
name: banana muffin recipe
result: FoodBakedMuffinBanana
time: 15
solids:
FoodPlateMuffinTin: 1
FoodDoughSlice: 1
FoodBanana: 1
reagents:
Sugar: 10
- type: microwaveMealRecipe
id: RecipeMuffinCherry
name: cherry muffin recipe
result: FoodBakedMuffinCherry
time: 15
solids:
FoodPlateMuffinTin: 1
FoodDoughSlice: 1
FoodCherry: 3
reagents:
Sugar: 10
# NOT ACTUAL FOOD
- type: microwaveMealRecipe

2
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml
View File

@@ -8,6 +8,6 @@
steps:
- material: Cloth
amount: 2
doAfter: 10
doAfter: 3
- node: gauze
entity: Gauze1

4
Resources/Prototypes/Recipes/Crafting/Graphs/web.yml
View File

@@ -41,13 +41,13 @@
- material: WebSilk
amount: 12
doAfter: 6
- to: boots
steps:
- material: WebSilk
amount: 2
doAfter: 4
# Deconstruction
- node: tile
entity: FloorTileItemWeb

38
Resources/Prototypes/Recipes/Lathes/botany.yml
View File

@@ -1,39 +1,39 @@
# Base prototypes
- type: latheRecipe
id: MiniHoe
result: HydroponicsToolMiniHoe
completetime: 2
abstract: true
parent: BaseToolRecipe
id: BaseHydroToolRecipe
materials:
Steel: 200
Plastic: 100
# Recipes
- type: latheRecipe
parent: BaseHydroToolRecipe
id: HydroponicsToolMiniHoe
result: HydroponicsToolMiniHoe
- type: latheRecipe
parent: BaseHydroToolRecipe
id: HydroponicsToolScythe
result: HydroponicsToolScythe
completetime: 2
materials:
Steel: 300
Plastic: 200
- type: latheRecipe
parent: BaseHydroToolRecipe
id: HydroponicsToolHatchet
result: HydroponicsToolHatchet
completetime: 2
materials:
Steel: 200
Plastic: 100
- type: latheRecipe
id: Spade
parent: BaseHydroToolRecipe
id: HydroponicsToolSpade
result: HydroponicsToolSpade
completetime: 2
materials:
Steel: 200
Plastic: 100
- type: latheRecipe
id: Clippers
parent: BaseHydroToolRecipe
id: HydroponicsToolClippers
result: HydroponicsToolClippers
completetime: 2
materials:
Steel: 200
Plastic: 100

59
Resources/Prototypes/Recipes/Lathes/cooking.yml
View File

@@ -1,67 +1,65 @@
- type: latheRecipe
parent: BaseToolRecipe
id: ButchCleaver
result: ButchCleaver
completetime: 2
materials:
Steel: 300
Plastic: 50
- type: latheRecipe
parent: BaseToolRecipe
id: KitchenKnife
result: KitchenKnife
completetime: 2
materials:
Steel: 200
Plastic: 50
- type: latheRecipe
id: DrinkMug
result: DrinkMug
abstract: true
id: BaseGlasswareRecipe
completetime: 0.8
materials:
Glass: 100
- type: latheRecipe
parent: BaseGlasswareRecipe
id: DrinkMug
result: DrinkMug
- type: latheRecipe
parent: DrinkMug
id: DrinkMugMetal
result: DrinkMugMetal
completetime: 0.8
materials:
Steel: 100
- type: latheRecipe
parent: DrinkMug
id: DrinkGlass
result: DrinkGlass
completetime: 0.8
materials:
Glass: 100
- type: latheRecipe
parent: DrinkMug
id: DrinkShotGlass
result: DrinkShotGlass
completetime: 0.4
materials:
Glass: 100
- type: latheRecipe
parent: DrinkMug
id: DrinkGlassCoupeShaped
result: DrinkGlassCoupeShaped
completetime: 0.8
materials:
Glass: 100
- type: latheRecipe
id: CustomDrinkJug
result: CustomDrinkJug
completetime: 2
materials:
Plastic: 200
- type: latheRecipe
id: CustomDrinkJug
result: CustomDrinkJug
completetime: 2
materials:
Plastic: 200
- type: latheRecipe
parent: BaseGlasswareRecipe
id: FoodPlate
result: FoodPlate
completetime: 0.8
materials:
Glass: 100
- type: latheRecipe
id: FoodPlateSmall
@@ -71,25 +69,23 @@
Glass: 50
- type: latheRecipe
parent: FoodPlate
id: FoodPlatePlastic
result: FoodPlatePlastic
completetime: 0.8
materials:
Plastic: 100
- type: latheRecipe
parent: FoodPlateSmall
id: FoodPlateSmallPlastic
result: FoodPlateSmallPlastic
completetime: 0.4
materials:
Plastic: 50
- type: latheRecipe
parent: FoodPlate
id: FoodBowlBig
result: FoodBowlBig
completetime: 0.8
materials:
Glass: 100
- type: latheRecipe
id: FoodPlateTin
@@ -98,6 +94,13 @@
materials:
Steel: 100
- type: latheRecipe
parent: FoodPlateTin
id: FoodPlateMuffinTin
result: FoodPlateMuffinTin
materials:
Steel: 50
- type: latheRecipe
id: FoodKebabSkewer
result: FoodKebabSkewer

82
Resources/Prototypes/Recipes/Lathes/medical.yml
View File

@@ -1,51 +1,46 @@
# Base prototypes
- type: latheRecipe
abstract: true
parent: BaseToolRecipe
id: BaseSurgicalRecipe
materials:
Steel: 200
# Recipes
- type: latheRecipe
parent: BaseSurgicalRecipe
id: Scalpel
result: Scalpel
category: Tools
completetime: 2
materials:
Steel: 200
- type: latheRecipe
parent: BaseSurgicalRecipe
id: Retractor
result: Retractor
category: Tools
completetime: 2
materials:
Steel: 200
- type: latheRecipe
parent: BaseSurgicalRecipe
id: Cautery
result: Cautery
category: Tools
completetime: 2
materials:
Steel: 200
- type: latheRecipe
parent: BaseToolRecipe
id: Drill
result: Drill
category: Tools
completetime: 2
materials:
Steel: 200
Plastic: 100
- type: latheRecipe
parent: BaseSurgicalRecipe
id: Saw
result: Saw
category: Tools
completetime: 2
materials:
Steel: 200
- type: latheRecipe
parent: BaseSurgicalRecipe
id: Hemostat
result: Hemostat
category: Tools
completetime: 2
materials:
Steel: 200
- type: latheRecipe
id: BodyBag
@@ -75,7 +70,7 @@
result: Gauze1
completetime: 1
materials:
Cloth: 200
Cloth: 100 # lathe more efficient than handcrafting
- type: latheRecipe
id: HandheldHealthAnalyzer
@@ -140,66 +135,51 @@
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitBurn
result: MedkitBurn
name: lathe-recipe-MedkitBurn-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitToxin
result: MedkitToxin
name: lathe-recipe-MedkitToxin-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitO2
result: MedkitO2
name: lathe-recipe-MedkitO2-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitBrute
result: MedkitBrute
name: lathe-recipe-MedkitBrute-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitAdvanced
result: MedkitAdvanced
name: lathe-recipe-MedkitAdvanced-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitRadiation
result: MedkitRadiation
name: lathe-recipe-MedkitRadiation-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: Medkit
id: MedkitCombat
result: MedkitCombat
name: lathe-recipe-MedkitCombat-name
completetime: 2
materials:
Plastic: 300
- type: latheRecipe
parent: BaseToolRecipe
id: HandLabeler
result: HandLabeler
category: Tools
completetime: 2
materials:
Plastic: 100
@@ -219,20 +199,14 @@
Plastic: 300
- type: latheRecipe
parent: RollerBedSpawnFolded
id: CheapRollerBedSpawnFolded
result: CheapRollerBedSpawnFolded
completetime: 1
materials:
Steel: 600
Plastic: 300
- type: latheRecipe
parent: RollerBedSpawnFolded
id: EmergencyRollerBedSpawnFolded
result: EmergencyRollerBedSpawnFolded
completetime: 1
materials:
Steel: 600
Plastic: 300
- type: latheRecipe
id: WhiteCane

120
Resources/Prototypes/Recipes/Lathes/tools.yml
View File

@@ -1,40 +1,51 @@
# Base prototypes
- type: latheRecipe
abstract: true
id: BaseToolRecipe
category: Tools
completetime: 2
materials:
Steel: 200
Plastic: 50
- type: latheRecipe
abstract: true
parent: BaseToolRecipe
id: BaseBigToolRecipe
materials:
Steel: 800
Glass: 300
# Recipes
- type: latheRecipe
parent: BaseToolRecipe
id: Wirecutter
result: Wirecutter
icon:
sprite: Objects/Tools/wirecutters.rsi
state: cutters-map
result: Wirecutter
category: Tools
completetime: 2
materials:
Steel: 200
Plastic: 50
- type: latheRecipe
parent: BaseToolRecipe
id: Screwdriver
result: Screwdriver
icon:
sprite: Objects/Tools/screwdriver.rsi
state: screwdriver-map
result: Screwdriver
category: Tools
completetime: 2
materials:
Steel: 200
Plastic: 50
- type: latheRecipe
parent: BaseToolRecipe
id: Welder
result: Welder
category: Tools
completetime: 2
materials:
Steel: 400
- type: latheRecipe
parent: BaseToolRecipe
id: Wrench
result: Wrench
category: Tools
completetime: 2
materials:
Steel: 200
@@ -42,155 +53,122 @@
id: CableStack
result: CableApcStack1
category: Parts
completetime: 2
completetime: 0.1
materials:
Steel: 30
- type: latheRecipe
parent: CableStack
id: CableMVStack
result: CableMVStack1
category: Parts
completetime: 2
materials:
Steel: 30
- type: latheRecipe
parent: CableStack
id: CableHVStack
result: CableHVStack1
category: Parts
completetime: 2
materials:
Steel: 30
- type: latheRecipe
parent: BaseToolRecipe
id: CrowbarGreen
result: CrowbarGreen
category: Tools
completetime: 2
materials:
Steel: 200
- type: latheRecipe
parent: BaseToolRecipe
id: Pickaxe
result: Pickaxe
category: Tools
completetime: 4
materials:
Steel: 1000
Wood: 500
- type: latheRecipe
parent: BaseToolRecipe
id: Shovel
result: Shovel
category: Tools
completetime: 2
materials:
Steel: 200
Wood: 100
- type: latheRecipe
parent: BaseToolRecipe
id: Multitool
result: Multitool
category: Tools
completetime: 2
materials:
Steel: 200
Plastic: 200
- type: latheRecipe
parent: Multitool
id: NetworkConfigurator
result: NetworkConfigurator
category: Tools
completetime: 2
materials:
Steel: 200
Plastic: 200
- type: latheRecipe
parent: BaseToolRecipe
id: PowerDrill
result: PowerDrill
category: Tools
completetime: 2
materials:
Steel: 600
Plastic: 200
- type: latheRecipe
parent: BaseToolRecipe
id: RCD
result: RCDEmpty
category: Tools
completetime: 4
materials:
Steel: 1000
Plastic: 300
- type: latheRecipe
parent: BaseToolRecipe
id: RCDAmmo
result: RCDAmmo
category: Tools
completetime: 2.4
materials:
Steel: 500
Plastic: 250
- type: latheRecipe
parent: BaseBigToolRecipe
id: HandHeldMassScanner
result: HandHeldMassScannerEmpty
category: Tools
completetime: 2
materials:
Steel: 800
Glass: 300
- type: latheRecipe
parent: BaseBigToolRecipe
id: HandheldGPSBasic
result: HandheldGPSBasic
category: Tools
completetime: 2
materials:
Steel: 800
Glass: 300
- type: latheRecipe
parent: BaseBigToolRecipe
id: TRayScanner
result: trayScanner
category: Tools
completetime: 2
materials:
Steel: 800
Glass: 300
- type: latheRecipe
parent: BaseBigToolRecipe
id: GasAnalyzer
result: GasAnalyzer
category: Tools
completetime: 2
materials:
Steel: 800
Glass: 300
- type: latheRecipe
parent: BaseToolRecipe
id: SprayPainter
result: SprayPainter
category: Tools
completetime: 2
materials:
Steel: 300
Plastic: 100
- type: latheRecipe
parent: BaseToolRecipe
id: UtilityBelt
result: ClothingBeltUtility
category: Tools
completetime: 2
materials:
Cloth: 100
Steel: 50
- type: latheRecipe
parent: BaseToolRecipe
id: HolofanProjector
result: HolofanProjectorEmpty
category: Tools
completetime: 8
materials:
Steel: 300
@@ -198,18 +176,18 @@
Plastic: 50
- type: latheRecipe
parent: BaseToolRecipe
id: WelderExperimental
result: WelderExperimental
category: Tools
completetime: 6
materials:
Steel: 800
Plasma: 200
- type: latheRecipe
parent: BaseToolRecipe
id: JawsOfLife
result: JawsOfLife
category: Tools
completetime: 6
materials:
Steel: 1000
@@ -218,9 +196,9 @@
Gold: 50
- type: latheRecipe
parent: BaseToolRecipe
id: HoloprojectorField
result: HoloprojectorFieldEmpty
category: Tools
completetime: 3
materials:
Steel: 500
@@ -228,9 +206,9 @@
Glass: 100
- type: latheRecipe
parent: BaseToolRecipe
id: WeaponParticleDecelerator
result: WeaponParticleDecelerator
category: Tools
completetime: 6
materials:
Steel: 750