From 95d70f5d9b9e07b4fcf5e950836a85059c8fc655 Mon Sep 17 00:00:00 2001 From: mcbalaam <104003807+mcbalaam@users.noreply.github.com> Date: Sat, 8 Nov 2025 02:49:09 +0700 Subject: [PATCH] feat: removes varedited icon states from turret controls on 27(!!) maps (#93808) ## About The Pull Request Removes the varedited "icon_state" from `turretid` objects on station and away maps. Continues https://github.com/tgstation/tgstation/pull/93728, closes #93766 ## Why It's Good For The Game Those icon states don't exist anymore, making the ingame object invisible. My PR fixes that ## Changelog :cl: fix: Turret controls are visible again /:cl: --------- Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- .../RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm | 1 - _maps/RandomRuins/SpaceRuins/forgottenship.dmm | 1 - _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm | 3 +-- _maps/map_files/Deltastation/DeltaStation2.dmm | 2 -- _maps/map_files/MetaStation/MetaStation.dmm | 2 -- _maps/map_files/NebulaStation/NebulaStation.dmm | 2 -- _maps/map_files/tramstation/tramstation.dmm | 2 -- _maps/map_files/wawastation/wawastation.dmm | 2 -- _maps/shuttles/emergency_lance.dmm | 1 - _maps/shuttles/emergency_raven.dmm | 1 - _maps/shuttles/pirate_default.dmm | 1 - _maps/shuttles/pirate_ex_interdyne.dmm | 1 - _maps/shuttles/pirate_geode.dmm | 1 - _maps/shuttles/pirate_irs.dmm | 1 - _maps/shuttles/ruin_pirate_cutter.dmm | 1 - _maps/shuttles/ruin_syndicate_dropship.dmm | 1 - _maps/shuttles/ruin_syndicate_fighter_shiv.dmm | 1 - _maps/shuttles/starfury_corvette.dmm | 1 - _maps/shuttles/starfury_fighter1.dmm | 1 - _maps/shuttles/starfury_fighter2.dmm | 1 - _maps/shuttles/starfury_fighter3.dmm | 1 - _maps/shuttles/whiteship_birdshot.dmm | 1 - _maps/shuttles/whiteship_delta.dmm | 1 - _maps/shuttles/whiteship_kilo.dmm | 1 - _maps/shuttles/whiteship_meta.dmm | 1 - _maps/templates/battlecruiser_starfury.dmm | 1 - _maps/virtual_domains/syndicate_assault.dmm | 1 - .../Scripts/93808_turret_control_varedited_iconstate.txt | 1 + 28 files changed, 2 insertions(+), 33 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/93808_turret_control_varedited_iconstate.txt diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index fa4bec4dbc7..16bba329123 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -2401,7 +2401,6 @@ ailock = 1; control_area = "/area/ruin/syndicate_lava_base/main"; dir = 1; - icon_state = "control_kill"; lethal = 1; name = "Base turret controls"; pixel_y = 30; diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index 581c5b32061..3ca4c49ce36 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -1050,7 +1050,6 @@ /obj/machinery/turretid{ control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship"; enabled = 0; - icon_state = "control_kill"; lethal = 1; name = "Ship turret control panel"; pixel_y = 32; diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index f7de635024a..86a35e1f657 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -59407,8 +59407,7 @@ "qDz" = ( /obj/machinery/turretid{ control_area = "/area/station/ai/upload/chamber"; - name = "AI Upload Turret Control"; - icon_state = "control_stun" + name = "AI Upload Turret Control" }, /turf/closed/wall/r_wall, /area/station/ai/upload/foyer) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 04704302fe4..5cc46f62d59 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -6950,7 +6950,6 @@ /area/station/maintenance/solars/port/aft) "bIW" = ( /obj/machinery/turretid{ - icon_state = "control_stun"; name = "AI Chamber turret control"; pixel_x = 3; pixel_y = -23 @@ -43541,7 +43540,6 @@ "kKz" = ( /obj/machinery/turretid{ control_area = "/area/station/ai/upload/chamber"; - icon_state = "control_stun"; name = "AI Upload Turret Control"; pixel_y = -32 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 758fd0fa8e9..5d402a00027 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -37471,7 +37471,6 @@ "mSI" = ( /obj/machinery/turretid{ control_area = "/area/station/ai/upload/chamber"; - icon_state = "control_stun"; name = "AI Upload Turret Control"; pixel_y = 28 }, @@ -46737,7 +46736,6 @@ /area/station/hallway/primary/central) "qeQ" = ( /obj/machinery/turretid{ - icon_state = "control_stun"; name = "AI Chamber turret control"; pixel_x = 3; pixel_y = -23 diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index f63386622a7..612993993f1 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -20447,7 +20447,6 @@ req_access = list("ai_upload") }, /obj/machinery/turretid{ - icon_state = "control_stun"; name = "AI Chamber turret control"; pixel_x = -29; pixel_y = -6 @@ -119268,7 +119267,6 @@ "rEV" = ( /obj/machinery/turretid{ control_area = "/area/station/ai/upload/chamber"; - icon_state = "control_stun"; name = "AI Upload Turret Control"; pixel_y = 28 }, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index c75e20ab235..ea5560c14c8 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -14114,7 +14114,6 @@ "dLS" = ( /obj/machinery/turretid{ name = "AI Chamber turret control"; - icon_state = "control_stun"; pixel_x = 3; pixel_y = -23 }, @@ -66411,7 +66410,6 @@ }, /obj/machinery/turretid{ name = "AI Hallway turret control"; - icon_state = "control_stun"; pixel_x = 3; pixel_y = 28 }, diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index 1737be39835..4b8ee2d2b4a 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -42678,7 +42678,6 @@ req_access = list("ai_upload") }, /obj/machinery/turretid{ - icon_state = "control_stun"; name = "AI Chamber turret control"; pixel_x = 3; pixel_y = -23 @@ -49387,7 +49386,6 @@ "rbs" = ( /obj/machinery/turretid{ control_area = "/area/station/ai/upload/chamber"; - icon_state = "control_stun"; name = "AI Upload Turret Control"; pixel_x = -28 }, diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency_lance.dmm index 3b8dbea2cc7..2d624852afc 100644 --- a/_maps/shuttles/emergency_lance.dmm +++ b/_maps/shuttles/emergency_lance.dmm @@ -935,7 +935,6 @@ /obj/machinery/turretid{ control_area = "/area/shuttle/escape"; desc = "Used to control the Lance's automated defenses."; - icon_state = "control_kill"; lethal = 1; pixel_y = -26; req_access = list("command") diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 7eb255fc2d4..5e57e0b0d7f 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -1466,7 +1466,6 @@ "ep" = ( /obj/machinery/turretid{ desc = "Used to the Raven's automated defenses."; - icon_state = "control_kill"; lethal = 1; pixel_x = 5; pixel_y = 32; diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm index 432e3e93129..978be5b4215 100644 --- a/_maps/shuttles/pirate_default.dmm +++ b/_maps/shuttles/pirate_default.dmm @@ -407,7 +407,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_y = -24; diff --git a/_maps/shuttles/pirate_ex_interdyne.dmm b/_maps/shuttles/pirate_ex_interdyne.dmm index 4dd64e4cdbe..c6d3b733839 100644 --- a/_maps/shuttles/pirate_ex_interdyne.dmm +++ b/_maps/shuttles/pirate_ex_interdyne.dmm @@ -12,7 +12,6 @@ dir = 8 }, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_y = -24; diff --git a/_maps/shuttles/pirate_geode.dmm b/_maps/shuttles/pirate_geode.dmm index 2f6a573aae0..68266a96cff 100644 --- a/_maps/shuttles/pirate_geode.dmm +++ b/_maps/shuttles/pirate_geode.dmm @@ -258,7 +258,6 @@ dir = 4 }, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_y = -24; diff --git a/_maps/shuttles/pirate_irs.dmm b/_maps/shuttles/pirate_irs.dmm index 2bc11decda8..5249c79fa76 100644 --- a/_maps/shuttles/pirate_irs.dmm +++ b/_maps/shuttles/pirate_irs.dmm @@ -1379,7 +1379,6 @@ dir = 4 }, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; pixel_y = -24; req_access = list("syndicate") diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 422d5bfb2cd..a45eb013430 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -133,7 +133,6 @@ dir = 4 }, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_y = -30; diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index dc3e7b68a7b..3bbec262391 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -439,7 +439,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Shuttle turret control"; pixel_y = 34; diff --git a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm index f91d0260d66..08a0585dc9d 100644 --- a/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter_shiv.dmm @@ -12,7 +12,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Shuttle turret control"; pixel_x = 32; diff --git a/_maps/shuttles/starfury_corvette.dmm b/_maps/shuttles/starfury_corvette.dmm index 877375fa4e7..8e944289466 100644 --- a/_maps/shuttles/starfury_corvette.dmm +++ b/_maps/shuttles/starfury_corvette.dmm @@ -16,7 +16,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Ship Turret Control"; pixel_x = 32; diff --git a/_maps/shuttles/starfury_fighter1.dmm b/_maps/shuttles/starfury_fighter1.dmm index ae37e35c23b..68c1aa7d141 100644 --- a/_maps/shuttles/starfury_fighter1.dmm +++ b/_maps/shuttles/starfury_fighter1.dmm @@ -82,7 +82,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Ship Turret Control"; pixel_x = -32; diff --git a/_maps/shuttles/starfury_fighter2.dmm b/_maps/shuttles/starfury_fighter2.dmm index de55ea6c127..6613bd1154b 100644 --- a/_maps/shuttles/starfury_fighter2.dmm +++ b/_maps/shuttles/starfury_fighter2.dmm @@ -50,7 +50,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Ship Turret Control"; pixel_x = -32; diff --git a/_maps/shuttles/starfury_fighter3.dmm b/_maps/shuttles/starfury_fighter3.dmm index e078e7b0bfd..be6d810384f 100644 --- a/_maps/shuttles/starfury_fighter3.dmm +++ b/_maps/shuttles/starfury_fighter3.dmm @@ -49,7 +49,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_kill"; lethal = 1; name = "Ship Turret Control"; pixel_x = -32; diff --git a/_maps/shuttles/whiteship_birdshot.dmm b/_maps/shuttles/whiteship_birdshot.dmm index 8b2c99d9de1..1af752116db 100644 --- a/_maps/shuttles/whiteship_birdshot.dmm +++ b/_maps/shuttles/whiteship_birdshot.dmm @@ -1376,7 +1376,6 @@ "UK" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_y = 28; diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index a83cd9c28b6..4d3531deb3b 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -781,7 +781,6 @@ /area/shuttle/abandoned/engine) "bR" = ( /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_x = -28; diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 590c18e7868..a7a1940b5c2 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -539,7 +539,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; name = "NTMS-037 Mining Turret control panel"; diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 91e83d3e272..51329655cff 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -676,7 +676,6 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/turretid{ - icon_state = "control_kill"; lethal = 1; locked = 0; pixel_y = 28; diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index 5dd8929572b..0322aee5fc0 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -4957,7 +4957,6 @@ /obj/machinery/turretid{ ailock = 1; desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing."; - icon_state = "control_stun"; name = "Ship Turret Control"; pixel_y = -28; req_access = list("syndicate") diff --git a/_maps/virtual_domains/syndicate_assault.dmm b/_maps/virtual_domains/syndicate_assault.dmm index e1258edf041..a341ce2fe89 100644 --- a/_maps/virtual_domains/syndicate_assault.dmm +++ b/_maps/virtual_domains/syndicate_assault.dmm @@ -318,7 +318,6 @@ /obj/machinery/turretid{ control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship"; enabled = 0; - icon_state = "control_kill"; lethal = 1; name = "Ship turret control panel"; pixel_y = 32; diff --git a/tools/UpdatePaths/Scripts/93808_turret_control_varedited_iconstate.txt b/tools/UpdatePaths/Scripts/93808_turret_control_varedited_iconstate.txt new file mode 100644 index 00000000000..f90f797eab9 --- /dev/null +++ b/tools/UpdatePaths/Scripts/93808_turret_control_varedited_iconstate.txt @@ -0,0 +1 @@ +/obj/machinery/turretid{icon_state=@ANY} : /obj/machinery/turretid{@OLD;icon_state=@SKIP}