diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index e7d2aed8f3..9d034fd1f6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -149,17 +149,12 @@ - type: StorageFill contents: - id: ResearchComputerCircuitboard - prob: 1 - id: ProtolatheMachineCircuitboard - prob: 1 + - id: CircuitImprinterMachineCircuitboard - id: ClothingNeckCloakRd - prob: 1 - id: ClothingHeadsetMedicalScience - prob: 1 - id: ClothingHeadHelmetHardsuitRd - prob: 1 - id: ClothingOuterHardsuitRd - prob: 1 - id: PlushieSlime prob: 0.1 - id: DoorRemoteResearch diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index b102f5acbe..736428184b 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -246,6 +246,7 @@ - FireExtinguisher - AutolatheMachineCircuitboard - ProtolatheMachineCircuitboard + - CircuitImprinterMachineCircuitboard - AirAlarmElectronics - FireAlarmElectronics diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 7f28a73702..cae196edd0 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -29,6 +29,23 @@ DefaultPrototype: Beaker ExamineName: Glass Beaker +- type: entity + id: CircuitImprinterMachineCircuitboard + parent: BaseMachineCircuitboard + name: Circuit Imprinter (Machine Board) + components: + - type: MachineBoard + prototype: CircuitImprinter + requirements: + MatterBin: 1 + Manipulator: 1 + tagRequirements: + GlassBeaker: + Amount: 2 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + + - type: entity id: CloningPodMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7dba24ecbf..5b5dc605b4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -184,23 +184,8 @@ - FirelockElectronics - DoorElectronics - APCElectronics - - SMESMachineCircuitboard - - SubstationMachineCircuitboard - AirAlarmElectronics - FireAlarmElectronics - - CloningPodMachineCircuitboard - - MedicalScannerMachineCircuitboard - - ChemMasterMachineCircuitboard - - ChemDispenserMachineCircuitboard - - HydroponicsTrayMachineCircuitboard - - SolarControlComputerCircuitboard - - AutolatheMachineCircuitboard - - ProtolatheMachineCircuitboard - - KitchenReagentGrinderMachineCircuitboard - - CrewMonitoringComputerCircuitboard - - ShuttleConsoleCircuitboard - - DawInstrumentMachineCircuitboard - - SynthesizerInstrument - Bucket - MopItem - SprayBottle @@ -222,3 +207,43 @@ anchored: true - type: Pullable - type: Lathe + +- type: entity + parent: Protolathe + id: CircuitImprinter + name: Circuit Imprinter + description: Prints circuit boards for machines. + components: + - type: Sprite + netsync: false + sprite: Structures/Machines/circuit_imprinter.rsi + layers: + - state: icon + map: ["enum.ProtolatheVisualLayers.Base"] + - state: unlit + shader: unshaded + map: ["enum.ProtolatheVisualLayers.BaseUnlit"] + - state: icon + map: ["enum.ProtolatheVisualLayers.AnimationLayer"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: ProtolatheDatabase + protolatherecipes: + - SMESMachineCircuitboard + - SubstationMachineCircuitboard + - CloningPodMachineCircuitboard + - MedicalScannerMachineCircuitboard + - ChemMasterMachineCircuitboard + - ChemDispenserMachineCircuitboard + - HydroponicsTrayMachineCircuitboard + - SolarControlComputerCircuitboard + - AutolatheMachineCircuitboard + - ProtolatheMachineCircuitboard + - KitchenReagentGrinderMachineCircuitboard + - CrewMonitoringComputerCircuitboard + - ShuttleConsoleCircuitboard + - CircuitImprinterMachineCircuitboard + - DawInstrumentMachineCircuitboard + - type: Machine + board: CircuitImprinterMachineCircuitboard + diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index 9755b4f715..3e881cd04a 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -24,7 +24,7 @@ materials: Steel: 50 Plastic: 50 - + - type: latheRecipe id: AirAlarmElectronics icon: Objects/Misc/module.rsi/airalarm_electronics.png @@ -49,8 +49,8 @@ result: SubstationMachineCircuitboard completetime: 1000 materials: - Steel: 100 - Glass: 100 + Steel: 50 + Glass: 450 - type: latheRecipe id: SMESMachineCircuitboard @@ -59,7 +59,7 @@ completetime: 1000 materials: Steel: 100 - Glass: 100 + Glass: 900 - type: latheRecipe id: CloningPodMachineCircuitboard @@ -68,7 +68,8 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 + Gold: 100 - type: latheRecipe id: MedicalScannerMachineCircuitboard @@ -77,7 +78,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: ChemMasterMachineCircuitboard @@ -86,7 +87,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: ChemDispenserMachineCircuitboard @@ -95,7 +96,8 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 + Gold: 100 - type: latheRecipe id: SolarControlComputerCircuitboard @@ -104,7 +106,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: HydroponicsTrayMachineCircuitboard @@ -113,7 +115,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: AutolatheMachineCircuitboard @@ -122,7 +124,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: ProtolatheMachineCircuitboard @@ -131,7 +133,16 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 + +- type: latheRecipe + id: CircuitImprinterMachineCircuitboard + icon: Objects/Misc/module.rsi/id_mod.png + result: CircuitImprinterMachineCircuitboard + completetime: 1000 + materials: + Steel: 100 + Glass: 900 - type: latheRecipe id: KitchenReagentGrinderMachineCircuitboard @@ -140,7 +151,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: CrewMonitoringComputerCircuitboard @@ -149,7 +160,7 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 - type: latheRecipe id: ShuttleConsoleCircuitboard @@ -158,7 +169,8 @@ completetime: 1000 materials: Steel: 100 - Plastic: 100 + Glass: 900 + Gold: 100 - type: latheRecipe id: DawInstrumentMachineCircuitboard @@ -166,5 +178,5 @@ result: DawInstrumentMachineCircuitboard completetime: 1000 materials: - Steel: 100 - Plastic: 100 + Steel: 100 + Glass: 900 diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building.png new file mode 100644 index 0000000000..52235d3332 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building_unlit.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building_unlit.png new file mode 100644 index 0000000000..5eec827ab1 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/building_unlit.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/icon.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/icon.png new file mode 100644 index 0000000000..d69bf1e41d Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_adamantine.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_adamantine.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_adamantine.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_bananium.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_bananium.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_bananium.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_diamond.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_diamond.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_diamond.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_glass.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_glass.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_glass.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_gold.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_gold.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_gold.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_metal.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_metal.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_metal.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_phoron.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_phoron.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_phoron.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_plasma.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_plasma.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_plasma.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_plastic.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_plastic.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_plastic.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_silver.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_silver.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_silver.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_unlit.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_unlit.png new file mode 100644 index 0000000000..9a9e240fbc Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_unlit.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_uranium.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_uranium.png new file mode 100644 index 0000000000..1e43459922 Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/inserting_uranium.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/meta.json b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/meta.json new file mode 100644 index 0000000000..65b514fa54 --- /dev/null +++ b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/meta.json @@ -0,0 +1,120 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "building_unlit", + "delays": [ + [ + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08, + 0.08 + ] + ] + }, + { + "name": "inserting_unlit" + }, + { + "name": "inserting_glass" + }, + { + "name": "inserting_adamantine" + }, + { + "name": "inserting_bananium" + }, + { + "name": "inserting_diamond" + }, + { + "name": "inserting_silver" + }, + { + "name": "inserting_uranium" + }, + { + "name": "inserting_gold" + }, + { + "name": "inserting_metal" + }, + { + "name": "inserting_phoron" + }, + { + "name": "inserting_plasma" + }, + { + "name": "inserting_plastic" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/panel.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/panel.png new file mode 100644 index 0000000000..8658b7bdbb Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/unlit.png b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/unlit.png new file mode 100644 index 0000000000..9a9e240fbc Binary files /dev/null and b/Resources/Textures/Structures/Machines/circuit_imprinter.rsi/unlit.png differ