da maps

cmss13-devs · Oct 26, 2023 · e796dad · e796dad
1 parent 6ef0aac
commit e796dad
Show file tree

Hide file tree

Showing 31 changed files with 189 additions and 176 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)