From 0fe43a1f2b2e50ed4b9a9ba1668abd95c0e801f3 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 19 Apr 2017 16:16:25 -0400 Subject: [PATCH] Removes all the hard references to computer.dmi I assume these were all lazy copy-pasting. We're changing computer icons to another set in a file we'll keep separate, and these completely pointless references are annoying. They should inherit this from the `/computer/` level, which they do. Has no effect on Polaris, but cleans up code that shouldn't exist. --- code/game/dna/dna_modifier.dm | 1 - code/game/machinery/atmo_control.dm | 1 - code/game/machinery/computer/aifixer.dm | 15 +++++++-------- code/game/machinery/computer/atmos_control.dm | 1 - code/game/machinery/computer/cloning.dm | 1 - code/game/machinery/computer/prisoner.dm | 1 - code/game/machinery/computer/prisonshuttle.dm | 1 - code/game/machinery/computer/robot.dm | 1 - code/game/machinery/computer/security.dm | 1 - code/game/machinery/computer/specops_shuttle.dm | 1 - code/game/machinery/computer/supply.dm | 2 -- .../computer/syndicate_specops_shuttle.dm | 1 - code/game/mecha/mecha_control_console.dm | 1 - .../living/silicon/robot/drone/drone_console.dm | 1 - code/modules/power/gravitygenerator.dm | 1 - code/modules/power/sensors/sensor_monitoring.dm | 1 - code/modules/power/turbine.dm | 1 - code/modules/shuttles/shuttle_console.dm | 1 - code/modules/virus2/curer.dm | 1 - code/modules/virus2/diseasesplicer.dm | 1 - 20 files changed, 7 insertions(+), 28 deletions(-) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index e06f774a83..a28dd27036 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -210,7 +210,6 @@ /obj/machinery/computer/scan_consolenew name = "DNA Modifier Access Console" desc = "Scan DNA." - icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "dna" density = 1 diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 83c6f81e30..546e6acd88 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -72,7 +72,6 @@ obj/machinery/air_sensor/Destroy() ..() /obj/machinery/computer/general_air_control - icon = 'icons/obj/computer.dmi' icon_keyboard = "atmos_key" icon_screen = "tank" name = "Computer" diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index de81fbb0fa..cf657e1c10 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/aifixer name = "\improper AI system integrity restorer" - icon = 'icons/obj/computer.dmi' icon_keyboard = "rd_key" icon_screen = "ai-fixer" light_color = "#a97faa" @@ -102,7 +101,7 @@ return 1 if (href_list["fix"]) src.active = 1 - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on") + src.overlays += image(icon, "ai-fixer-on") while (src.occupant.health < 100) src.occupant.adjustOxyLoss(-1) src.occupant.adjustFireLoss(-1) @@ -114,13 +113,13 @@ src.occupant.lying = 0 dead_mob_list -= src.occupant living_mob_list += src.occupant - src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-404") - src.overlays += image('icons/obj/computer.dmi', "ai-fixer-full") + src.overlays -= image(icon, "ai-fixer-404") + src.overlays += image(icon, "ai-fixer-full") src.occupant.add_ai_verbs() src.updateUsrDialog() sleep(10) src.active = 0 - src.overlays -= image('icons/obj/computer.dmi', "ai-fixer-on") + src.overlays -= image(icon, "ai-fixer-on") src.add_fingerprint(usr) @@ -135,8 +134,8 @@ if(occupant) if(occupant.stat) - overlays += image('icons/obj/computer.dmi', "ai-fixer-404", overlay_layer) + overlays += image(icon, "ai-fixer-404", overlay_layer) else - overlays += image('icons/obj/computer.dmi', "ai-fixer-full", overlay_layer) + overlays += image(icon, "ai-fixer-full", overlay_layer) else - overlays += image('icons/obj/computer.dmi', "ai-fixer-empty", overlay_layer) + overlays += image(icon, "ai-fixer-empty", overlay_layer) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 9f1b7afb38..3826eb3c94 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -4,7 +4,6 @@ /obj/machinery/computer/atmoscontrol name = "\improper Central Atmospherics Computer" - icon = 'icons/obj/computer.dmi' icon_keyboard = "generic_key" icon_screen = "comm_logs" light_color = "#00b000" diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 75ba732950..db932f8cd0 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/cloning name = "cloning control console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "dna" light_color = "#315ab4" diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index e8fe96ae6c..3d0235fab9 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -2,7 +2,6 @@ /obj/machinery/computer/prisoner name = "prisoner management console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "explosive" light_color = "#a91515" diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 1c54fb0f4c..8c435f5845 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -12,7 +12,6 @@ var/prison_shuttle_timeleft = 0 /obj/machinery/computer/prison_shuttle name = "prison shuttle control console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "syndishuttle" light_color = "#00ffff" diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index ca56ce168d..4d29a56b89 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -1,7 +1,6 @@ /obj/machinery/computer/robotics name = "robotics control console" desc = "Used to remotely lockdown or detonate linked cyborgs." - icon = 'icons/obj/computer.dmi' icon_keyboard = "tech_key" icon_screen = "robot" light_color = "#a97faa" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 54c94d8684..389828843f 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -612,5 +612,4 @@ What a mess.*/ ..(severity) /obj/machinery/computer/secure_data/detective_computer - icon = 'icons/obj/computer.dmi' icon_state = "messyfiles" diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index cb0f8a5552..0a337f4df8 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -13,7 +13,6 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle name = "special operations shuttle control console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "syndishuttle" light_color = "#00ffff" diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index d390a7f163..4bcc43bbec 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/supplycomp name = "supply control console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "tech_key" icon_screen = "supply" light_color = "#b88b2e" @@ -13,7 +12,6 @@ /obj/machinery/computer/ordercomp name = "supply ordering console" - icon = 'icons/obj/computer.dmi' icon_screen = "request" circuit = /obj/item/weapon/circuitboard/ordercomp var/temp = null diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index d36f03b525..ba7193b69b 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -12,7 +12,6 @@ var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer/syndicate_elite_shuttle name = "elite syndicate squad shuttle control console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "syndie_key" icon_screen = "syndishuttle" light_color = "#00ffff" diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index a6da9bfa00..00a0654cc1 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/mecha name = "Exosuit Control" - icon = 'icons/obj/computer.dmi' icon_keyboard = "rd_key" icon_screen = "mecha" light_color = "#a97faa" diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 349f27114b..8c12226e3d 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -1,7 +1,6 @@ /obj/machinery/computer/drone_control name = "Maintenance Drone Control" desc = "Used to monitor the station's drone population and the assembler that services them." - icon = 'icons/obj/computer.dmi' icon_keyboard = "power_key" icon_screen = "power" req_access = list(access_engine_equip) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index fe51b4152e..d6ae824fd1 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -3,7 +3,6 @@ /obj/machinery/computer/gravity_control_computer name = "Gravity Generator Control" desc = "A computer to control a local gravity generator. Qualified personnel only." - icon = 'icons/obj/computer.dmi' icon_state = "airtunnel0e" anchored = 1 density = 1 diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index 597ced19db..21aecc59ea 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -6,7 +6,6 @@ /obj/machinery/computer/power_monitor name = "Power Monitoring Console" desc = "Computer designed to remotely monitor power levels around the station" - icon = 'icons/obj/computer.dmi' icon_keyboard = "power_key" icon_screen = "power:0" light_color = "#ffcc33" diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 8786930e2f..88c4ca34ac 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -28,7 +28,6 @@ /obj/machinery/computer/turbine_computer name = "Gas turbine control computer" desc = "A computer to remotely control a gas turbine" - icon = 'icons/obj/computer.dmi' icon_keyboard = "tech_key" icon_screen = "turbinecomp" circuit = /obj/item/weapon/circuitboard/turbine_control diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index b6857a3f82..980053bd5d 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/shuttle_control name = "shuttle control console" - icon = 'icons/obj/computer.dmi' icon_keyboard = "atmos_key" icon_screen = "shuttle" circuit = null diff --git a/code/modules/virus2/curer.dm b/code/modules/virus2/curer.dm index d6c5189f19..c297643e2a 100644 --- a/code/modules/virus2/curer.dm +++ b/code/modules/virus2/curer.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/curer name = "cure research machine" - icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "dna" circuit = /obj/item/weapon/circuitboard/curefab diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index 8d88639db3..298dc49f27 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -1,6 +1,5 @@ /obj/machinery/computer/diseasesplicer name = "disease splicer" - icon = 'icons/obj/computer.dmi' icon_keyboard = "med_key" icon_screen = "crew"