From e796dade1f7dbf35fc2bd83920c6934e856f5e47 Mon Sep 17 00:00:00 2001 From: Morrow Date: Wed, 25 Oct 2023 23:39:12 -0400 Subject: [PATCH] da maps --- maps/interiors/tank.dmm | 2 +- maps/map_files/BigRed/BigRed.dmm | 48 +++++++-------- .../BigRed/sprinkles/70.se-checkpoint.dmm | 2 +- .../map_files/BigRed/standalone/medbay-v3.dmm | 4 +- maps/map_files/CORSAT/Corsat.dmm | 20 +++---- maps/map_files/DesertDam/Desert_Dam.dmm | 2 +- .../FOP_v2_Cellblocks/Prison_Station_FOP.dmm | 10 ++-- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 30 +++++----- .../sprinkles/20.medicalhold.dmm | 2 +- .../Ice_Colony_v3/Shivas_Snowball.dmm | 2 +- maps/map_files/Kutjevo/Kutjevo.dmm | 4 +- .../LV522_Chances_Claim.dmm | 52 ++++++++--------- maps/map_files/LV624/LV624.dmm | 24 ++++---- maps/map_files/LV624/armory/10.cheese.dmm | 2 +- maps/map_files/LV624/armory/10.extra.dmm | 2 +- maps/map_files/LV624/armory/10.looted.dmm | 2 +- maps/map_files/LV624/medbay/10.destroyed.dmm | 2 +- .../LV624/medbay/30.larvasurgery.dmm | 2 +- maps/map_files/LV624/science/10.yautja.dmm | 2 +- .../LV624/science/40.fullylocked.dmm | 2 +- maps/map_files/LV624/standalone/clfship.dmm | 8 +-- maps/map_files/LV624/standalone/laststand.dmm | 2 +- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 54 ++++++++--------- maps/map_files/USS_Almayer/USS_Almayer.dmm | 58 +++++++++---------- maps/map_files/golden_arrow/golden_arrow.dmm | 2 +- maps/shuttles/dropship_alamo.dmm | 2 +- maps/shuttles/dropship_normandy.dmm | 2 +- maps/templates/clf_ert_station.dmm | 2 +- maps/templates/upp_ert_station.dmm | 2 +- maps/templates/weyland_ert_station.dmm | 4 +- .../Scripts/phone-component-switch.txt | 13 +++++ 31 files changed, 189 insertions(+), 176 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/phone-component-switch.txt diff --git a/maps/interiors/tank.dmm b/maps/interiors/tank.dmm index 75da1e24f7..8dc0bf1419 100644 --- a/maps/interiors/tank.dmm +++ b/maps/interiors/tank.dmm @@ -6,7 +6,7 @@ name = "back entrance marker"; tag = "back" }, -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 8; layer = 3.1; name = "Tank Telephone"; diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 6439378dba..e9b77c1ca9 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -1328,7 +1328,7 @@ /obj/structure/machinery/computer/telecomms/monitor{ req_one_access_txt = "19;200" }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "Solaris Ridge"; phone_color = "yellow"; @@ -2958,7 +2958,7 @@ "aiG" = ( /obj/structure/surface/table, /obj/item/handcuffs, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_color = "red"; phone_id = "Marshal Office" @@ -7964,7 +7964,7 @@ "awB" = ( /obj/structure/surface/table/holotable/wood, /obj/item/reagent_container/food/drinks/coffee, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lambda Labs"; phone_color = "blue"; phone_id = "Administration" @@ -9835,7 +9835,7 @@ /obj/item/device/healthanalyzer, /obj/structure/pipes/vents/pump, /obj/item/reagent_container/spray/cleaner, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Solaris Ridge"; phone_color = "green"; phone_id = "Clinic"; @@ -11088,7 +11088,7 @@ "aFl" = ( /obj/structure/surface/table, /obj/effect/spawner/random/technology_scanner, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "Eta Labs"; phone_id = "Observation"; @@ -14186,7 +14186,7 @@ dir = 4; health = 80 }, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_color = "blue"; phone_id = "Administration" @@ -14648,7 +14648,7 @@ /area/bigredv2/caves/eta/storage) "aOQ" = ( /obj/structure/surface/table, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Eta Labs"; phone_color = "Blue"; phone_id = "Director" @@ -14778,7 +14778,7 @@ /area/bigredv2/outside/hydroponics) "aPf" = ( /obj/structure/surface/table, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Eta Labs"; phone_id = "Workshop" }, @@ -15068,7 +15068,7 @@ dir = 4; health = 80 }, -/obj/item/phone, +/obj/item/handset, /turf/open/floor{ dir = 4; icon_state = "warnwhite" @@ -17370,7 +17370,7 @@ /obj/structure/bed/chair/office/dark{ dir = 4 }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Solaris Ridge"; phone_color = "blue"; phone_id = "Operations"; @@ -22512,7 +22512,7 @@ dir = 4 }, /obj/structure/surface/table/reinforced, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lambda Labs"; phone_id = "Virology" }, @@ -22833,7 +22833,7 @@ /area/bigredv2/outside/filtration_plant) "boY" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Solaris Ridge"; phone_color = "yellow"; phone_id = "Filtration"; @@ -23347,7 +23347,7 @@ /obj/structure/surface/table, /obj/effect/spawner/random/technology_scanner, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Solaris Ridge"; phone_color = "yellow"; phone_id = "Engineering"; @@ -24065,7 +24065,7 @@ "bwr" = ( /obj/structure/machinery/light, /obj/structure/surface/table, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_color = "green"; phone_id = "Virology Lab" @@ -24158,7 +24158,7 @@ "bwQ" = ( /obj/structure/surface/table, /obj/item/tool/screwdriver, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Eta Labs"; phone_color = "yellow"; phone_id = "Robotics" @@ -25169,7 +25169,7 @@ "bzF" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tech_supply, -/obj/item/phone, +/obj/item/handset, /turf/open/floor{ dir = 1; icon_state = "darkblue2" @@ -27603,7 +27603,7 @@ /area/bigredv2/caves_sw) "daB" = ( /obj/structure/surface/table/reinforced, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lambda Labs"; phone_id = "Xenobiology" }, @@ -28788,7 +28788,7 @@ }, /area/bigredv2/caves/eta/living) "fyO" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Solaris Ridge"; phone_color = "green"; phone_id = "Clinic Labs"; @@ -28898,7 +28898,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lambda Labs"; phone_id = "Surgery"; pixel_y = 24 @@ -29563,7 +29563,7 @@ }, /area/bigredv2/outside/filtration_plant) "htp" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ do_not_disturb = 1; dir = 4; phone_category = "Lambda Labs"; @@ -31175,7 +31175,7 @@ }, /area/bigredv2/caves/eta/xenobiology) "kyz" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "Eta Labs"; phone_id = "Observation"; @@ -32691,7 +32691,7 @@ /area/bigredv2/caves/mining) "ofJ" = ( /obj/structure/surface/table, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Eta Labs"; phone_color = "red"; phone_id = "Security" @@ -36454,7 +36454,7 @@ /area/bigredv2/caves_research) "vBT" = ( /obj/structure/surface/table/reinforced, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_id = "Clinic Reception" }, @@ -36812,7 +36812,7 @@ /area/bigredv2/outside/w) "wry" = ( /obj/structure/surface/table, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_color = "blue"; phone_id = "Space Port" diff --git a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm index 8907ab630f..ec219d07b9 100644 --- a/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm +++ b/maps/map_files/BigRed/sprinkles/70.se-checkpoint.dmm @@ -69,7 +69,7 @@ /area/bigredv2/outside/filtration_cave_cas) "kd" = ( /obj/structure/surface/table/almayer, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_color = "red"; phone_id = "Filtration Checkpoint" diff --git a/maps/map_files/BigRed/standalone/medbay-v3.dmm b/maps/map_files/BigRed/standalone/medbay-v3.dmm index 2e89ccc9f4..ae681377cb 100644 --- a/maps/map_files/BigRed/standalone/medbay-v3.dmm +++ b/maps/map_files/BigRed/standalone/medbay-v3.dmm @@ -1729,7 +1729,7 @@ /area/bigredv2/outside/medical) "eD" = ( /obj/structure/surface/table/reinforced, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Solaris Ridge"; phone_id = "Clinic Reception" }, @@ -2055,7 +2055,7 @@ }, /area/bigredv2/outside/medical) "Xh" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Solaris Ridge"; phone_color = "green"; phone_id = "Clinic Labs"; diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index e265184172..c95caf2a9b 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -16467,7 +16467,7 @@ /turf/open/floor/wood, /area/corsat/gamma/administration) "aTJ" = ( -/obj/item/phone, +/obj/item/handset, /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/surface/table/woodentable/fancy, /turf/open/floor{ @@ -25672,7 +25672,7 @@ /area/corsat/omega/offices) "bug" = ( /obj/structure/surface/table/almayer, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ dir = 8; icon_state = "bluegrey" @@ -29328,7 +29328,7 @@ /area/corsat/omega/hangar/security) "bEt" = ( /obj/structure/surface/table/reinforced, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ dir = 8; icon_state = "red" @@ -36395,7 +36395,7 @@ /area/corsat/gamma/hangar/cargo) "csM" = ( /obj/structure/surface/table/almayer, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ icon_state = "bluegreycorner" }, @@ -38369,7 +38369,7 @@ /area/corsat/sigma/biodome/gunrange) "dYh" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/item/phone, +/obj/item/handset, /turf/open/floor{ dir = 8; icon_state = "carpet15-15" @@ -41794,7 +41794,7 @@ /area/corsat/theta/airlock/east/id) "gwW" = ( /obj/structure/surface/table/reinforced, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ dir = 10; icon_state = "red" @@ -48246,7 +48246,7 @@ /area/corsat/gamma/biodome/complex) "lnW" = ( /obj/structure/surface/table/reinforced, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ dir = 4; icon_state = "purplewhite" @@ -48818,7 +48818,7 @@ /area/corsat/sigma/south/complex) "lIX" = ( /obj/structure/surface/table/reinforced, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ icon_state = "purplewhite" }, @@ -54498,7 +54498,7 @@ dir = 4; health = 80 }, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/corsat{ icon_state = "blue" }, @@ -64466,7 +64466,7 @@ /obj/item/ashtray/plastic{ pixel_x = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -4; pixel_y = 4 }, diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 17a02d24ce..d7a3cd48f8 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -8246,7 +8246,7 @@ "ayG" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tech_supply, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/prison{ dir = 1; icon_state = "blue" diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 0fd8b269d3..9cd11760c2 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -17167,7 +17167,7 @@ }, /area/prison/security/checkpoint/highsec/n) "aWF" = ( -/obj/item/phone, +/obj/item/handset, /obj/structure/surface/table/reinforced, /turf/open/floor/prison{ dir = 9; @@ -18315,7 +18315,7 @@ /turf/open/floor/prison, /area/prison/kitchen) "bag" = ( -/obj/item/phone, +/obj/item/handset, /obj/structure/surface/table/reinforced, /turf/open/floor{ icon_state = "hydrofloor" @@ -20844,7 +20844,7 @@ }, /area/prison/cellblock/vip) "bhq" = ( -/obj/item/phone, +/obj/item/handset, /obj/structure/surface/table/reinforced, /turf/open/floor/prison{ icon_state = "cell_stripe" @@ -23437,7 +23437,7 @@ }, /area/prison/cellblock/vip) "boR" = ( -/obj/item/phone, +/obj/item/handset, /obj/structure/surface/table/reinforced, /turf/open/floor/prison{ dir = 1; @@ -37320,7 +37320,7 @@ /turf/open/floor/prison, /area/prison/recreation/medsec) "cgm" = ( -/obj/item/phone, +/obj/item/handset, /obj/structure/surface/table/reinforced, /turf/open/floor/prison, /area/prison/recreation/medsec) diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 660c219af5..fd4c360e7e 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -2035,7 +2035,7 @@ /area/fiorina/station/botany) "bck" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_y = 7 }, /turf/open/floor/prison{ @@ -11656,7 +11656,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -11946,7 +11946,7 @@ }, /area/fiorina/station/lowsec) "hob" = ( -/obj/item/phone{ +/obj/item/handset{ pixel_y = 7 }, /turf/open/floor/plating/prison, @@ -12421,11 +12421,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 7; pixel_y = -16 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -3; pixel_y = 16 }, @@ -16569,11 +16569,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 6; pixel_y = -15 }, -/obj/item/phone{ +/obj/item/handset{ pixel_y = 7 }, /turf/open/floor/prison{ @@ -17733,7 +17733,7 @@ /area/fiorina/station/transit_hub) "kLX" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/prison{ dir = 10; icon_state = "sterile_white" @@ -19893,7 +19893,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -3; pixel_y = 13 }, @@ -21789,7 +21789,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -3; pixel_y = 13 }, @@ -31826,7 +31826,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/medbay) "tER" = ( -/obj/item/phone{ +/obj/item/handset{ pixel_x = 9; pixel_y = -10 }, @@ -34510,11 +34510,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -3; pixel_y = 10 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 9; pixel_y = -10 }, @@ -36440,10 +36440,10 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_y = -4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 7; pixel_y = 10 }, diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm index 0043ae9f1c..368d8e5faa 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.medicalhold.dmm @@ -494,7 +494,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -3; pixel_y = 13 }, diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index d777aaf2e7..0332274d42 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -11183,7 +11183,7 @@ pixel_y = 5 }, /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = -12; pixel_y = 7 }, diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index fdc0fdea32..f82f8bc42d 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -3336,7 +3336,7 @@ /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/power) "ewF" = ( -/obj/item/phone{ +/obj/item/handset{ pixel_x = 1; pixel_y = 4 }, @@ -8059,7 +8059,7 @@ dir = 8 }, /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 5; pixel_y = -4 }, diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index e798127468..7559e07353 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -1367,7 +1367,7 @@ }, /area/lv522/indoors/a_block/dorms) "aNn" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Colony Corporate"; @@ -2377,7 +2377,7 @@ /area/lv522/indoors/c_block/garage) "bny" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Reactor Garage"; @@ -8838,7 +8838,7 @@ /area/lv522/oob) "ebR" = ( /obj/structure/surface/table/almayer, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 1; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -11205,7 +11205,7 @@ /obj/structure/platform{ dir = 8 }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "LZ1 Service Tunnel"; @@ -11478,7 +11478,7 @@ /area/lv522/landing_zone_2) "ffO" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 8; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -17534,7 +17534,7 @@ "huX" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 1; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -18627,7 +18627,7 @@ "hPQ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "LV522 Chances Claim"; phone_id = "Chief Engineer Office"; pixel_x = -2; @@ -19659,7 +19659,7 @@ /area/lv522/landing_zone_1/tunnel) "ike" = ( /obj/item/prop/alien/hugger, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -22663,7 +22663,7 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -23515,7 +23515,7 @@ /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/oob) "jEF" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Reactor Meeting Room"; @@ -29654,7 +29654,7 @@ /area/lv522/landing_zone_2) "lSP" = ( /obj/structure/surface/table/almayer, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "LV522 Chances Claim"; phone_id = "Colony Operations Centre"; pixel_y = 6 @@ -30067,7 +30067,7 @@ "mbw" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Colony Dining"; @@ -31010,7 +31010,7 @@ /turf/open/floor/grass, /area/lv522/indoors/a_block/garden) "mtM" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -31032,7 +31032,7 @@ "muO" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 1; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -32905,7 +32905,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) "nem" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Colony Northern Dorms"; @@ -34187,7 +34187,7 @@ /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) "nDS" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Colony Dorms"; @@ -36356,7 +36356,7 @@ }, /area/lv522/outdoors/colony_streets/north_west_street) "osm" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Reactor Sewer"; @@ -37068,7 +37068,7 @@ }, /area/lv522/indoors/a_block/admin) "oHR" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 4; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -37219,7 +37219,7 @@ }, /area/lv522/atmos/east_reactor/south) "oKN" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Reactor Central Office"; @@ -41954,7 +41954,7 @@ }, /area/lv522/indoors/a_block/dorms) "qyp" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Reactor Eastern Reactor Control"; @@ -42387,7 +42387,7 @@ /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) "qGh" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Colony Fitness"; @@ -44203,7 +44203,7 @@ "rjl" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/decal/cleanable/blood, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "LV522 Chances Claim"; phone_color = "red"; phone_id = "Reactor Entrance Office"; @@ -47074,7 +47074,7 @@ /area/lv522/landing_zone_2) "slt" = ( /obj/structure/surface/table/almayer, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "LV522 Chances Claim"; phone_id = "Reactor Control"; pixel_y = 6 @@ -55594,7 +55594,7 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 8; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -59282,7 +59282,7 @@ /area/lv522/indoors/a_block/admin) "wDu" = ( /obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 8; phone_category = "LV522 Chances Claim"; phone_color = "red"; @@ -60553,7 +60553,7 @@ /area/lv522/outdoors/colony_streets/north_street) "xfS" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ dir = 1; phone_category = "LV522 Chances Claim"; phone_color = "red"; diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 20757954b5..80da4a7381 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -4750,7 +4750,7 @@ /obj/structure/machinery/light{ dir = 8 }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_id = "Research Dome"; pixel_y = 24 @@ -5744,7 +5744,7 @@ /area/lv624/lazarus/sleep_female) "aBe" = ( /obj/structure/surface/table, -/obj/item/phone, +/obj/item/handset, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor{ dir = 9; @@ -8068,7 +8068,7 @@ }, /area/lv624/lazarus/main_hall) "aJC" = ( -/obj/item/phone{ +/obj/item/handset{ desc = "A model of an ancient Earth communication device."; force = 8 }, @@ -8640,7 +8640,7 @@ pixel_x = 6; pixel_y = 14 }, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lazarus Landing"; phone_color = "red"; phone_id = "Marshal Office" @@ -11548,7 +11548,7 @@ "aXt" = ( /obj/structure/surface/rack, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_color = "yellow"; phone_id = "Engineering"; @@ -11861,7 +11861,7 @@ "aYJ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/trash/chips, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lazarus Landing"; phone_color = "blue"; phone_id = "Director's Office" @@ -14986,7 +14986,7 @@ /turf/open/gm/river, /area/lv624/ground/river/central_river) "hXt" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_id = "Lakeside Bar"; pixel_y = 32 @@ -17005,7 +17005,7 @@ }, /area/lv624/ground/barrens/west_barrens) "nrP" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_id = "Cargo"; pixel_y = 24 @@ -18086,7 +18086,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lazarus Landing"; phone_id = "Medbay" }, @@ -18254,7 +18254,7 @@ pixel_x = 25; pixel_y = -5 }, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_color = "blue"; phone_id = "Corporate Office"; @@ -19042,7 +19042,7 @@ /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_tcomms_road) "rVH" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_color = "yellow"; phone_id = "Communications"; @@ -20048,7 +20048,7 @@ }, /area/lv624/ground/caves/sand_temple) "ulp" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_color = "red"; phone_id = "Secure Storage"; diff --git a/maps/map_files/LV624/armory/10.cheese.dmm b/maps/map_files/LV624/armory/10.cheese.dmm index af57be0474..b16499db31 100644 --- a/maps/map_files/LV624/armory/10.cheese.dmm +++ b/maps/map_files/LV624/armory/10.cheese.dmm @@ -17,7 +17,7 @@ }, /area/lv624/lazarus/main_hall) "d" = ( -/obj/item/phone{ +/obj/item/handset{ desc = "A model of an ancient Earth communication device."; force = 8 }, diff --git a/maps/map_files/LV624/armory/10.extra.dmm b/maps/map_files/LV624/armory/10.extra.dmm index 6ac8be8435..e407d06c85 100644 --- a/maps/map_files/LV624/armory/10.extra.dmm +++ b/maps/map_files/LV624/armory/10.extra.dmm @@ -17,7 +17,7 @@ }, /area/lv624/lazarus/main_hall) "d" = ( -/obj/item/phone{ +/obj/item/handset{ desc = "A model of an ancient Earth communication device."; force = 8 }, diff --git a/maps/map_files/LV624/armory/10.looted.dmm b/maps/map_files/LV624/armory/10.looted.dmm index cf9c2d141a..40e2637415 100644 --- a/maps/map_files/LV624/armory/10.looted.dmm +++ b/maps/map_files/LV624/armory/10.looted.dmm @@ -18,7 +18,7 @@ }, /area/lv624/lazarus/main_hall) "d" = ( -/obj/item/phone{ +/obj/item/handset{ desc = "A model of an ancient Earth communication device."; force = 8 }, diff --git a/maps/map_files/LV624/medbay/10.destroyed.dmm b/maps/map_files/LV624/medbay/10.destroyed.dmm index bf310be7dd..d0f71603dd 100644 --- a/maps/map_files/LV624/medbay/10.destroyed.dmm +++ b/maps/map_files/LV624/medbay/10.destroyed.dmm @@ -129,7 +129,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lazarus Landing"; phone_id = "Medbay" }, diff --git a/maps/map_files/LV624/medbay/30.larvasurgery.dmm b/maps/map_files/LV624/medbay/30.larvasurgery.dmm index 613b76c3e2..7a773c4c6d 100644 --- a/maps/map_files/LV624/medbay/30.larvasurgery.dmm +++ b/maps/map_files/LV624/medbay/30.larvasurgery.dmm @@ -515,7 +515,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/transmitter/colony_net/rotary{ +/obj/structure/phone_base/colony_net/rotary{ phone_category = "Lazarus Landing"; phone_id = "Medbay" }, diff --git a/maps/map_files/LV624/science/10.yautja.dmm b/maps/map_files/LV624/science/10.yautja.dmm index 7c8df9531d..52130f95fc 100644 --- a/maps/map_files/LV624/science/10.yautja.dmm +++ b/maps/map_files/LV624/science/10.yautja.dmm @@ -172,7 +172,7 @@ dir = 8 }, /obj/effect/landmark/crap_item, -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_id = "Research Dome"; pixel_y = 24 diff --git a/maps/map_files/LV624/science/40.fullylocked.dmm b/maps/map_files/LV624/science/40.fullylocked.dmm index 1957d6fef0..b6124474f9 100644 --- a/maps/map_files/LV624/science/40.fullylocked.dmm +++ b/maps/map_files/LV624/science/40.fullylocked.dmm @@ -409,7 +409,7 @@ }, /area/lv624/lazarus/research) "oe" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ phone_category = "Lazarus Landing"; phone_id = "Research Dome"; pixel_y = 24 diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index e69c2de5bc..2700593a2a 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -161,7 +161,7 @@ }, /area/lv624/lazarus/crashed_ship) "fA" = ( -/obj/structure/transmitter/clf_net{ +/obj/structure/phone_base/clf_net{ phone_category = "CR-116"; phone_id = "Armoury"; pixel_y = 32 @@ -664,7 +664,7 @@ "sI" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, -/obj/structure/transmitter/clf_net/rotary{ +/obj/structure/phone_base/clf_net/rotary{ phone_category = "CR-116"; phone_color = "yellow"; phone_id = "Engineering" @@ -1657,7 +1657,7 @@ /area/lv624/lazarus/crashed_ship) "Qj" = ( /obj/structure/machinery/body_scanconsole, -/obj/structure/transmitter/clf_net{ +/obj/structure/phone_base/clf_net{ phone_category = "CR-116"; phone_color = "green"; phone_id = "Medical Bay"; @@ -1987,7 +1987,7 @@ }, /area/lv624/lazarus/crashed_ship) "XM" = ( -/obj/structure/transmitter/clf_net{ +/obj/structure/phone_base/clf_net{ phone_category = "CR-116"; phone_id = "Cargo Bay"; pixel_y = 32 diff --git a/maps/map_files/LV624/standalone/laststand.dmm b/maps/map_files/LV624/standalone/laststand.dmm index 43201f92cb..ebdb595397 100644 --- a/maps/map_files/LV624/standalone/laststand.dmm +++ b/maps/map_files/LV624/standalone/laststand.dmm @@ -404,7 +404,7 @@ /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) "Yc" = ( -/obj/structure/transmitter/colony_net{ +/obj/structure/phone_base/colony_net{ pixel_y = 32; phone_category = "Lazarus Landing"; phone_id = "Lakeside Bar" diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 328e450fba..d34d18de84 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -1306,7 +1306,7 @@ /area/strata/ug/interior) "adR" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -4512,7 +4512,7 @@ /area/strata/ag/interior/research_decks/security) "anv" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -4540,7 +4540,7 @@ /area/strata/ag/exterior/research_decks) "anz" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -4819,7 +4819,7 @@ /area/strata/ag/interior/outpost/security) "aoD" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -6165,7 +6165,7 @@ /area/strata/ag/interior/outpost/security) "asB" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -6252,7 +6252,7 @@ /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "asP" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -7055,7 +7055,7 @@ "avj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -7274,7 +7274,7 @@ dir = 8 }, /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -8812,7 +8812,7 @@ /area/strata/ag/interior/outpost/security) "aAC" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -8842,7 +8842,7 @@ "aAG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -12599,7 +12599,7 @@ pixel_x = -10 }, /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -14807,7 +14807,7 @@ /area/strata/ag/interior/outpost/admin) "aTN" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -15826,7 +15826,7 @@ /area/strata/ag/interior/mountain) "aXH" = ( /obj/structure/surface/table, -/obj/item/phone, +/obj/item/handset, /turf/open/floor/strata, /area/strata/ag/interior/dorms/south) "aXI" = ( @@ -17987,7 +17987,7 @@ /area/strata/ag/exterior/paths/adminext) "bfF" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -20087,7 +20087,7 @@ "bnI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -21469,7 +21469,7 @@ /area/strata/ag/interior/outpost/admin) "bsH" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -23500,7 +23500,7 @@ /area/strata/ag/interior/outpost/med) "bBY" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -23736,7 +23736,7 @@ /obj/item/paper_bin, /obj/item/tool/pen/blue, /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -24098,7 +24098,7 @@ /area/strata/ag/interior/outpost/med) "bGx" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -24569,7 +24569,7 @@ /area/strata/ag/interior/outpost/med) "bJW" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -27900,7 +27900,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, /obj/item/tool/pen/blue, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -28071,7 +28071,7 @@ /area/strata/ag/interior/outpost/engi/drome/shuttle) "clr" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -29755,7 +29755,7 @@ dir = 1 }, /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -31540,7 +31540,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, /obj/item/tool/pen/blue, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -31654,7 +31654,7 @@ "gkA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -32113,7 +32113,7 @@ /area/strata/ag/exterior/research_decks) "haw" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, @@ -37528,7 +37528,7 @@ /area/strata/ag/interior/mountain) "qzf" = ( /obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ +/obj/item/handset{ pixel_x = 8; pixel_y = 6 }, diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 91450070b8..780c165858 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -1576,7 +1576,7 @@ /area/almayer/shipboard/starboard_missiles) "afb" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 4; name = "Starboard Railgun Control Telephone"; phone_category = "Command"; @@ -5561,7 +5561,7 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 8; name = "OT Telephone"; phone_category = "Almayer"; @@ -6983,7 +6983,7 @@ unacidable = 1; unslashable = 1 }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "AI Reception Telephone"; phone_category = "ARES"; phone_color = "blue"; @@ -10373,7 +10373,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Researcher Office Telephone"; phone_category = "Almayer"; phone_id = "Research"; @@ -12001,7 +12001,7 @@ /turf/closed/wall/almayer, /area/almayer/hallways/starboard_umbilical) "aQy" = ( -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 8; name = "RO Office Telephone"; phone_category = "Offices"; @@ -19162,14 +19162,14 @@ pixel_x = -17 }, /obj/structure/surface/table/almayer, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Telephone"; phone_category = "Almayer"; phone_id = "Auxiliary Support Office Second Line"; pixel_x = -5; pixel_y = 3 }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Telephone"; phone_category = "Almayer"; phone_id = "Auxiliary Support Office"; @@ -25705,7 +25705,7 @@ pixel_x = -6; pixel_y = -5 }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Flight Deck Telephone"; phone_category = "Almayer"; phone_id = "Flight Deck"; @@ -30126,7 +30126,7 @@ }, /obj/item/reagent_container/food/condiment/enzyme, /obj/item/reagent_container/food/condiment/enzyme, -/obj/structure/transmitter{ +/obj/structure/phone_base{ name = "Kitchen Telephone"; phone_category = "Almayer"; phone_id = "Kitchen"; @@ -34010,7 +34010,7 @@ /area/almayer/medical/medical_science) "eSJ" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Captain's Office"; phone_category = "Offices"; phone_id = "Captain's Office"; @@ -34626,7 +34626,7 @@ "ffV" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/crew/alt, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Brig Cells Telephone"; phone_category = "Almayer"; phone_id = "Brig Cells"; @@ -36627,7 +36627,7 @@ department = "AI Core"; pixel_y = 8 }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "AI Core Telephone"; phone_category = "ARES"; phone_color = "blue"; @@ -37479,7 +37479,7 @@ /area/almayer/command/cichallway) "gtA" = ( /obj/structure/surface/table/reinforced/prison, -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 8; name = "Medical Telephone"; phone_category = "Almayer"; @@ -39952,7 +39952,7 @@ pixel_x = 5 }, /obj/structure/surface/table/reinforced/black, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "CIC Reception Telephone"; phone_category = "Command"; phone_id = "CIC Reception"; @@ -41307,7 +41307,7 @@ }, /area/almayer/medical/lower_medical_medbay) "hZU" = ( -/obj/structure/transmitter{ +/obj/structure/phone_base{ name = "Brig Offices Telephone"; phone_category = "Almayer"; phone_id = "Brig Main Offices"; @@ -41764,7 +41764,7 @@ pixel_x = 8; pixel_y = -4 }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Senior Enlisted Advisor Office Telephone"; phone_category = "Almayer"; phone_id = "Senior Enlisted Advisor's Office"; @@ -43988,7 +43988,7 @@ /obj/structure/surface/table/almayer, /obj/effect/landmark/map_item, /obj/item/folder/red, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Brig CMP's Office Telephone"; phone_category = "Offices"; phone_id = "Brig CMP's Office"; @@ -45990,7 +45990,7 @@ unacidable = 1; unslashable = 1 }, -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 1; name = "Brig Warden's Office Telephone"; phone_category = "Offices"; @@ -46299,7 +46299,7 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, -/obj/structure/transmitter{ +/obj/structure/phone_base{ name = "CMO Office Telephone"; phone_category = "Offices"; phone_id = "CMO Office"; @@ -50677,7 +50677,7 @@ pixel_x = -17; pixel_y = 16 }, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Alpha Overwatch Telephone"; phone_category = "Command"; phone_id = "Alpha Overwatch" @@ -54503,7 +54503,7 @@ }, /area/almayer/hull/lower_hull/l_f_s) "nDh" = ( -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "CL Office Telephone"; phone_category = "Almayer"; phone_id = "CL Office" @@ -58707,7 +58707,7 @@ pixel_y = 28 }, /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Intelligence Center Telephone"; phone_category = "Almayer"; phone_id = "Intelligence Center Telephone" @@ -65440,7 +65440,7 @@ pixel_x = -17; pixel_y = -17 }, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Delta Overwatch Telephone"; phone_category = "Command"; phone_id = "Delta Overwatch" @@ -66792,7 +66792,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Charlie Overwatch Telephone"; phone_category = "Command"; phone_id = "Charlie Overwatch" @@ -67587,7 +67587,7 @@ dir = 4; layer = 3.25 }, -/obj/structure/transmitter{ +/obj/structure/phone_base{ name = "CE Office Telephone"; phone_category = "Offices"; phone_id = "CE Office"; @@ -69696,7 +69696,7 @@ pixel_y = 15 }, /obj/structure/machinery/light, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Bravo Overwatch Telephone"; phone_category = "Command"; phone_id = "Bravo Overwatch" @@ -73872,7 +73872,7 @@ pixel_y = -5; req_one_access_txt = "1;4" }, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Combat Information Center Telephone"; phone_category = "Command"; phone_id = "Combat Information Center"; @@ -75727,7 +75727,7 @@ pixel_x = 7; pixel_y = 29 }, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Reporter Telephone"; phone_category = "Almayer"; phone_id = "Reporter"; @@ -80027,7 +80027,7 @@ /area/almayer/hull/lower_hull/l_a_s) "ybZ" = ( /obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/transmitter{ +/obj/structure/phone_base{ dir = 4; name = "Port Railgun Control Telephone"; phone_category = "Command"; diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index babbc40c63..9ee3a232d1 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -6787,7 +6787,7 @@ pixel_x = -17; pixel_y = 16 }, -/obj/structure/transmitter/rotary/no_dnd{ +/obj/structure/phone_base/rotary/no_dnd{ name = "Alpha Overwatch Telephone"; phone_category = "Command"; phone_id = "Alpha Overwatch" diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index 7c49edfdd0..ea14641a75 100644 --- a/maps/shuttles/dropship_alamo.dmm +++ b/maps/shuttles/dropship_alamo.dmm @@ -382,7 +382,7 @@ /area/shuttle/drop1/sulaco) "Ho" = ( /obj/structure/machinery/computer/dropship_weapons/dropship1, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Alamo Telephone"; phone_category = "Dropship"; phone_id = "Alamo"; diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index f1595cd97d..55d07883e3 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -156,7 +156,7 @@ /area/shuttle/drop2/sulaco) "lH" = ( /obj/structure/machinery/computer/dropship_weapons/dropship2, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "Normandy Telephone"; phone_category = "Dropship"; phone_id = "Normandy"; diff --git a/maps/templates/clf_ert_station.dmm b/maps/templates/clf_ert_station.dmm index 7347be914d..aa48ff8d9f 100644 --- a/maps/templates/clf_ert_station.dmm +++ b/maps/templates/clf_ert_station.dmm @@ -1654,7 +1654,7 @@ /obj/item/spacecash/c1, /obj/item/storage/box/matches, /obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "CLF Outpost"; phone_category = "CLF"; phone_id = "CLF Outpost"; diff --git a/maps/templates/upp_ert_station.dmm b/maps/templates/upp_ert_station.dmm index ae2a8ad40c..6db27a83e6 100644 --- a/maps/templates/upp_ert_station.dmm +++ b/maps/templates/upp_ert_station.dmm @@ -876,7 +876,7 @@ /area/adminlevel/ert_station/upp_station) "mG" = ( /obj/structure/surface/table/reinforced/black, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ name = "UPP Station"; phone_category = "UPP"; phone_id = "UPP Station"; diff --git a/maps/templates/weyland_ert_station.dmm b/maps/templates/weyland_ert_station.dmm index 1937aa6a61..82fe23c5bc 100644 --- a/maps/templates/weyland_ert_station.dmm +++ b/maps/templates/weyland_ert_station.dmm @@ -2794,7 +2794,7 @@ /area/adminlevel/ert_station/weyland_station) "Js" = ( /obj/structure/surface/table/reinforced/black, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ do_not_disturb = 2; name = "Weyland-Yutani Station CiC"; phone_category = "W-Y"; @@ -3587,7 +3587,7 @@ /area/adminlevel/ert_station/weyland_station) "SE" = ( /obj/structure/surface/table/woodentable/fancy, -/obj/structure/transmitter/rotary{ +/obj/structure/phone_base/rotary{ do_not_disturb = 2; name = "Weyland-Yutani Station Meeting Room"; phone_category = "W-Y"; diff --git a/tools/UpdatePaths/Scripts/phone-component-switch.txt b/tools/UpdatePaths/Scripts/phone-component-switch.txt new file mode 100644 index 0000000000..0697ab15c9 --- /dev/null +++ b/tools/UpdatePaths/Scripts/phone-component-switch.txt @@ -0,0 +1,13 @@ +/obj/item/phone: /obj/item/handset{@OLD} +/obj/structure/transmitter : /obj/structure/phone_base{@OLD} +/obj/structure/transmitter/rotary : /obj/structure/phone_base/rotary{@OLD} +/obj/structure/transmitter/rotary/no_dnd : /obj/structure/phone_base/rotary/no_dnd{@OLD} +/obj/structure/transmitter/touchtone : /obj/structure/phone_base/touchtone{@OLD} +/obj/structure/transmitter/colony_net : /obj/structure/phone_base/colony_net{@OLD} +/obj/structure/transmitter/colony_net/rotary : /obj/structure/phone_base/colony_net/rotary{@OLD} +/obj/structure/transmitter/upp_net : /obj/structure/phone_base/upp_net{@OLD} +/obj/structure/transmitter/upp_net/rotary : /obj/structure/phone_base/upp_net/rotary{@OLD} +/obj/structure/transmitter/clf_net : /obj/structure/phone_base/clf_net{@OLD} +/obj/structure/transmitter/clf_net/rotary : /obj/structure/phone_base/clf_net/rotary{@OLD} +/obj/structure/transmitter/wy_net : /obj/structure/phone_base/wy_net{@OLD} +/obj/structure/transmitter/wy_net/rotary : /obj/structure/phone_base/wy_net/rotary{@OLD}