From 8009eea9636b9753aafb30ad4e1f1d65dfe79293 Mon Sep 17 00:00:00 2001 From: GuiltyNeko Date: Sat, 30 Apr 2022 08:14:50 -0700 Subject: [PATCH] Ree unused code (#17625) --- _maps/map_files/Delta/delta.dmm | 4 --- _maps/map_files/MetaStation/MetaStation.dmm | 12 --------- .../map_files/RandomRuins/SpaceRuins/ussp.dmm | 25 +++++-------------- _maps/map_files/RandomZLevels/centcomAway.dmm | 13 +--------- _maps/map_files/cyberiad/cyberiad.dmm | 12 --------- code/modules/power/solar.dm | 2 -- 6 files changed, 7 insertions(+), 61 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 33d68e3ef30..9a05a2c33e7 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -12397,7 +12397,6 @@ "aKY" = ( /obj/machinery/power/solar_control{ dir = 4; - id = "portsolar"; name = "Aft Port Solar Control" }, /obj/structure/cable, @@ -16707,7 +16706,6 @@ "aUt" = ( /obj/machinery/power/solar_control{ dir = 8; - id = "auxsolareast"; name = "Fore Starboard Solar Control" }, /obj/structure/cable, @@ -89154,7 +89152,6 @@ "dRo" = ( /obj/machinery/power/solar_control{ dir = 4; - id = "portsolar"; name = "Aft Port Solar Control" }, /obj/structure/cable, @@ -97372,7 +97369,6 @@ }, /obj/machinery/power/solar_control{ dir = 8; - id = "starboardsolar"; name = "Aft Starboard Solar Control" }, /obj/structure/cable, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 786896908b3..eed40707aa8 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -94,7 +94,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "foreport"; name = "Fore-Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -210,7 +209,6 @@ "ace" = ( /obj/structure/cable, /obj/machinery/power/solar{ - id = "foreport"; name = "Fore-Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -933,7 +931,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "forestarboard"; name = "Fore-Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -1963,7 +1960,6 @@ "ago" = ( /obj/structure/cable, /obj/machinery/power/solar{ - id = "forestarboard"; name = "Fore-Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -3600,7 +3596,6 @@ icon_state = "0-4" }, /obj/machinery/power/solar_control{ - id = "foreport"; name = "Fore Port Solar Control" }, /turf/simulated/floor/plating, @@ -7526,7 +7521,6 @@ icon_state = "0-4" }, /obj/machinery/power/solar_control{ - id = "forestarboard"; name = "Fore Starboard Solar Control" }, /turf/simulated/floor/plating, @@ -48763,7 +48757,6 @@ /obj/structure/cable, /obj/machinery/power/solar_control{ dir = 1; - id = "aftport"; name = "Aft Port Solar Control" }, /turf/simulated/floor/plating, @@ -57234,7 +57227,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "aftport"; name = "Aft-Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -60276,7 +60268,6 @@ "cCt" = ( /obj/structure/cable, /obj/machinery/power/solar{ - id = "aftport"; name = "Aft-Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -71252,7 +71243,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "aftstarboard"; name = "Aft-Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -72922,7 +72912,6 @@ "ddk" = ( /obj/structure/cable, /obj/machinery/power/solar{ - id = "aftstarboard"; name = "Aft-Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -81795,7 +81784,6 @@ /obj/structure/cable, /obj/machinery/power/solar_control{ dir = 1; - id = "aftstarboard"; name = "Aft Starboard Solar Control" }, /turf/simulated/floor/plating, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 03ee41aa11b..725f9ca4be4 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -2923,7 +2923,6 @@ }) "gj" = ( /obj/machinery/power/solar_control{ - id = "russolar"; track = 2 }, /obj/structure/cable{ @@ -3298,17 +3297,13 @@ }, /area/derelict/crew_quarters) "gY" = ( -/obj/machinery/power/solar{ - id = "russolar" - }, +/obj/machinery/power/solar, /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, /area/derelict/solar_control) "gZ" = ( -/obj/machinery/power/solar{ - id = "russolar" - }, +/obj/machinery/power/solar, /obj/structure/cable{ d2 = 2; icon_state = "0-2"; @@ -3452,9 +3447,7 @@ }, /area/derelict/crew_quarters) "hp" = ( -/obj/machinery/power/solar{ - id = "russolar" - }, +/obj/machinery/power/solar, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -3472,9 +3465,7 @@ /turf/template_noop, /area/space/nearstation) "hr" = ( -/obj/machinery/power/solar{ - id = "russolar" - }, +/obj/machinery/power/solar, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -3484,9 +3475,7 @@ }, /area/derelict/solar_control) "hs" = ( -/obj/machinery/power/solar{ - id = "russolar" - }, +/obj/machinery/power/solar, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -5609,9 +5598,7 @@ }, /area/derelict/crew_quarters) "lH" = ( -/obj/machinery/power/solar{ - id = "russolar" - }, +/obj/machinery/power/solar, /obj/structure/cable, /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm index 65fee4f02e7..f092dd218af 100644 --- a/_maps/map_files/RandomZLevels/centcomAway.dmm +++ b/_maps/map_files/RandomZLevels/centcomAway.dmm @@ -666,7 +666,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "centcomawaysolar"; name = "Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -1066,7 +1065,6 @@ /area/awaymission/centcomAway/hangar) "dk" = ( /obj/machinery/power/solar_control{ - id = "centcomawaysolar"; name = "Solar Control"; track = 1 }, @@ -2549,8 +2547,7 @@ }, /obj/item/radio/intercom{ name = "custom placement"; - pixel_y = 25; - dir = 2 + pixel_y = 25 }, /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -2922,7 +2919,6 @@ "iC" = ( /obj/machinery/door/airlock/centcom{ name = "Centcom Security"; - opacity = 1; req_access_txt = "101" }, /turf/simulated/floor/carpet, @@ -3438,7 +3434,6 @@ "jN" = ( /obj/machinery/door/airlock/centcom{ name = "Centcom Security"; - opacity = 1; req_access_txt = "101" }, /turf/simulated/floor/plasteel{ @@ -3551,7 +3546,6 @@ "kc" = ( /obj/machinery/door/airlock/centcom{ name = "Special Operations"; - opacity = 1; req_access_txt = "103" }, /turf/simulated/floor/plasteel{ @@ -3601,7 +3595,6 @@ "kk" = ( /obj/machinery/door/airlock/centcom{ name = "Centcom Security"; - opacity = 1; req_access_txt = "101" }, /turf/simulated/floor/plasteel{ @@ -3986,7 +3979,6 @@ "lj" = ( /obj/machinery/door/airlock/centcom{ name = "Centcom Security"; - opacity = 1; req_access_txt = "101" }, /turf/simulated/floor/plasteel{ @@ -4215,7 +4207,6 @@ "lP" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Administration"; - opacity = 1; req_access_txt = "102" }, /turf/simulated/floor/plating, @@ -5717,7 +5708,6 @@ "pF" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome"; - opacity = 1; req_access_txt = "101" }, /turf/simulated/floor/plasteel{ @@ -5804,7 +5794,6 @@ "pR" = ( /obj/machinery/door/airlock/centcom{ name = "Thunderdome Administration"; - opacity = 1; req_access_txt = "102" }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 53148af99a0..36ae4dde2ac 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -5376,7 +5376,6 @@ icon_state = "0-4" }, /obj/machinery/power/solar{ - id = "portsolar"; name = "Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -5389,7 +5388,6 @@ icon_state = "0-8" }, /obj/machinery/power/solar{ - id = "portsolar"; name = "Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -6591,7 +6589,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "auxsolareast"; name = "Port Auxiliary Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -7485,7 +7482,6 @@ "atF" = ( /obj/structure/cable, /obj/machinery/power/solar{ - id = "auxsolareast"; name = "Port Auxiliary Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -12317,7 +12313,6 @@ icon_state = "0-4" }, /obj/machinery/power/solar_control{ - id = "auxsolareast"; name = "Fore Port Solar Control" }, /turf/simulated/floor/plating, @@ -13781,7 +13776,6 @@ pixel_y = 32 }, /obj/machinery/power/solar_control{ - id = "auxsolareast"; name = "Fore Starboard Solar Control" }, /turf/simulated/floor/plating, @@ -66498,7 +66492,6 @@ icon_state = "0-4" }, /obj/machinery/power/solar{ - id = "portsolar"; name = "Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -66565,7 +66558,6 @@ icon_state = "0-8" }, /obj/machinery/power/solar{ - id = "portsolar"; name = "Port Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -69986,7 +69978,6 @@ /obj/structure/cable, /obj/machinery/power/solar_control{ dir = 4; - id = "portsolar"; name = "Aft Port Solar Control" }, /turf/simulated/floor/plating, @@ -74076,7 +74067,6 @@ }, /obj/machinery/power/solar_control{ dir = 1; - id = "starboardsolar"; name = "Aft Starboard Solar Control" }, /turf/simulated/floor/plating, @@ -77940,7 +77930,6 @@ icon_state = "0-2" }, /obj/machinery/power/solar{ - id = "starboardsolar"; name = "Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ @@ -78123,7 +78112,6 @@ "doG" = ( /obj/structure/cable, /obj/machinery/power/solar{ - id = "starboardsolar"; name = "Starboard Solar Array" }, /turf/simulated/floor/plasteel/airless{ diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index be4e8d9bb91..e35b17ea9cc 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -11,7 +11,6 @@ active_power_usage = 0 max_integrity = 150 integrity_failure = 50 - var/id = 0 var/obscured = 0 var/sunfrac = 0 var/adir = SOUTH // actual dir @@ -270,7 +269,6 @@ integrity_failure = 100 var/icon_screen = "solar" var/icon_keyboard = "power_key" - var/id = 0 var/cdir = 0 var/targetdir = 0 // target angle in manual tracking (since it updates every game minute) var/gen = 0