diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml index 573547ef03..63e2e5fae6 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml @@ -8,7 +8,7 @@ - type: MachineBoard - type: Sprite sprite: Objects/Misc/module.rsi - state: id_mod + state: generic - type: Tag tags: - DroneUsable diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 84cf92d267..2a606f5601 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -35,6 +35,8 @@ name: security techfab machine board description: A machine printed circuit board for a security techfab components: + - type: Sprite + state: security - type: MachineBoard prototype: SecurityTechFab requirements: @@ -52,6 +54,8 @@ name: medical techfab machine board description: A machine printed circuit board for a medical techfab components: + - type: Sprite + state: medical - type: MachineBoard prototype: MedicalTechFab requirements: @@ -68,6 +72,8 @@ parent: BaseMachineCircuitboard name: circuit imprinter machine board components: + - type: Sprite + state: science - type: MachineBoard prototype: CircuitImprinter requirements: @@ -96,6 +102,8 @@ parent: BaseMachineCircuitboard name: vaccinator machine board components: + - type: Sprite + state: medical - type: MachineBoard prototype: Vaccinator requirements: @@ -114,6 +122,8 @@ parent: BaseMachineCircuitboard name: diagnoser machine board components: + - type: Sprite + state: medical - type: MachineBoard prototype: DiseaseDiagnoser requirements: @@ -128,6 +138,8 @@ name: freezer thermomachine machine board description: Looks like you could use a screwdriver to change the board type. components: + - type: Sprite + state: engineering - type: MachineBoard prototype: GasThermoMachineFreezer requirements: @@ -145,6 +157,8 @@ name: heater thermomachine machine board description: Looks like you could use a screwdriver to change the board type. components: + - type: Sprite + state: engineering - type: MachineBoard prototype: GasThermoMachineHeater requirements: @@ -162,6 +176,8 @@ name: portable scrubber machine board description: A PCB for a portable scrubber. components: + - type: Sprite + state: engineering - type: MachineBoard prototype: PortableScrubber requirements: @@ -177,6 +193,8 @@ name: cloning pod machine board description: A machine printed circuit board for a cloning pod components: + - type: Sprite + state: medical - type: MachineBoard prototype: CloningPod requirements: @@ -192,6 +210,8 @@ name: medical scanner machine board description: A machine printed circuit board for a medical scanner components: + - type: Sprite + state: medical - type: MachineBoard prototype: MedicalScanner requirements: @@ -208,6 +228,8 @@ name: ChemMaster 4000 machine board description: A machine printed circuit board for a ChemMaster 4000 components: + - type: Sprite + state: medical - type: MachineBoard prototype: chem_master requirements: @@ -226,6 +248,8 @@ name: chem dispenser machine board description: A machine printed circuit board for a chem dispenser components: + - type: Sprite + state: medical - type: MachineBoard prototype: chem_dispenser requirements: @@ -241,6 +265,8 @@ name: hydroponics tray machine board description: A machine printed circuit board for a hydroponics tray components: + - type: Sprite + state: service - type: MachineBoard prototype: hydroponicsTray # See: https://github.com/vgstation-coders/vgstation13/blob/e9a806f30b4db0efa2a68b9eb42e3120d2321b6a/code/modules/hydroponics/hydro_tray.dm#L57 @@ -325,6 +351,8 @@ parent: BaseMachineCircuitboard name: generator (plasma) machine board components: + - type: Sprite + state: engineering - type: MachineBoard prototype: GeneratorPlasma requirements: @@ -337,6 +365,8 @@ parent: BaseMachineCircuitboard name: generator (uranium) machine board components: + - type: Sprite + state: engineering - type: MachineBoard prototype: GeneratorUranium requirements: @@ -367,6 +397,8 @@ parent: BaseMachineCircuitboard name: Stasis Bed (Machine Board) components: + - type: Sprite + state: medical - type: MachineBoard prototype: StasisBed requirements: @@ -389,6 +421,8 @@ parent: BaseMachineCircuitboard name: ore processor machine board components: + - type: Sprite + state: supply - type: MachineBoard prototype: OreProcessor requirements: @@ -403,6 +437,8 @@ parent: BaseMachineCircuitboard name: microwave machine board components: + - type: Sprite + state: service - type: MachineBoard prototype: KitchenMicrowave requirements: @@ -417,6 +453,8 @@ parent: BaseMachineCircuitboard name: emitter machine board components: + - type: Sprite + state: engineering - type: MachineBoard prototype: Emitter requirements: diff --git a/Resources/Textures/Objects/Misc/module.rsi/command.png b/Resources/Textures/Objects/Misc/module.rsi/command.png index f298933188..4dec2fd3ad 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/command.png and b/Resources/Textures/Objects/Misc/module.rsi/command.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/engineering.png b/Resources/Textures/Objects/Misc/module.rsi/engineering.png index 0f96870255..b899407bb8 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/engineering.png and b/Resources/Textures/Objects/Misc/module.rsi/engineering.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/generic.png b/Resources/Textures/Objects/Misc/module.rsi/generic.png index 3068a820c1..4bd10723ca 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/generic.png and b/Resources/Textures/Objects/Misc/module.rsi/generic.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/medical.png b/Resources/Textures/Objects/Misc/module.rsi/medical.png index 5ccb845656..19dc734791 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/medical.png and b/Resources/Textures/Objects/Misc/module.rsi/medical.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json index 763947cb57..654f4663b2 100644 --- a/Resources/Textures/Objects/Misc/module.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0", "states": [{"name": "abductor_mod", "delays": [[1.0]]}, {"name": "airalarm_electronics", "delays": [[1.0]]}, {"name": "ash_plating", "delays": [[1.0]]}, {"name": "beaker_holder", "delays": [[1.0]]}, {"name": "blank_mod", "delays": [[1.0]]}, {"name": "bluespacearray", "delays": [[1.0]]}, {"name": "boris", "delays": [[0.1, 0.1]]}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini", "delays": [[1.0]]}, {"name": "card_mod", "delays": [[1.0]]}, {"name": "cargodisk", "delays": [[1.0]]}, {"name": "cart_connector", "delays": [[1.0]]}, {"name": "cddrive", "delays": [[1.0]]}, {"name": "cell", "delays": [[1.0]]}, {"name": "cell_con", "delays": [[1.0]]}, {"name": "cell_con_micro", "delays": [[1.0]]}, {"name": "cell_micro", "delays": [[1.0]]}, {"name": "cell_mini", "delays": [[1.0]]}, {"name": "charger_APC", "delays": [[1.0]]}, {"name": "charger_lambda", "delays": [[1.0]]}, {"name": "charger_pda", "delays": [[1.0]]}, {"name": "charger_wire", "delays": [[1.0]]}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command", "delays": [[1.0]]}, {"name": "cpu", "delays": [[1.0]]}, {"name": "cpu_adv", "delays": [[1.0]]}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpuboard", "delays": [[1.0]]}, {"name": "cpuboard_adv", "delays": [[1.0]]}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade", "delays": [[1.0]]}, {"name": "cyborg_upgrade1", "delays": [[1.0]]}, {"name": "cyborg_upgrade2", "delays": [[1.0]]}, {"name": "cyborg_upgrade3", "delays": [[1.0]]}, {"name": "cyborg_upgrade4", "delays": [[1.0]]}, {"name": "cyborg_upgrade5", "delays": [[1.0]]}, {"name": "datadisk0", "delays": [[1.0]]}, {"name": "datadisk1", "delays": [[1.0]]}, {"name": "datadisk2", "delays": [[1.0]]}, {"name": "datadisk3", "delays": [[1.0]]}, {"name": "datadisk4", "delays": [[1.0]]}, {"name": "datadisk5", "delays": [[1.0]]}, {"name": "datadisk6", "delays": [[1.0]]}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "depositbox", "delays": [[1.0]]}, {"name": "door_electronics", "delays": [[1.0]]}, {"name": "engineering", "delays": [[1.0]]}, {"name": "flopdrive", "delays": [[1.0]]}, {"name": "generic", "delays": [[1.0]]}, {"name": "harddisk", "delays": [[1.0]]}, {"name": "harddisk_micro", "delays": [[1.0]]}, {"name": "harddisk_mini", "delays": [[1.0]]}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod", "delays": [[1.0]]}, {"name": "mainboard", "delays": [[1.0]]}, {"name": "mcontroller", "delays": [[1.0]]}, {"name": "medical", "delays": [[1.0]]}, {"name": "net_wired", "delays": [[1.0]]}, {"name": "nucleardisk", "delays": [[0.1, 0.1]]}, {"name": "power_mod", "delays": [[1.0]]}, {"name": "printer", "delays": [[1.0]]}, {"name": "printer_mini", "delays": [[1.0]]}, {"name": "prizevendor", "delays": [[1.0]]}, {"name": "radio", "delays": [[1.0]]}, {"name": "radio_micro", "delays": [[1.0]]}, {"name": "radio_mini", "delays": [[1.0]]}, {"name": "ram", "delays": [[1.0]]}, {"name": "rndmajordisk", "delays": [[1.0]]}, {"name": "science", "delays": [[1.0]]}, {"name": "secmodschematic", "delays": [[1.0]]}, {"name": "security", "delays": [[1.0]]}, {"name": "selfrepair_off", "delays": [[1.0]]}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service", "delays": [[1.0]]}, {"name": "servo", "delays": [[1.0]]}, {"name": "ssd", "delays": [[1.0]]}, {"name": "ssd_large", "delays": [[1.0]]}, {"name": "ssd_micro", "delays": [[1.0]]}, {"name": "ssd_mini", "delays": [[1.0]]}, {"name": "std_mod", "delays": [[1.0]]}, {"name": "supply", "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473", "states": [{"name": "abductor_mod", "delays": [[1.0]]}, {"name": "airalarm_electronics", "delays": [[1.0]]}, {"name": "ash_plating", "delays": [[1.0]]}, {"name": "beaker_holder", "delays": [[1.0]]}, {"name": "blank_mod", "delays": [[1.0]]}, {"name": "bluespacearray", "delays": [[1.0]]}, {"name": "boris", "delays": [[0.1, 0.1]]}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini", "delays": [[1.0]]}, {"name": "card_mod", "delays": [[1.0]]}, {"name": "cargodisk", "delays": [[1.0]]}, {"name": "cart_connector", "delays": [[1.0]]}, {"name": "cddrive", "delays": [[1.0]]}, {"name": "cell", "delays": [[1.0]]}, {"name": "cell_con", "delays": [[1.0]]}, {"name": "cell_con_micro", "delays": [[1.0]]}, {"name": "cell_micro", "delays": [[1.0]]}, {"name": "cell_mini", "delays": [[1.0]]}, {"name": "charger_APC", "delays": [[1.0]]}, {"name": "charger_lambda", "delays": [[1.0]]}, {"name": "charger_pda", "delays": [[1.0]]}, {"name": "charger_wire", "delays": [[1.0]]}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command", "delays": [[1.0]]}, {"name": "cpu", "delays": [[1.0]]}, {"name": "cpu_adv", "delays": [[1.0]]}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpuboard", "delays": [[1.0]]}, {"name": "cpuboard_adv", "delays": [[1.0]]}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade", "delays": [[1.0]]}, {"name": "cyborg_upgrade1", "delays": [[1.0]]}, {"name": "cyborg_upgrade2", "delays": [[1.0]]}, {"name": "cyborg_upgrade3", "delays": [[1.0]]}, {"name": "cyborg_upgrade4", "delays": [[1.0]]}, {"name": "cyborg_upgrade5", "delays": [[1.0]]}, {"name": "datadisk0", "delays": [[1.0]]}, {"name": "datadisk1", "delays": [[1.0]]}, {"name": "datadisk2", "delays": [[1.0]]}, {"name": "datadisk3", "delays": [[1.0]]}, {"name": "datadisk4", "delays": [[1.0]]}, {"name": "datadisk5", "delays": [[1.0]]}, {"name": "datadisk6", "delays": [[1.0]]}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "depositbox", "delays": [[1.0]]}, {"name": "door_electronics", "delays": [[1.0]]}, {"name": "engineering", "delays": [[1.0]]}, {"name": "flopdrive", "delays": [[1.0]]}, {"name": "generic", "delays": [[1.0]]}, {"name": "harddisk", "delays": [[1.0]]}, {"name": "harddisk_micro", "delays": [[1.0]]}, {"name": "harddisk_mini", "delays": [[1.0]]}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod", "delays": [[1.0]]}, {"name": "mainboard", "delays": [[1.0]]}, {"name": "mcontroller", "delays": [[1.0]]}, {"name": "medical", "delays": [[1.0]]}, {"name": "net_wired", "delays": [[1.0]]}, {"name": "nucleardisk", "delays": [[0.1, 0.1]]}, {"name": "power_mod", "delays": [[1.0]]}, {"name": "printer", "delays": [[1.0]]}, {"name": "printer_mini", "delays": [[1.0]]}, {"name": "prizevendor", "delays": [[1.0]]}, {"name": "radio", "delays": [[1.0]]}, {"name": "radio_micro", "delays": [[1.0]]}, {"name": "radio_mini", "delays": [[1.0]]}, {"name": "ram", "delays": [[1.0]]}, {"name": "rndmajordisk", "delays": [[1.0]]}, {"name": "science", "delays": [[1.0]]}, {"name": "secmodschematic", "delays": [[1.0]]}, {"name": "security", "delays": [[1.0]]}, {"name": "selfrepair_off", "delays": [[1.0]]}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service", "delays": [[1.0]]}, {"name": "servo", "delays": [[1.0]]}, {"name": "ssd", "delays": [[1.0]]}, {"name": "ssd_large", "delays": [[1.0]]}, {"name": "ssd_micro", "delays": [[1.0]]}, {"name": "ssd_mini", "delays": [[1.0]]}, {"name": "std_mod", "delays": [[1.0]]}, {"name": "supply", "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Misc/module.rsi/science.png b/Resources/Textures/Objects/Misc/module.rsi/science.png index 91bba039ce..0d71531bb2 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/science.png and b/Resources/Textures/Objects/Misc/module.rsi/science.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/security.png b/Resources/Textures/Objects/Misc/module.rsi/security.png index 49cda53be0..d2fad4badd 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/security.png and b/Resources/Textures/Objects/Misc/module.rsi/security.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/service.png b/Resources/Textures/Objects/Misc/module.rsi/service.png index cb2bbaa967..2e22ae7007 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/service.png and b/Resources/Textures/Objects/Misc/module.rsi/service.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/supply.png b/Resources/Textures/Objects/Misc/module.rsi/supply.png index f615fc2463..af49e67c3a 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/supply.png and b/Resources/Textures/Objects/Misc/module.rsi/supply.png differ