diff --git a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml index 40438b98436..1966ce7cf31 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Structures/Machines/lathe.yml @@ -25,11 +25,14 @@ description: Prints equipment and circuitboards for use by engineering department. components: - type: Sprite - sprite: Structures/Machines/techfab.rsi + # LP Edit Start + sprite: _LP/Structures/Machines/engi_protolathe.rsi + snapCardinals: true + # LP Edit End layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] - - state: engi + # - state: engi LP Edit - state: unlit shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] @@ -41,7 +44,7 @@ board: EngineeringTechFabCircuitboard - type: Lathe idleState: icon - runningState: icon + runningState: building # LP Edit staticPacks: - SharedBoardsStatic - EngineeringBoardsStatic @@ -97,11 +100,14 @@ description: Prints equipment and circuitboards for use by cargo department. components: - type: Sprite - sprite: Structures/Machines/techfab.rsi + # LP Edit Start + sprite: _LP/Structures/Machines/cargo_protolathe.rsi + snapCardinals: true + # LP Edit End layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] - - state: cargo + # - state: cargo LP Edit - state: unlit shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] @@ -113,7 +119,7 @@ board: CargoTechFabCircuitboard - type: Lathe idleState: icon - runningState: icon + runningState: building # LP Edit staticPacks: - ToolsStatic - SharedBoardsStatic @@ -164,11 +170,14 @@ description: Prints equipment and circuitboards for use by science department. components: - type: Sprite - sprite: Structures/Machines/techfab.rsi + # LP Edit Start + sprite: _LP/Structures/Machines/rnd_protolathe.rsi + snapCardinals: true + # LP Edit End layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] - - state: sci + # - state: sci LP Edit - state: unlit shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] @@ -180,7 +189,7 @@ board: ScienceTechFabCircuitboard - type: Lathe idleState: icon - runningState: icon + runningState: building # LP Edit staticPacks: - SharedBoardsStatic - EngineeringBoardsStatic diff --git a/Resources/Prototypes/_LP/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_LP/Entities/Structures/Machines/lathe.yml new file mode 100644 index 00000000000..ffe5ef7fabe --- /dev/null +++ b/Resources/Prototypes/_LP/Entities/Structures/Machines/lathe.yml @@ -0,0 +1,58 @@ +- type: entity + id: LPPServiceProtolathe + parent: [BaseLatheLube, BaseSiloUtilizer] + name: engineering techfab + description: Prints equipment and circuitboards for use by engineering department. + components: + - type: Sprite + sprite: _LP/Structures/Machines/serv_protolathe.rsi + snapCardinals: true + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: unlit + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Machine + board: EngineeringTechFabCircuitboard + - type: Lathe + idleState: icon + runningState: building + staticPacks: + - SharedBoardsStatic + - CircuitFloorsStatic + - ToolsStatic + - PartsStatic + - AtmosStatic + - CablesStatic + - MaterialsStatic + - LightsStatic + - PowerCellsStatic + - ElectronicsStatic + - MiscSignallersStatic + - NailgunStatic + - NailsStatic + dynamicPacks: + - ServiceTools + - AtmosTools + - PowerCells + - Equipment + - SpecOpsGoogles + - EngineeringBoards + - SharedBoards + - CameraBoards + - UpgradeKits + # CorvaxGoob Packs + - WorkBeltsSharedDynamic # WorkBelts-Techfab + - WokrBeltsEngDynamic # WorkBelts-Techfab + - type: EmagLatheRecipes + emagStaticPacks: + - NailgunEvilStatic + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot \ No newline at end of file diff --git a/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/building.png b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/building.png new file mode 100644 index 00000000000..079753158f8 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/icon.png b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/icon.png new file mode 100644 index 00000000000..758f3a036e3 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/icon.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/inserting.png b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/inserting.png new file mode 100644 index 00000000000..451eaec4d5c Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/inserting.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/meta.json b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/meta.json new file mode 100644 index 00000000000..8970736cc61 --- /dev/null +++ b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by BL02DL", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09, + 0.09 + ] + ] + }, + { + "name": "inserting", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/panel.png b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/panel.png new file mode 100644 index 00000000000..7bacd5ffad0 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/panel.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/unlit.png b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/unlit.png new file mode 100644 index 00000000000..90565bc08f5 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/SpaceForge.rsi/unlit.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/building.png b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/building.png new file mode 100644 index 00000000000..f947c0dfb24 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/icon.png b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/icon.png new file mode 100644 index 00000000000..514271bc79c Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/icon.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/inserting.png b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/inserting.png new file mode 100644 index 00000000000..3f3c09debfb Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/inserting.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/meta.json b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/meta.json new file mode 100644 index 00000000000..7c70e1740f7 --- /dev/null +++ b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "inserting", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/panel.png b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/panel.png new file mode 100644 index 00000000000..84bdbf20b9b Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/panel.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/unlit-building.png b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/unlit-building.png new file mode 100644 index 00000000000..b72d06d6546 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/unlit-building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/unlit.png b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/unlit.png new file mode 100644 index 00000000000..13c4be2631f Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/cargo_protolathe.rsi/unlit.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/building.png b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/building.png new file mode 100644 index 00000000000..2ed09a4085b Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/icon.png b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/icon.png new file mode 100644 index 00000000000..047c5856461 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/icon.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/inserting.png b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/inserting.png new file mode 100644 index 00000000000..3f3c09debfb Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/inserting.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/meta.json b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/meta.json new file mode 100644 index 00000000000..ebf8eae1aeb --- /dev/null +++ b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "BL02DL", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "inserting", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/panel.png b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/panel.png new file mode 100644 index 00000000000..6617a293992 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/panel.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/unlit-building.png b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/unlit-building.png new file mode 100644 index 00000000000..b72d06d6546 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/unlit-building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/unlit.png b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/unlit.png new file mode 100644 index 00000000000..13c4be2631f Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/engi_protolathe.rsi/unlit.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/building.png b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/building.png new file mode 100644 index 00000000000..c4613c5c28e Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/icon.png b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/icon.png new file mode 100644 index 00000000000..21650141251 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/icon.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/inserting.png b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/inserting.png new file mode 100644 index 00000000000..3f3c09debfb Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/inserting.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/meta.json b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/meta.json new file mode 100644 index 00000000000..ebf8eae1aeb --- /dev/null +++ b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "BL02DL", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "inserting", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/panel.png b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/panel.png new file mode 100644 index 00000000000..2c347ef4d65 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/panel.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/unlit-building.png b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/unlit-building.png new file mode 100644 index 00000000000..b72d06d6546 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/unlit-building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/unlit.png b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/unlit.png new file mode 100644 index 00000000000..13c4be2631f Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/rnd_protolathe.rsi/unlit.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/building.png b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/building.png new file mode 100644 index 00000000000..b5f8725ac6d Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/icon.png b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/icon.png new file mode 100644 index 00000000000..3251f8c8319 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/icon.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/inserting.png b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/inserting.png new file mode 100644 index 00000000000..3f3c09debfb Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/inserting.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/meta.json b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/meta.json new file mode 100644 index 00000000000..7aeab186a84 --- /dev/null +++ b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "inserting", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/panel.png b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/panel.png new file mode 100644 index 00000000000..7a97ca65f3b Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/panel.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/unlit-building.png b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/unlit-building.png new file mode 100644 index 00000000000..b72d06d6546 Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/unlit-building.png differ diff --git a/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/unlit.png b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/unlit.png new file mode 100644 index 00000000000..13c4be2631f Binary files /dev/null and b/Resources/Textures/_LP/Structures/Machines/serv_protolathe.rsi/unlit.png differ