Cleaning up the rubbish behind me

ChaoticOnyx · Oct 11, 2024 · 7264a29 · 7264a29
1 parent 95dbf21
commit 7264a29
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
@@ -69,11 +69,11 @@
 //alternate button with the same functionality, except has a door control sprite instead
 /obj/machinery/button/alternate
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "doorctrl0"
+	icon_state = "doorctrl"
 
 /obj/machinery/button/alternate/on_update_icon()
 	if(active)
-		icon_state = "doorctrl0"
+		icon_state = "doorctrl"
 	else
 		icon_state = "doorctrl2"
 
@@ -105,11 +105,11 @@
 //alternate button with the same toggle functionality, except has a door control sprite instead
 /obj/machinery/button/toggle/alternate
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "doorctrl0"
+	icon_state = "doorctrl"
 
 /obj/machinery/button/toggle/alternate/on_update_icon()
 	if(active)
-		icon_state = "doorctrl0"
+		icon_state = "doorctrl"
 	else
 		icon_state = "doorctrl2"
 
@@ -150,7 +150,7 @@
 
 /obj/machinery/button/toggle/door
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "doorctrl0"
+	icon_state = "doorctrl"
 
 	var/_door_functions = 1
 /*	Bitflag, 	1 = open

diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
@@ -2,7 +2,7 @@
 	name = "remote object control"
 	desc = "It controls objects, remotely."
 	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "doorctrl0"
+	icon_state = "doorctrl"
 	power_channel = STATIC_ENVIRON
 	var/desiredstate = 0
 	var/exposedwires = 0

diff --git a/icons/effects/lighting_overlay.dmi b/icons/effects/lighting_overlay.dmi
diff --git a/icons/mob/human_races/r_human.dmi b/icons/mob/human_races/r_human.dmi
diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi
diff --git a/icons/mob/human_races/r_swine.dmi b/icons/mob/human_races/r_swine.dmi
diff --git a/icons/mob/human_races/r_tajaran.dmi b/icons/mob/human_races/r_tajaran.dmi
diff --git a/icons/mob/human_races/r_vox.dmi b/icons/mob/human_races/r_vox.dmi
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
diff --git a/maps/exodus/exodus-4.dmm b/maps/exodus/exodus-4.dmm
@@ -726,7 +726,7 @@
 "arB" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
 "arC" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
 "arD" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/machinery/light{dir = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
-"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
+"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arF" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arG" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arH" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
@@ -1032,7 +1032,7 @@
 "axw" = (/obj/machinery/door/blast/regular{name = "Assault Weapon Storage"; id = "ASSAULT"},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
 "axx" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
 "axy" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
-"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
+"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "axA" = (/obj/machinery/turret/network/centcomm,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "axB" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed)
 "axC" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control)

diff --git a/maps/frontier/frontier-2.dmm b/maps/frontier/frontier-2.dmm
@@ -694,7 +694,7 @@
 "arB" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
 "arC" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
 "arD" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/item/clothing/glasses/hud/scanners/night,/obj/machinery/light{dir = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
-"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
+"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arF" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arG" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arH" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
@@ -997,7 +997,7 @@
 "axw" = (/obj/machinery/door/blast/regular{name = "Assault Weapon Storage"; id = "ASSAULT"},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
 "axx" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
 "axy" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
-"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
+"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "axA" = (/obj/item/stool/padded,/obj/structure/reagent_dispensers/peppertank{pixel_y = 32},/turf/unsimulated/floor{icon = 'icons/turf/flooring/tiles.dmi'; icon_state = "dark_rough"; dir = 5},/area/centcom/holding)
 "axB" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed)
 "axC" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control)

diff --git a/maps/genesis/genesis-3.dmm b/maps/genesis/genesis-3.dmm
@@ -703,7 +703,7 @@
 "arB" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/signaler{pixel_y = 2},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
 "arC" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
 "arD" = (/obj/item/clothing/gloves/insulated,/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/obj/machinery/light{dir = 4},/obj/structure/table/steel,/turf/simulated/floor/shuttle/darkred,/area/syndicate_station/start)
-"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
+"arE" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "rescuebridge"; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arF" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arG" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
 "arH" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/rescue_base/start)
@@ -1006,7 +1006,7 @@
 "axw" = (/obj/machinery/door/blast/regular{name = "Assault Weapon Storage"; id = "ASSAULT"},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
 "axx" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "vault"; dir = 8},/area/centcom/specops)
 "axy" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
-"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl0"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
+"axz" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; id = "CREED"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Mech Storage"; icon_state = "doorctrl"; pixel_y = -4; id = "ASSAULT"; req_access = list(108)},/obj/machinery/button/remote/blast_door{name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; id = "ert_synth_equipment"; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "axA" = (/obj/machinery/turret/network/centcomm,/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "axB" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed)
 "axC" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control)

diff --git a/maps/polaris/polar-5.dmm b/maps/polaris/polar-5.dmm
@@ -376,7 +376,7 @@
 "ahZ" = (/obj/structure/window_frame/indestructible/hull,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/living)
 "aia" = (/turf/unsimulated/wall,/area/centcom/suppy)
 "aib" = (/turf/simulated/shuttle/wall/syndi{icon_state = "syndiwall_straight"; dir = 1},/area/polarplanet/rescue_base/start)
-"aic" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{icon_state = "doorctrl0"; id = "rescuebridge"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start)
+"aic" = (/obj/structure/table/steel_reinforced,/obj/machinery/button/remote/blast_door{icon_state = "doorctrl"; id = "rescuebridge"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start)
 "aid" = (/obj/item/modular_computer/console/preset/command,/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start)
 "aie" = (/obj/machinery/computer/shuttle_control/multi/rescue,/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start)
 "aif" = (/obj/structure/table/steel_reinforced,/obj/machinery/recharger{pixel_y = 4},/obj/machinery/light{dir = 4},/turf/simulated/floor/shuttle/black,/area/polarplanet/rescue_base/start)
@@ -623,7 +623,7 @@
 "ann" = (/obj/machinery/door/blast/regular{id = "ASSAULT"; name = "Assault Weapon Storage"},/turf/unsimulated/floor{dir = 8; icon_state = "vault"},/area/centcom/specops)
 "ano" = (/obj/structure/table/rack,/obj/item/circuitboard/borgupload,/obj/item/circuitboard/aiupload{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{dir = 8; icon_state = "vault"},/area/centcom/specops)
 "anp" = (/obj/structure/table/rack,/obj/item/storage/secure/briefcase,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter/zippo,/obj/item/storage/belt/utility,/obj/item/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
-"anq" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{id = "CREED"; name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; req_access = list(108)},/obj/machinery/button/remote/blast_door{icon_state = "doorctrl0"; id = "ASSAULT"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/obj/machinery/button/remote/blast_door{id = "ert_synth_equipment"; name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
+"anq" = (/obj/structure/table/woodentable{dir = 10},/obj/machinery/button/remote/blast_door{id = "CREED"; name = "Spec Ops Ready Room"; pixel_x = -5; pixel_y = 4; req_access = list(108)},/obj/machinery/button/remote/blast_door{icon_state = "doorctrl"; id = "ASSAULT"; name = "Mech Storage"; pixel_y = -4; req_access = list(108)},/obj/machinery/button/remote/blast_door{id = "ert_synth_equipment"; name = "Synth Equipment"; pixel_x = 5; pixel_y = 4; req_access = list(108)},/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "anr" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/unsimulated/floor{icon_state = "lino"},/area/centcom/creed)
 "ans" = (/obj/machinery/door/airlock/centcom{name = "Creed's Office"; opacity = 1; req_access = list(108)},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/creed)
 "ant" = (/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/control)