Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238)

Browse Source 
* Prototype that's mostly borked rather than completely borked

* ECS inserting mats

* Partial ECS mostly done, needs cleanup and visualizer

* Replace timers

* Power visualizes at least

* First ""working"" version

* Clean up all lathes

* Colors

* Fix animation timing

* Fixes greyscale, adds a bunch of colors

* Give every (used) material a color

* Made most lathes take long enough you can at least see there's some sort of animation

* Insertion feedback popup

* Sound for circuit printer and uniform printer

* Fix queueing, optimize update

* Remove mono crash

* cleanup

* Fix test failure

* Techfab inserting sprite

* Cleanup and commenting

* Fix bug in CanProduce check

* Fix UI resolves

* Mirror review stuff
This commit is contained in:
Rane
2022-04-17 03:34:14 -04:00
committed by GitHub
parent 5f9cb8271d
commit 93cdca4f82
70 changed files with 781 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,14 +9,18 @@
netsync: false
layers:
- state: icon
map: ["enum.AutolatheVisualLayers.Base"]
map: ["enum.LatheVisualLayers.IsRunning"]
- state: unlit
shader: unshaded
map: ["enum.AutolatheVisualLayers.BaseUnlit"]
- state: building
map: ["enum.AutolatheVisualLayers.AnimationLayer"]
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: inserting
map: ["enum.LatheVisualLayers.IsInserting"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Appearance
- type: LatheVisuals
idleState: icon
runningState: building
- type: Physics
bodyType: Static
- type: Fixtures
@@ -66,10 +70,6 @@
- CableStack
- HandheldGPSBasic
- HandheldHealthAnalyzer
- type: Appearance
visuals:
- type: AutolatheVisualizer
- type: WiresVisualizer
- type: ActivatableUI
key: enum.LatheUiKey.Key
- type: ActivatableUIRequiresPower
@@ -93,14 +93,18 @@
netsync: false
layers:
- state: icon
map: ["enum.ProtolatheVisualLayers.Base"]
map: ["enum.LatheVisualLayers.IsRunning"]
- state: unlit
shader: unshaded
map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
- state: building
map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: inserting
map: ["enum.LatheVisualLayers.IsInserting"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: Appearance
- type: LatheVisuals
idleState: icon
runningState: building
- type: Physics
bodyType: Static
- type: Fixtures
@@ -196,10 +200,6 @@
type: LatheBoundUserInterface
- key: enum.ResearchClientUiKey.Key
type: ResearchClientBoundUserInterface
- type: Appearance
visuals:
- type: ProtolatheVisualizer
- type: WiresVisualizer
- type: Transform
anchored: true
- type: Pullable
@@ -216,12 +216,10 @@
sprite: Structures/Machines/circuit_imprinter.rsi
layers:
- state: icon
map: ["enum.ProtolatheVisualLayers.Base"]
map: ["enum.LatheVisualLayers.IsRunning"]
- state: unlit
shader: unshaded
map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
- state: building
map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
- type: ProtolatheDatabase
@@ -248,6 +246,8 @@
- StasisBedMachineCircuitboard
- type: Machine
board: CircuitImprinterMachineCircuitboard
- type: Lathe
producingSound: /Audio/Machines/circuitprinter.ogg
- type: entity
parent: Protolathe
@@ -260,14 +260,16 @@
sprite: Structures/Machines/security_techfab.rsi
layers:
- state: icon
map: ["enum.ProtolatheVisualLayers.Base"]
map: ["enum.LatheVisualLayers.IsRunning"]
- state: unlit
shader: unshaded
map: ["enum.ProtolatheVisualLayers.BaseUnlit"]
- state: icon
map: ["enum.ProtolatheVisualLayers.AnimationLayer"]
map: ["enum.PowerDeviceVisualLayers.Powered"]
- state: inserting
map: ["enum.LatheVisualLayers.IsInserting"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
idleState: icon
runningState: icon
- type: ProtolatheDatabase
protolatherecipes:
- Flash
@@ -375,13 +377,8 @@
netsync: false
layers:
- state: icon
map: ["enum.AutolatheVisualLayers.Base"]
- state: unlit
shader: unshaded
map: ["enum.AutolatheVisualLayers.BaseUnlit"]
- state: building
map: ["enum.AutolatheVisualLayers.AnimationLayer"]
- state: panel
map: ["enum.WiresVisualLayers.MaintenancePanel"]
map: ["enum.LatheVisualLayers.IsRunning"]
- type: Machine
board: UniformPrinterMachineCircuitboard
- type: Lathe
producingSound: /Audio/Machines/uniformprinter.ogg

6
Resources/Prototypes/Reagents/Materials/glass.yml
View File

@@ -3,33 +3,39 @@
stack: Glass
name: glass
icon: Objects/Materials/Sheets/glass.rsi/glass.png
color: "#a8ccd7"
- type: material
id: ReinforcedGlass
stack: ReinforcedGlass
name: reinforced glass
icon: Objects/Materials/Sheets/glass.rsi/rglass.png
color: "#549bb0"
- type: material
id: PlasmaGlass
stack: PlasmaGlass
name: plasma glass
icon: Objects/Materials/Sheets/glass.rsi/pglass.png
color: "#b35989"
- type: material
id: ReinforcedPlasmaGlass
stack: ReinforcedPlasmaGlass
name: reinforced plasma glass
icon: Objects/Materials/Sheets/glass.rsi/rpglass.png
color: "#8c4069"
- type: material
id: TitaniumGlass
stack: TitaniumGlass
name: titanium glass
icon: Objects/Materials/Sheets/glass.rsi/titaniumglass.png
color: "#333135"
- type: material
id: PlastitaniumGlass
stack: PlastitaniumGlass
name: plastitanium glass
icon: Objects/Materials/Sheets/glass.rsi/plastitaniumglass.png
color: "#232127"

6
Resources/Prototypes/Reagents/Materials/materials.yml
View File

@@ -4,33 +4,39 @@
stack: Cloth
name: cloth
icon: /Textures/Objects/Materials/materials.rsi/cloth.png
color: "#e7e7de"
- type: material
id: Durathread
stack: Durathread
name: durathread
icon: /Textures/Objects/Materials/materials.rsi/durathread.png
color: "#8291a1"
- type: material
id: Plasma
stack: Plasma
name: plasma
icon: Objects/Materials/Sheets/other.rsi/plasma.png
color: "#7e009e"
- type: material
id: Phoron
stack: Phoron
name: phoron
icon: Objects/Materials/Sheets/other.rsi/phoron.png
color: "#FF3300"
- type: material
id: Plastic
stack: Plastic
name: plastic
icon: Objects/Materials/Sheets/other.rsi/plastic.png
color: "#d9d9d9"
- type: material
id: Wood
stack: WoodPlank
name: wood
icon: Objects/Materials/materials.rsi/wood.png
color: "#966F33"

10
Resources/Prototypes/Reagents/Materials/metals.yml
View File

@@ -9,18 +9,21 @@
stack: Adamantine
name: adamantine
icon: Objects/Materials/ingots.rsi/adamantine.png
color: "#7dc37f"
- type: material
id: Copper
stack: Copper
name: copper
icon: Objects/Materials/ingots.rsi/copper.png
color: "#B87333"
- type: material
id: Gold
stack: Gold
name: gold
icon: Objects/Materials/ingots.rsi/gold.png
color: "#FFD700"
- type: material
id: Hydrogen
@@ -32,34 +35,39 @@
id: Iron
stack: Iron
name: iron
icon: Objects/Materials/ingots.rsi/iron.png
icon: Objects/Materials/ingots.rsi/iron.png #Do we even distinguish between steel and iron?
- type: material
id: Silver
stack: Silver
name: silver
icon: Objects/Materials/ingots.rsi/silver.png
color: "#C0C0C0"
- type: material
id: Plasteel
stack: Plasteel
name: plasteel
icon: Objects/Materials/Sheets/metal.rsi/plasteel.png
color: "#696969" #Okay, this is epic
- type: material
id: Brass
stack: Brass
name: brass
icon: Objects/Materials/Sheets/metal.rsi/brass.png
color: "#E1C16E"
- type: material
id: Titanium
stack: Titanium
name: titanium
icon: Objects/Materials/Sheets/metal.rsi/titanium.png
color: "#878681"
- type: material
id: Plastitanium
stack: Plastitanium
name: plastitanium
icon: Objects/Materials/Sheets/metal.rsi/plastitanium.png
color: "#4e4e4b"

10
Resources/Prototypes/Recipes/Lathes/Parts.yml
View File

@@ -2,7 +2,7 @@
id: CapacitorStockPart
icon: Objects/Misc/stock_parts.rsi/capacitor.png
result: CapacitorStockPart
completetime: 250
completetime: 1
materials:
Steel: 50
Plastic: 50
@@ -11,7 +11,7 @@
id: MatterBinStockPart
icon: Objects/Misc/stock_parts.rsi/matter_bin.png
result: MatterBinStockPart
completetime: 250
completetime: 1
materials:
Steel: 50
Plastic: 50
@@ -20,7 +20,7 @@
id: MicroLaserStockPart
icon: Objects/Misc/stock_parts.rsi/micro_laser.png
result: MicroLaserStockPart
completetime: 250
completetime: 1
materials:
Steel: 50
Glass: 50
@@ -30,7 +30,7 @@
id: MicroManipulatorStockPart
icon: Objects/Misc/stock_parts.rsi/micro_mani.png
result: MicroManipulatorStockPart
completetime: 250
completetime: 1
materials:
Steel: 50
Plastic: 50
@@ -39,7 +39,7 @@
id: ScanningModuleStockPart
icon: Objects/Misc/stock_parts.rsi/scan_module_static.png
result: ScanningModuleStockPart
completetime: 250
completetime: 1
materials:
Steel: 50
Glass: 50

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

@@ -4,7 +4,7 @@
sprite: Objects/Tools/Hydroponics/hoe.rsi
state: icon
result: HydroponicsToolMiniHoe
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 100
@@ -15,7 +15,7 @@
sprite: Objects/Tools/Hydroponics/scythe.rsi
state: icon
result: HydroponicsToolScythe
completetime: 500
completetime: 2
materials:
Steel: 300
Plastic: 200
@@ -26,7 +26,7 @@
sprite: Objects/Tools/Hydroponics/hatchet.rsi
state: icon
result: HydroponicsToolHatchet
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 100
@@ -37,7 +37,7 @@
sprite: Objects/Tools/Hydroponics/spade.rsi
state: icon
result: HydroponicsToolSpade
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 100

2
Resources/Prototypes/Recipes/Lathes/cargo.yml
View File

@@ -4,7 +4,7 @@
sprite: Structures/conveyor.rsi
state: conveyor_loose
result: ConveyorBeltAssembly
completetime: 1000
completetime: 4
materials:
Steel: 500
Plastic: 50

14
Resources/Prototypes/Recipes/Lathes/chemistry.yml
View File

@@ -4,7 +4,7 @@
sprite: Objects/Specific/Chemistry/beaker.rsi
state: beaker
result: Beaker
completetime: 500
completetime: 2
materials:
Glass: 100
@@ -14,7 +14,7 @@
sprite: Objects/Specific/Chemistry/beaker_large.rsi
state: beakerlarge
result: LargeBeaker
completetime: 500
completetime: 2
materials:
Glass: 200
@@ -24,18 +24,18 @@
sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi
state: beakernoreact
result: CryostasisBeaker
completetime: 500
completetime: 2
materials:
Steel: 250
Plastic: 50
- type: latheRecipe
id: Dropper
icon:
sprite: Objects/Specific/Chemistry/dropper.rsi
state: dropper
result: Dropper
completetime: 500
completetime: 2
materials:
Glass: 200
Plastic: 100
@@ -46,7 +46,7 @@
sprite: Objects/Specific/Chemistry/syringe.rsi
state: syringe_base0
result: Syringe
completetime: 500
completetime: 2
materials:
Plastic: 100
Steel: 25
@@ -55,6 +55,6 @@
id: PillCanister
icon: Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png
result: PillCanister
completetime: 500
completetime: 2
materials:
Plastic: 100

108
Resources/Prototypes/Recipes/Lathes/clothing.yml
View File

@@ -6,7 +6,7 @@
sprite: Clothing/Uniforms/Jumpsuit/Color/grey.rsi
state: icon
result: ClothingUniformJumpsuitColorGrey
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -16,7 +16,7 @@
sprite: Clothing/Uniforms/Jumpskirt/Color/grey.rsi
state: icon
result: ClothingUniformJumpskirtColorGrey
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -26,7 +26,7 @@
sprite: Clothing/Uniforms/Jumpsuit/bartender.rsi
state: icon
result: ClothingUniformJumpsuitBartender
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -36,7 +36,7 @@
sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
state: icon
result: ClothingUniformJumpskirtBartender
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -46,7 +46,7 @@
sprite: Clothing/Uniforms/Jumpsuit/captain.rsi
state: icon
result: ClothingUniformJumpsuitCaptain
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -57,7 +57,7 @@
sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
state: icon
result: ClothingUniformJumpskirtCaptain
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -68,7 +68,7 @@
sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi
state: icon
result: ClothingUniformJumpsuitCargo
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -78,7 +78,7 @@
sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi
state: icon
result: ClothingUniformJumpskirtCargo
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -88,7 +88,7 @@
sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi
state: icon
result: ClothingUniformJumpsuitSalvageSpecialist
completetime: 800
completetime: 4
materials:
Cloth: 500 #It's armored but I don't want to include durathread for a non-head
@@ -98,7 +98,7 @@
sprite: Clothing/Uniforms/Jumpsuit/ce.rsi
state: icon
result: ClothingUniformJumpsuitChiefEngineer
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -109,7 +109,7 @@
sprite: Clothing/Uniforms/Jumpskirt/ce.rsi
state: icon
result: ClothingUniformJumpskirtChiefEngineer
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -120,7 +120,7 @@
sprite: Clothing/Uniforms/Jumpsuit/chaplain.rsi
state: icon
result: ClothingUniformJumpsuitChaplain
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -130,7 +130,7 @@
sprite: Clothing/Uniforms/Jumpskirt/chaplain.rsi
state: icon
result: ClothingUniformJumpskirtChaplain
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -140,7 +140,7 @@
sprite: Clothing/Uniforms/Jumpsuit/chef.rsi
state: icon
result: ClothingUniformJumpsuitChef
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -150,7 +150,7 @@
sprite: Clothing/Uniforms/Jumpskirt/chef.rsi
state: icon
result: ClothingUniformJumpskirtChef
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -160,7 +160,7 @@
sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi
state: icon
result: ClothingUniformJumpsuitChemistry
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -170,7 +170,7 @@
sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi
state: icon
result: ClothingUniformJumpskirtChemistry
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -180,7 +180,7 @@
sprite: Clothing/Uniforms/Jumpsuit/clown.rsi
state: icon
result: ClothingUniformJumpsuitClown
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -190,7 +190,7 @@
sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi
state: icon
result: ClothingUniformJumpsuitCMO
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -201,7 +201,7 @@
sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi
state: icon
result: ClothingUniformJumpskirtCMO
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -212,7 +212,7 @@
sprite: Clothing/Uniforms/Jumpsuit/detective.rsi
state: icon
result: ClothingUniformJumpsuitDetective
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -222,7 +222,7 @@
sprite: Clothing/Uniforms/Jumpskirt/detective.rsi
state: icon
result: ClothingUniformJumpskirtDetective
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -232,7 +232,7 @@
sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi
state: icon
result: ClothingUniformJumpsuitEngineering
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -242,7 +242,7 @@
sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi
state: icon
result: ClothingUniformJumpskirtEngineering
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -252,7 +252,7 @@
sprite: Clothing/Uniforms/Jumpsuit/hop.rsi
state: icon
result: ClothingUniformJumpsuitHoP
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -263,7 +263,7 @@
sprite: Clothing/Uniforms/Jumpskirt/hop.rsi
state: icon
result: ClothingUniformJumpskirtHoP
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -274,7 +274,7 @@
sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
state: icon
result: ClothingUniformJumpsuitHoS
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -285,7 +285,7 @@
sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
state: icon
result: ClothingUniformJumpskirtHoS
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -296,7 +296,7 @@
sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
state: icon
result: ClothingUniformJumpsuitHydroponics
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -306,7 +306,7 @@
sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
state: icon
result: ClothingUniformJumpskirtHydroponics
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -316,7 +316,7 @@
sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi
state: icon
result: ClothingUniformJumpsuitJanitor
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -326,7 +326,7 @@
sprite: Clothing/Uniforms/Jumpskirt/janitor.rsi
state: icon
result: ClothingUniformJumpskirtJanitor
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -336,7 +336,7 @@
sprite: Clothing/Uniforms/Jumpsuit/lawyerblack.rsi
state: icon
result: ClothingUniformJumpsuitLawyerBlack
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -346,7 +346,7 @@
sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi
state: icon
result: ClothingUniformJumpsuitLibrarian
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -356,7 +356,7 @@
sprite: Clothing/Uniforms/Jumpskirt/Color/lightbrown.rsi
state: icon
result: ClothingUniformJumpskirtColorLightBrown
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -366,7 +366,7 @@
sprite: Clothing/Uniforms/Jumpsuit/medical.rsi
state: icon
result: ClothingUniformJumpsuitMedicalDoctor
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -376,7 +376,7 @@
sprite: Clothing/Uniforms/Jumpskirt/medical.rsi
state: icon
result: ClothingUniformJumpskirtMedicalDoctor
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -386,7 +386,7 @@
sprite: Clothing/Uniforms/Jumpsuit/mime.rsi
state: icon
result: ClothingUniformJumpsuitMime
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -396,7 +396,7 @@
sprite: Clothing/Uniforms/Jumpskirt/mime.rsi
state: icon
result: ClothingUniformJumpskirtMime
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -406,7 +406,7 @@
sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi
state: icon
result: ClothingUniformJumpsuitLawyerPurple
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -416,7 +416,7 @@
sprite: Clothing/Uniforms/Jumpsuit/paramedic.rsi
state: icon
result: ClothingUniformJumpsuitParamedic
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -426,7 +426,7 @@
sprite: Clothing/Uniforms/Jumpskirt/paramedic.rsi
state: icon
result: ClothingUniformJumpskirtParamedic
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -436,7 +436,7 @@
sprite: Clothing/Uniforms/Jumpsuit/prisoner.rsi
state: icon
result: ClothingUniformJumpsuitPrisoner
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -446,7 +446,7 @@
sprite: Clothing/Uniforms/Jumpskirt/prisoner.rsi
state: icon
result: ClothingUniformJumpskirtPrisoner
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -456,7 +456,7 @@
sprite: Clothing/Uniforms/Jumpsuit/qm.rsi
state: icon
result: ClothingUniformJumpsuitQM
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -466,7 +466,7 @@
sprite: Clothing/Uniforms/Jumpskirt/qm.rsi
state: icon
result: ClothingUniformJumpskirtQM
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -476,7 +476,7 @@
sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi
state: icon
result: ClothingUniformJumpsuitResearchDirector
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -487,7 +487,7 @@
sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi
state: icon
result: ClothingUniformJumpskirtResearchDirector
completetime: 800
completetime: 4
materials:
Cloth: 300
Durathread: 100
@@ -498,7 +498,7 @@
sprite: Clothing/Uniforms/Jumpsuit/scientist.rsi
state: icon
result: ClothingUniformJumpsuitScientist
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -508,7 +508,7 @@
sprite: Clothing/Uniforms/Jumpskirt/scientist.rsi
state: icon
result: ClothingUniformJumpskirtScientist
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -518,7 +518,7 @@
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
state: icon
result: ClothingUniformJumpsuitSec
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -528,7 +528,7 @@
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
state: icon
result: ClothingUniformJumpskirtSec
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -538,7 +538,7 @@
sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
state: icon
result: ClothingUniformJumpsuitWarden
completetime: 800
completetime: 4
materials:
Cloth: 300
@@ -548,7 +548,7 @@
sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
state: icon
result: ClothingUniformJumpskirtWarden
completetime: 800
completetime: 4
materials:
Cloth: 300

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

@@ -1,10 +1,10 @@
- type: latheRecipe
id: ButchCleaver
icon:
icon:
sprite: Objects/Weapons/Melee/cleaver.rsi
state: butch
result: ButchCleaver
completetime: 500
completetime: 2
materials:
Steel: 300
Plastic: 50
@@ -14,8 +14,8 @@
icon:
sprite: Objects/Weapons/Melee/kitchen_knife.rsi
state: icon
result: KitchenKnife
completetime: 500
result: KitchenKnife
completetime: 2
materials:
Steel: 200
Plastic: 50
@@ -24,7 +24,7 @@
id: DrinkMug
icon: Objects/Consumable/Drinks/mug.rsi
result: DrinkMug
completetime: 200
completetime: 0.8
materials:
Glass: 50
@@ -32,7 +32,7 @@
id: DrinkMugMetal
icon: Objects/Consumable/Drinks/mug_metal.rsi
result: DrinkMugMetal
completetime: 200
completetime: 0.8
materials:
Steel: 50
@@ -40,6 +40,6 @@
id: DrinkGlass
icon: Objects/Consumable/Drinks/glass_clear.rsi
result: DrinkGlass
completetime: 200
completetime: 0.8
materials:
Glass: 50

58
Resources/Prototypes/Recipes/Lathes/electronics.yml
View File

@@ -2,7 +2,7 @@
id: FirelockElectronics
icon: Objects/Misc/module.rsi/mainboard.png
result: FirelockElectronics
completetime: 500
completetime: 2
materials:
Steel: 50
Plastic: 50
@@ -11,7 +11,7 @@
id: DoorElectronics
icon: Objects/Misc/module.rsi/door_electronics.png
result: DoorElectronics
completetime: 500
completetime: 2
materials:
Steel: 50
Plastic: 50
@@ -20,7 +20,7 @@
id: AirAlarmElectronics
icon: Objects/Misc/module.rsi/airalarm_electronics.png
result: AirAlarmElectronics
completetime: 500
completetime: 2
materials:
Steel: 50
Plastic: 50
@@ -29,7 +29,7 @@
id: FireAlarmElectronics
icon: Objects/Misc/module.rsi/door_electronics.png
result: FireAlarmElectronics
completetime: 500
completetime: 2
materials:
Steel: 50
Plastic: 50
@@ -38,7 +38,7 @@
id: CloningPodMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: CloningPodMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -48,7 +48,7 @@
id: ThermomachineFreezerMachineCircuitBoard
icon: Objects/Misc/module.rsi/id_mod.png
result: ThermomachineFreezerMachineCircuitBoard
completetime: 1000
completetime: 4
materials:
Steel: 150
Glass: 900
@@ -58,7 +58,7 @@
id: MedicalScannerMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: MedicalScannerMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -67,7 +67,7 @@
id: ChemMasterMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: ChemMasterMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -76,7 +76,7 @@
id: ChemDispenserMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: ChemDispenserMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -86,7 +86,7 @@
id: HydroponicsTrayMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: HydroponicsTrayMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -95,7 +95,7 @@
id: AutolatheMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: AutolatheMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -104,7 +104,7 @@
id: ProtolatheMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: ProtolatheMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -113,7 +113,7 @@
id: CircuitImprinterMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: CircuitImprinterMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -122,7 +122,7 @@
id: UniformPrinterMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: UniformPrinterMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -131,7 +131,7 @@
id: VaccinatorMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: VaccinatorMachineCircuitboard
completetime: 100
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -141,7 +141,7 @@
id: DiagnoserMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: DiagnoserMachineCircuitboard
completetime: 100
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -152,7 +152,7 @@
id: ReagentGrinderMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: ReagentGrinderMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -161,7 +161,7 @@
id: CrewMonitoringComputerCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: CrewMonitoringComputerCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -170,7 +170,7 @@
id: ShuttleConsoleCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: ShuttleConsoleCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -180,7 +180,7 @@
id: DawInstrumentMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: DawInstrumentMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -199,7 +199,7 @@
id: APCElectronics
icon: Objects/Misc/module.rsi/charger_APC.png
result: APCElectronics
completetime: 500
completetime: 2
materials:
Steel: 50
Glass: 100
@@ -208,7 +208,7 @@
id: SubstationMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: SubstationMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 50
Glass: 450
@@ -217,7 +217,7 @@
id: WallmountSubstationElectronics
icon: Objects/Misc/module.rsi/id_mod.png
result: WallmountSubstationElectronics
completetime: 1000
completetime: 4
materials:
Steel: 50
Glass: 350
@@ -226,7 +226,7 @@
id: SMESMachineCircuitboard
icon: Objects/Misc/module.rsi/power_mod.png
result: SMESMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900
@@ -235,7 +235,7 @@
id: GeneratorPlasmaMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: GeneratorPlasmaMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 50
Glass: 350
@@ -244,7 +244,7 @@
id: GeneratorUraniumMachineCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: GeneratorUraniumMachineCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 50
Glass: 350
@@ -253,7 +253,7 @@
id: WallmountGeneratorElectronics
icon: Objects/Misc/module.rsi/id_mod.png
result: WallmountGeneratorElectronics
completetime: 1000
completetime: 4
materials:
Steel: 50
Glass: 350
@@ -262,7 +262,7 @@
id: WallmountGeneratorAPUElectronics
icon: Objects/Misc/module.rsi/id_mod.png
result: WallmountGeneratorAPUElectronics
completetime: 1000
completetime: 4
materials:
Steel: 50
Glass: 350
@@ -271,7 +271,7 @@
id: SolarControlComputerCircuitboard
icon: Objects/Misc/module.rsi/id_mod.png
result: SolarControlComputerCircuitboard
completetime: 1000
completetime: 4
materials:
Steel: 100
Glass: 900

16
Resources/Prototypes/Recipes/Lathes/janitorial.yml
View File

@@ -1,10 +1,10 @@
- type: latheRecipe
id: MopItem
icon:
icon:
sprite: Objects/Specific/Janitorial/mop.rsi
state: mop
result: MopItem
completetime: 500
completetime: 2
materials:
Plastic: 100
@@ -12,7 +12,7 @@
id: MopBucket
icon: Objects/Specific/Janitorial/janitorial.rsi
result: MopBucket
completetime: 500
completetime: 2
materials:
Steel: 100
Plastic: 100
@@ -23,7 +23,7 @@
sprite: Objects/Tools/bucket.rsi
state: icon
result: Bucket
completetime: 500
completetime: 2
materials:
Steel: 100
@@ -31,7 +31,7 @@
id: WetFloorSign
icon: Objects/Specific/Janitorial/wet_floor_sign.rsi
result: WetFloorSign
completetime: 500
completetime: 2
materials:
Plastic: 100
@@ -41,7 +41,7 @@
sprite: Objects/Specific/Janitorial/janitorial.rsi
state: cleaner
result: SprayBottle
completetime: 500
completetime: 2
materials:
Plastic: 100
@@ -49,7 +49,7 @@
id: TrashBag
icon: Objects/Specific/Janitorial/trashbag.rsi
result: TrashBag
completetime: 300
completetime: 1.2
materials:
Plastic: 100
@@ -57,7 +57,7 @@
id: LightReplacer
icon: Objects/Specific/Janitorial/light_replacer.rsi
result: LightReplacer
completetime: 600
completetime: 2.4
materials:
Steel: 100
Glass: 1000

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

@@ -2,7 +2,7 @@
id: Scalpel
icon: Objects/Specific/Medical/Surgery/scalpel.rsi/scalpel.png
result: Scalpel
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -10,7 +10,7 @@
id: Retractor
icon: Objects/Specific/Medical/Surgery/scissors.rsi/retractor.png
result: Scalpel
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -18,7 +18,7 @@
id: Cautery
icon: Objects/Specific/Medical/Surgery/cautery.rsi/cautery.png
result: Cautery
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -26,7 +26,7 @@
id: Drill
icon: Objects/Specific/Medical/Surgery/drill.rsi/drill.png
result: Drill
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 100
@@ -35,7 +35,7 @@
id: Saw
icon: Objects/Specific/Medical/Surgery/saw.rsi/saw.png
result: Saw
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -43,7 +43,7 @@
id: Hemostat
icon: Objects/Specific/Medical/Surgery/scissors.rsi/hemostat.png
result: Hemostat
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -51,7 +51,7 @@
id: BodyBag_Folded
icon: Objects/Specific/Medical/Morgue/bodybags.rsi/bag_folded.png
result: BodyBag_Folded
completetime: 300
completetime: 1.2
materials:
Plastic: 200
@@ -59,7 +59,7 @@
id: HandheldCrewMonitor
icon: Objects/Specific/Medical/handheldcrewmonitor.rsi/icon.png
result: HandheldCrewMonitor
completetime: 5000
completetime: 2
materials:
Glass: 1200
Steel: 1000
@@ -69,7 +69,7 @@
id: HandheldHealthAnalyzer
icon: Objects/Specific/Medical/healthanalyzer.rsi/icon.png
result: HandheldHealthAnalyzer
completetime: 1000
completetime: 4
materials:
Glass: 500
Steel: 500

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

@@ -2,7 +2,7 @@
id: LightTube
icon: Objects/Power/light_tube.rsi/normal.png
result: LightTube
completetime: 500
completetime: 2
materials:
Steel: 50
Glass: 50
@@ -11,7 +11,7 @@
id: LightBulb
icon: Objects/Power/light_bulb.rsi/normal.png
result: LightBulb
completetime: 500
completetime: 2
materials:
Steel: 50
Glass: 50
@@ -20,7 +20,7 @@
id: PowerCellSmallHigh
icon: Objects/Power/PowerCells/power_cell_small_hi.rsi
result: PowerCellSmallHigh
completetime: 500
completetime: 2
materials:
Steel: 100
Glass: 100
@@ -29,7 +29,7 @@
id: GlowstickRed
icon: Objects/Misc/glowstick.rsi
result: GlowstickRed
completetime: 500
completetime: 2
materials:
Plastic: 50
@@ -37,7 +37,7 @@
id: Flare
icon: Objects/Misc/flare.rsi
result: Flare
completetime: 500
completetime: 2
materials:
Plastic: 50
@@ -47,7 +47,7 @@
sprite: Objects/Tools/flashlight.rsi
state: flashlight
result: FlashlightLantern
completetime: 500
completetime: 2
materials:
Steel: 100
Glass: 100
@@ -59,7 +59,7 @@
sprite: Objects/Misc/fire_extinguisher.rsi
state: fire_extinguisher_closed
result: FireExtinguisher
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -67,7 +67,7 @@
id: Matchbox
icon: Objects/Tools/matches.rsi
result: Matchbox
completetime: 10
completetime: 1
materials:
Wood: 100
@@ -77,7 +77,7 @@
sprite: Mobs/Silicon/drone.rsi
state: shell
result: Drone
completetime: 1500
completetime: 6
materials:
Steel: 500
Glass: 500
@@ -89,7 +89,7 @@
sprite: Objects/Fun/Instruments/h_synthesizer.rsi
state: icon
result: SynthesizerInstrument
completetime: 1000
completetime: 4
materials:
Steel: 300
Plastic: 300

36
Resources/Prototypes/Recipes/Lathes/security.yml
View File

@@ -4,7 +4,7 @@
sprite: Objects/Misc/handcuffs.rsi
state: handcuff
result: Handcuffs
completetime: 500
completetime: 2
materials:
Steel: 300
@@ -14,7 +14,7 @@
sprite: Objects/Weapons/Melee/stunbaton.rsi
state: stunbaton_off
result: Stunbaton
completetime: 500
completetime: 2
materials:
Steel: 300
Plastic: 300
@@ -25,7 +25,7 @@
sprite: Objects/Weapons/Melee/flash.rsi
state: flash
result: Flash
completetime: 500
completetime: 2
materials:
Glass: 100
Plastic: 200
@@ -37,62 +37,62 @@
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi
state: base
result: ShellShotgunBeanbag
completetime: 500
completetime: 2
materials:
Plastic: 15
Steel: 10
- type: latheRecipe
id: CartridgePistolRubber
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgePistolRubber
completetime: 500
completetime: 2
materials:
Plastic: 5
Steel: 5
- type: latheRecipe
id: CartridgeMagnumRubber
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgeMagnumRubber
completetime: 500
completetime: 2
materials:
Plastic: 5
Steel: 5
- type: latheRecipe
id: CartridgeClRifleRubber
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgeClRifleRubber
completetime: 500
completetime: 2
materials:
Plastic: 10
Steel: 5
- type: latheRecipe
id: CartridgeLRifleRubber
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgeLRifleRubber
completetime: 500
completetime: 2
materials:
Plastic: 10
Steel: 5
- type: latheRecipe
id: CartridgeSRifleRubber
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgeSRifleRubber
completetime: 500
completetime: 2
materials:
Plastic: 10
Steel: 5
@@ -103,7 +103,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgePistol
completetime: 500
completetime: 2
materials:
Steel: 10
@@ -113,7 +113,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
state: base
result: ShellShotgun
completetime: 500
completetime: 2
materials:
Steel: 20
@@ -123,7 +123,7 @@
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgeMagnum
completetime: 500
completetime: 2
materials:
Steel: 20
@@ -133,6 +133,6 @@
sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
state: base
result: CartridgeLRifle
completetime: 500
completetime: 2
materials:
Steel: 30

8
Resources/Prototypes/Recipes/Lathes/sheet.yml
View File

@@ -4,7 +4,7 @@
sprite: Objects/Materials/Sheets/metal.rsi
state: steel
result: SheetSteel1
completetime: 500
completetime: 2
materials:
Steel: 100
@@ -14,7 +14,7 @@
sprite: Objects/Materials/Sheets/glass.rsi
state: glass
result: SheetGlass1
completetime: 500
completetime: 2
materials:
Glass: 100
@@ -24,7 +24,7 @@
sprite: Objects/Materials/Sheets/glass.rsi
state: rglass
result: SheetRGlass1
completetime: 500
completetime: 2
materials:
Glass: 100
Steel: 50
@@ -35,6 +35,6 @@
sprite: Objects/Materials/Sheets/other.rsi
state: plastic
result: SheetPlastic1
completetime: 500
completetime: 2
materials:
Plastic: 100

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

@@ -2,7 +2,7 @@
id: Wirecutter
icon: Objects/Tools/wirecutters.rsi/cutters-map.png
result: Wirecutter
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 50
@@ -13,7 +13,7 @@
sprite: Objects/Tools/screwdriver.rsi
state: screwdriver-map
result: Screwdriver
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 50
@@ -24,7 +24,7 @@
sprite: /Textures/Objects/Tools/welder.rsi
state: icon
result: Welder
completetime: 500
completetime: 2
materials:
Steel: 400
@@ -32,7 +32,7 @@
id: Wrench
icon: Objects/Tools/wrench.rsi/icon.png
result: Wrench
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -41,7 +41,7 @@
name: LV cable
icon: /Textures/Objects/Tools/cable-coils.rsi/coillv-30.png
result: CableApcStack1
completetime: 500
completetime: 2
materials:
Steel: 100
@@ -50,7 +50,7 @@
name: MV cable coil
icon: /Textures/Objects/Tools/cable-coils.rsi/coilmv-30.png
result: CableMVStack1
completetime: 500
completetime: 2
materials:
Steel: 150
@@ -59,7 +59,7 @@
name: HV cable coil
icon: /Textures/Objects/Tools/cable-coils.rsi/coilhv-30.png
result: CableHVStack1
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -67,7 +67,7 @@
id: Crowbar
icon: Objects/Tools/crowbar.rsi/icon.png
result: Crowbar
completetime: 500
completetime: 2
materials:
Steel: 200
@@ -75,7 +75,7 @@
id: Pickaxe
icon: Objects/Weapons/Melee/pickaxe.rsi
result: Pickaxe
completetime: 500
completetime: 2
materials:
Steel: 200
Wood: 100
@@ -86,7 +86,7 @@
sprite: Objects/Tools/shovel.rsi
state: icon
result: Shovel
completetime: 500
completetime: 2
materials:
Steel: 200
Wood: 100
@@ -97,7 +97,7 @@
sprite: Objects/Tools/multitool.rsi
state: icon
result: Multitool
completetime: 500
completetime: 2
materials:
Steel: 200
Plastic: 200
@@ -108,7 +108,7 @@
sprite: Objects/Tools/drill.rsi
state: drill_screw
result: PowerDrill
completetime: 500
completetime: 2
materials:
Steel: 600
Plastic: 200
@@ -119,7 +119,7 @@
sprite: Objects/Tools/rcd.rsi
state: icon
result: RCD
completetime: 1000
completetime: 4
materials:
Steel: 1000
Plastic: 300
@@ -130,7 +130,7 @@
sprite: Objects/Tools/rcd.rsi
state: ammo
result: RCDAmmo
completetime: 600
completetime: 2.4
materials:
Steel: 500
Plastic: 250
@@ -139,7 +139,7 @@
id: HandheldGPSBasic
icon: Objects/Devices/gps.rsi/icon.png
result: HandheldGPSBasic
completetime: 2000
completetime: 2
materials:
Steel: 800
Glass: 300