From 3e64268d4654e23fcb452005ad4ed843afd8342c Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Sun, 27 Nov 2022 18:47:24 +0100 Subject: [PATCH] Kills Manually Mapped Names on Intercoms (#15178) --- .../objects/items/devices/radio/intercom.dm | 38 ++++---- code/game/objects/structures/mirror.dm | 1 + html/changelogs/intercom_fix.yml | 6 ++ maps/aurora/aurora-1_centcomm.dmm | 2 - maps/aurora/aurora-3_sublevel.dmm | 25 ------ maps/aurora/aurora-4_mainlevel.dmm | 88 ++----------------- maps/aurora/aurora-5_interstitial.dmm | 10 --- maps/aurora/aurora-6_surface.dmm | 23 +---- .../away_site/first_aurora/first_aurora.dmm | 2 - .../away_site/romanovich/grand_romanovich.dmm | 30 +------ maps/event/generic_dock/generic_dock-1.dmm | 2 - maps/event/idris_cruise/idris_cruise-1.dmm | 35 -------- maps/runtime/runtime-1.dmm | 3 - maps/sccv_horizon/sccv_horizon-1_deck_1.dmm | 19 ---- maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 44 +--------- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 44 +--------- maps/sccv_horizon/sccv_horizon-4_centcomm.dmm | 1 - 17 files changed, 50 insertions(+), 323 deletions(-) create mode 100644 html/changelogs/intercom_fix.yml diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 0dca3a330f6..8ee98980ba6 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -1,6 +1,8 @@ /obj/item/device/radio/intercom - name = "station intercom (General)" - desc = "Talk through this." + name = "intercom (general)" + desc = "An intercom with buttons for transmitting, receiving, and for volume control." + desc_extended = "Has a touch display for inputting a frequency, with proper authentication. Used to communicate when you have lost your radio. \ + Otherwise, you would likely just use a handheld shortwave radio instead." icon_state = "intercom" layer = 2.99 anchored = TRUE @@ -15,20 +17,24 @@ clickvol = 40 /obj/item/device/radio/intercom/custom - name = "station intercom (Custom)" + name = "intercom (custom)" broadcasting = FALSE listening = FALSE /obj/item/device/radio/intercom/interrogation - name = "station intercom (Interrogation)" - frequency = 1449 + name = "intercom (interrogation)" + frequency = 1449 + +/obj/item/device/radio/intercom/interrogation/broadcasting // The detainee's side. + broadcasting = TRUE + listening = FALSE /obj/item/device/radio/intercom/private - name = "station intercom (Private)" + name = "intercom (private)" frequency = AI_FREQ /obj/item/device/radio/intercom/specops - name = "\improper Spec Ops intercom" + name = "intercom (spec ops)" frequency = ERT_FREQ /obj/item/device/radio/intercom/department @@ -37,15 +43,15 @@ listening = TRUE /obj/item/device/radio/intercom/department/medbay - name = "station intercom (Medbay)" + name = "intercom (medical)" frequency = MED_I_FREQ /obj/item/device/radio/intercom/department/security - name = "station intercom (Security)" + name = "intercom (security)" frequency = SEC_I_FREQ /obj/item/device/radio/intercom/entertainment - name = "entertainment intercom" + name = "intercom (entertainment)" frequency = ENT_FREQ canhear_range = 4 @@ -83,8 +89,8 @@ ) /obj/item/device/radio/intercom/syndicate - name = "illicit intercom" - desc = "Talk through this. Evilly" + name = "illegally modified intercom" + desc = "Talk through this. Evilly." frequency = SYND_FREQ subspace_transmission = 1 syndie = 1 @@ -94,7 +100,7 @@ internal_channels[num2text(SYND_FREQ)] = list(access_syndicate) /obj/item/device/radio/intercom/raider - name = "illicit intercom" + name = "illegally modified intercom" desc = "Pirate radio, but not in the usual sense of the word." frequency = RAID_FREQ subspace_transmission = 1 @@ -174,11 +180,11 @@ return "" /obj/item/device/radio/intercom/locked/ai_private - name = "\improper AI intercom" + name = "intercom (AI private)" frequency = AI_FREQ broadcasting = TRUE listening = TRUE /obj/item/device/radio/intercom/locked/confessional - name = "confessional intercom" - frequency = 1480 + name = "intercom (confessional)" + frequency = 1480 \ No newline at end of file diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index b1e2d3bdaa3..46d87b69c79 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -100,6 +100,7 @@ var/alpha_icon_state = "mirror_mask" var/obj/mirror desc = "Why are you locked in the bathroom?" + desc_extended = "You talking to me?" anchored = TRUE unacidable = TRUE diff --git a/html/changelogs/intercom_fix.yml b/html/changelogs/intercom_fix.yml new file mode 100644 index 00000000000..ae890e47c96 --- /dev/null +++ b/html/changelogs/intercom_fix.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Removes manually mapped names on intercoms. Implements coded-in intercom subtypes where applicable." \ No newline at end of file diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 3062982caa3..d148dfa85d8 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -6607,7 +6607,6 @@ /area/centcom/spawning) "aTs" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -30 }, /turf/simulated/floor/shuttle/tan, @@ -14872,7 +14871,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -22 }, diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 8d8e54b12b4..7427d406093 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -8629,7 +8629,6 @@ }, /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /turf/simulated/floor/tiled, @@ -8925,8 +8924,6 @@ c_tag = "Medical - Patient Wing Hallway" }, /obj/item/device/radio/intercom{ - frequency = 1475; - name = "Station Intercom (Security)"; pixel_y = 22 }, /obj/effect/floor_decal/corner_wide/pink{ @@ -10572,7 +10569,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -12040,7 +12036,6 @@ "avC" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/structure/bed/stool, @@ -12888,7 +12883,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -13368,7 +13362,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/effect/floor_decal/corner_wide/mauve{ @@ -14211,7 +14204,6 @@ }, /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27; pixel_y = -32 }, @@ -15550,7 +15542,6 @@ "aEB" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/effect/floor_decal/corner_wide/mauve{ @@ -16565,7 +16556,6 @@ "aHi" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/effect/floor_decal/corner_wide/lime{ @@ -19741,7 +19731,6 @@ }, /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -20087,7 +20076,6 @@ }, /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_y = -28 }, /turf/simulated/floor/tiled/white, @@ -20555,7 +20543,6 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /turf/simulated/floor/tiled{ @@ -21339,7 +21326,6 @@ "aSx" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/effect/floor_decal/corner/lime/diagonal, @@ -21422,7 +21408,6 @@ /obj/item/device/flashlight/pen, /obj/item/device/flashlight/pen, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /obj/item/taperoll/medical{ @@ -22549,7 +22534,6 @@ /area/medical/medbay4) "aWC" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /obj/structure/flora/pottedplant/random, @@ -23720,7 +23704,6 @@ "bcb" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /turf/simulated/floor/tiled, @@ -24452,7 +24435,6 @@ dir = 8 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /obj/effect/floor_decal/corner/mauve/full, @@ -26019,7 +26001,6 @@ "bxJ" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/structure/bed/stool/chair/padded/brown, @@ -26267,7 +26248,6 @@ dir = 4 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /turf/simulated/floor/tiled, @@ -28931,7 +28911,6 @@ "hje" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -29668,7 +29647,6 @@ "iRV" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/structure/bed/stool/chair/padded/brown, @@ -30782,7 +30760,6 @@ "lQi" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/structure/bed/stool/chair/padded/brown, @@ -35324,7 +35301,6 @@ /obj/item/pen, /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/machinery/door/firedoor, @@ -37053,7 +37029,6 @@ "xXU" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -27 }, /obj/structure/bed/stool/chair/padded/brown, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 1e4d852ec3f..b002d57c936 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -1806,7 +1806,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/carpet/rubber, @@ -2276,10 +2275,7 @@ /area/security/brig) "aeB" = ( /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (General)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/tiled, /area/janitor) @@ -2575,9 +2571,7 @@ /area/security/brig) "afa" = ( /obj/structure/bed/stool/chair, -/obj/item/device/radio/intercom{ - frequency = 1449; - name = "Station Intercom (Interrogation)"; +/obj/item/device/radio/intercom/interrogation{ pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7423,7 +7417,6 @@ /obj/structure/table/reinforced, /obj/item/storage/box/lights/mixed, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /obj/structure/cable{ @@ -8002,7 +7995,6 @@ "apF" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = -28 }, /obj/machinery/status_display{ @@ -8085,7 +8077,6 @@ "apM" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/effect/floor_decal/corner/paleblue{ @@ -10043,10 +10034,7 @@ dir = 4 }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -10901,7 +10889,6 @@ /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /turf/simulated/floor/tiled, @@ -11421,7 +11408,6 @@ /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/item/device/paicard, @@ -14300,7 +14286,6 @@ "azU" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = -28; pixel_y = -1 }, @@ -14603,7 +14588,6 @@ "aAs" = ( /obj/item/device/radio/intercom{ layer = 4; - name = "Station Intercom (General)"; pixel_y = -29 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -16088,10 +16072,7 @@ /area/security/prison) "aCE" = ( /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /obj/structure/cable/green{ d1 = 2; @@ -19182,7 +19163,6 @@ }, /obj/item/device/radio/intercom{ layer = 4; - name = "Station Intercom (General)"; pixel_y = -29 }, /obj/machinery/light{ @@ -22456,7 +22436,6 @@ /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /turf/simulated/floor/wood, @@ -23543,14 +23522,12 @@ "aOM" = ( /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = 27 }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aON" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_x = -30 }, /obj/structure/table/reinforced, @@ -27928,7 +27905,6 @@ /obj/item/deck/cards, /obj/item/key/janicart, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /obj/effect/floor_decal/industrial/warning{ @@ -28665,7 +28641,6 @@ "aXE" = ( /obj/structure/table/reinforced, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /obj/machinery/camera/network/command{ @@ -31216,7 +31191,6 @@ /obj/effect/floor_decal/sign/v, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/alarm{ @@ -31608,7 +31582,6 @@ "bcJ" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/carpet/blue, @@ -31739,7 +31712,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/tiled/white, @@ -32112,7 +32084,6 @@ /obj/machinery/iv_drip, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled/white, @@ -33812,7 +33783,6 @@ /area/crew_quarters/medbreak) "bgC" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -28 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -35316,7 +35286,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -37007,7 +36976,6 @@ }, /obj/effect/floor_decal/corner/red/diagonal, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /turf/simulated/floor/tiled, @@ -38025,7 +37993,6 @@ "boh" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/effect/floor_decal/corner_wide/lime{ @@ -38276,7 +38243,6 @@ }, /obj/item/device/radio/intercom{ dir = 0; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/effect/floor_decal/corner_wide/paleblue/full{ @@ -41151,7 +41117,6 @@ "buo" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/light{ @@ -41326,7 +41291,6 @@ "buI" = ( /obj/structure/flora/pottedplant/random, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /turf/simulated/floor/tiled, @@ -41480,7 +41444,6 @@ "bvj" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/structure/table/standard, @@ -44880,7 +44843,6 @@ pixel_x = 4 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -30 }, /obj/item/circuitboard/aicore{ @@ -44946,7 +44908,6 @@ /obj/effect/floor_decal/corner/white/diagonal, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/item/storage/box/gloves{ @@ -45051,7 +45012,6 @@ "bCL" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/camera/network/research{ @@ -45093,7 +45053,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/corner_wide/lime{ @@ -45896,7 +45855,6 @@ "bEL" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/machinery/light{ @@ -46461,7 +46419,6 @@ /obj/item/reagent_containers/dropper, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/effect/floor_decal/corner_wide/mauve/full, @@ -47517,7 +47474,6 @@ /obj/structure/table/standard, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/item/device/radio{ @@ -48792,7 +48748,6 @@ "bLY" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/structure/table/standard, @@ -48870,7 +48825,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/structure/cable/green{ @@ -51164,7 +51118,6 @@ /obj/structure/table/stone/marble, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -26 }, /obj/machinery/chemical_dispenser/bar_soft/full{ @@ -52014,7 +51967,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = -28 }, /turf/simulated/floor/carpet, @@ -54633,7 +54585,6 @@ icon_state = "1-4" }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /turf/simulated/floor/tiled, @@ -54871,7 +54822,6 @@ dir = 8 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /turf/simulated/floor/tiled, @@ -55752,7 +55702,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /turf/simulated/floor/tiled, @@ -56276,7 +56225,6 @@ dir = 10 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /obj/item/stack/wrapping_paper, @@ -60188,12 +60136,8 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "eLR" = ( -/obj/item/device/radio/intercom{ - broadcasting = 1; +/obj/item/device/radio/intercom/interrogation/broadcasting{ dir = 1; - frequency = 1449; - listening = 0; - name = "Station Intercom (Interrogation)"; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -61169,10 +61113,7 @@ }, /obj/item/pen, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -62011,10 +61952,7 @@ "hIP" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - pixel_x = -28; - wires = 7 + pixel_x = -28 }, /turf/simulated/floor/tiled{ name = "cooled floor"; @@ -64833,10 +64771,7 @@ dir = 5 }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/tiled/dark, /area/security/forensics_office{ @@ -68032,10 +67967,7 @@ pixel_y = 3 }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/tiled/white, /area/security/forensics_laboratory) @@ -70661,7 +70593,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -20 }, /turf/simulated/floor/tiled/white, @@ -71299,7 +71230,6 @@ dir = 8 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /turf/simulated/floor/tiled/freezer{ diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 4396981bebc..e42d0bd0525 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -1960,7 +1960,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/structure/cable/green{ @@ -2779,7 +2778,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/landmark/start{ @@ -3176,7 +3174,6 @@ "iq" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -3317,7 +3314,6 @@ /obj/machinery/firealarm/north, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/effect/decal/cleanable/dirt, @@ -4176,7 +4172,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/tiled/white, @@ -4214,7 +4209,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled/white, @@ -4991,7 +4985,6 @@ "mx" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/effect/floor_decal/corner_wide/green{ @@ -5359,7 +5352,6 @@ "oB" = ( /obj/item/device/radio/intercom{ layer = 4; - name = "Station Intercom (General)"; pixel_y = -29 }, /obj/effect/floor_decal/corner/grey/diagonal, @@ -7570,7 +7562,6 @@ /obj/structure/table/reinforced/steel, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/cell_charger, @@ -11743,7 +11734,6 @@ "Zu" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/corner/brown/full{ diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 62e97000e2d..f1c1742dd31 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -1184,7 +1184,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/machinery/light/small/emergency{ @@ -2492,7 +2491,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/machinery/door/blast/shutters/open{ @@ -4131,7 +4129,6 @@ /area/sconference_room) "dvx" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 20 }, /obj/effect/decal/cleanable/cobweb, @@ -5852,7 +5849,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5936,7 +5932,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -8242,7 +8237,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/tiled/dark, @@ -9670,7 +9664,6 @@ /area/solar/fore) "ioe" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /turf/simulated/floor/wood, @@ -12559,7 +12552,6 @@ "kWs" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -20 }, /obj/effect/floor_decal/corner/purple/full{ @@ -18856,7 +18848,6 @@ /area/quartermaster/qm) "qjG" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_x = -29 }, /obj/structure/table/reinforced, @@ -19159,7 +19150,6 @@ /obj/item/stock_parts/subspace/amplifier, /obj/item/stock_parts/subspace/amplifier, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_x = 29 }, /obj/machinery/light/small/emergency{ @@ -19419,7 +19409,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/effect/floor_decal/corner/red, @@ -21119,7 +21108,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/effect/floor_decal/corner/grey/diagonal, @@ -21365,7 +21353,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/machinery/light/small/emergency{ @@ -23429,7 +23416,6 @@ /obj/item/bedsheet/mime, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = -28 }, /turf/simulated/floor/wood, @@ -25225,7 +25211,6 @@ /area/crew_quarters/fitness/changing) "vyU" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -29 }, /turf/simulated/floor/tiled, @@ -26252,7 +26237,8 @@ }, /obj/effect/floor_decal/corner/blue/diagonal, /obj/structure/closet/secure_closet/freezer{ - icon_state = "freezer"name = "cafe fridge" + icon_state = "freezer"; + name = "cafe fridge" }, /obj/machinery/button/remote/blast_door{ id = "poolcafe"; @@ -26381,7 +26367,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/machinery/light/small/emergency{ @@ -26941,7 +26926,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = -28; pixel_y = -4 }, @@ -27029,7 +27013,6 @@ "wZN" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /turf/simulated/floor/tiled, @@ -27603,7 +27586,6 @@ "xCq" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /obj/structure/disposalpipe/segment, @@ -28256,7 +28238,6 @@ "yeL" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/hidden{ diff --git a/maps/away/away_site/first_aurora/first_aurora.dmm b/maps/away/away_site/first_aurora/first_aurora.dmm index 8f7b2164b6c..6cc05dbd0cd 100644 --- a/maps/away/away_site/first_aurora/first_aurora.dmm +++ b/maps/away/away_site/first_aurora/first_aurora.dmm @@ -3948,7 +3948,6 @@ /area/derelict/hallway/southwest) "nm" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -28 }, /obj/machinery/light, @@ -4184,7 +4183,6 @@ "nW" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /turf/simulated/floor/tiled, diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index 7447c1ddc7e..793e2bc7b0b 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -435,7 +435,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -497,7 +496,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -1728,11 +1726,8 @@ req_one_access = list(150) }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; pixel_x = 0; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/lino/grey, /area/grand_romanovich) @@ -2328,7 +2323,6 @@ /obj/structure/flora/pottedplant/random, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21 }, @@ -2498,7 +2492,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/vending/casino, @@ -2675,7 +2668,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21 }, @@ -2691,7 +2683,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21 }, @@ -2869,11 +2860,8 @@ /obj/structure/table/wood, /obj/item/phone, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; pixel_x = 0; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/lino/grey, /area/grand_romanovich) @@ -3203,7 +3191,6 @@ /obj/structure/flora/pottedplant/random, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -3612,11 +3599,8 @@ icon_state = "spline_fancy" }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; pixel_x = 0; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /turf/simulated/floor/wood, /area/grand_romanovich) @@ -4440,11 +4424,8 @@ /area/grand_romanovich) "lL" = ( /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (Brig Radio)"; pixel_x = 0; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /obj/effect/floor_decal/corner/yellow{ dir = 5; @@ -5073,7 +5054,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = 27 }, /turf/simulated/floor/wood, @@ -5337,7 +5317,6 @@ "nT" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/corner/yellow{ @@ -5410,7 +5389,6 @@ "oc" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -21 }, diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm index a6525483662..ae1ab1ef87e 100644 --- a/maps/event/generic_dock/generic_dock-1.dmm +++ b/maps/event/generic_dock/generic_dock-1.dmm @@ -1846,7 +1846,6 @@ /area/shuttle/escape) "aTs" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -30 }, /turf/simulated/floor/shuttle/tan, @@ -5810,7 +5809,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -22 }, diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm index 7efecdf56c6..c9a0047c2f4 100644 --- a/maps/event/idris_cruise/idris_cruise-1.dmm +++ b/maps/event/idris_cruise/idris_cruise-1.dmm @@ -473,7 +473,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -20 }, /obj/machinery/light{ @@ -1013,7 +1012,6 @@ "aJq" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -1201,7 +1199,6 @@ "aQy" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -22 }, @@ -1744,7 +1741,6 @@ "bjA" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -3402,7 +3398,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -20 }, /turf/unsimulated/floor{ @@ -3412,7 +3407,6 @@ "cFP" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -4956,7 +4950,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/door/firedoor, @@ -5197,7 +5190,6 @@ "ejQ" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/landmark/force_spawnpoint{ @@ -6250,7 +6242,6 @@ "eZS" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -6617,7 +6608,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -7528,7 +7518,6 @@ "fWc" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled/ramp, @@ -7591,7 +7580,6 @@ /area/cruise/arcade) "fXP" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /turf/unsimulated/floor{ @@ -7803,7 +7791,6 @@ /obj/structure/bed/stool/padded/red, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -8710,7 +8697,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -8809,7 +8795,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -11558,7 +11543,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -11757,7 +11741,6 @@ /obj/structure/closet/emcloset, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/light/small{ @@ -11798,7 +11781,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/light/small{ @@ -12451,7 +12433,6 @@ "jUE" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -15582,7 +15563,6 @@ "mlx" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -20 }, /turf/unsimulated/floor{ @@ -15656,7 +15636,6 @@ "mpp" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/light{ @@ -18492,7 +18471,6 @@ "oAK" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -18846,7 +18824,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/simulated/floor/tiled/ramp, @@ -19968,7 +19945,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /turf/unsimulated/floor{ @@ -21686,7 +21662,6 @@ "rrj" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -22 }, @@ -21947,7 +21922,6 @@ "rCz" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -22590,7 +22564,6 @@ "sek" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -22 }, @@ -24854,7 +24827,6 @@ /obj/structure/flora/pottedplant/random, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -26242,7 +26214,6 @@ "uRK" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -26599,7 +26570,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/light{ @@ -27796,7 +27766,6 @@ "whR" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -28270,7 +28239,6 @@ "wFi" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/unsimulated/floor{ @@ -28848,7 +28816,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ @@ -28942,7 +28909,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/simulated/floor/tiled/ramp/bottom, @@ -29200,7 +29166,6 @@ "xpJ" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/unsimulated/floor{ diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm index d6dd8fc4863..0c6b9a02ef3 100644 --- a/maps/runtime/runtime-1.dmm +++ b/maps/runtime/runtime-1.dmm @@ -1454,7 +1454,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -1667,7 +1666,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/tiled, @@ -1834,7 +1832,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /obj/machinery/computer/station_alert/all, diff --git a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm index 5079eb86396..9973b55141d 100644 --- a/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm +++ b/maps/sccv_horizon/sccv_horizon-1_deck_1.dmm @@ -618,7 +618,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -25 }, /obj/effect/floor_decal/corner/purple/full{ @@ -2177,7 +2176,6 @@ dir = 4 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_x = 24; dir = 8 }, @@ -2732,7 +2730,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/shuttle/dark_blue, @@ -4564,7 +4561,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/shuttle/dark_blue, @@ -5783,7 +5779,6 @@ "eDa" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/effect/floor_decal/corner/brown/full{ @@ -6353,7 +6348,6 @@ /area/rnd/xenoarch_atrium) "eWJ" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /obj/effect/floor_decal/industrial/warning/corner{ @@ -6583,7 +6577,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/computer/ship/engines{ @@ -9184,7 +9177,6 @@ dir = 5 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /turf/simulated/floor/tiled, @@ -11237,7 +11229,6 @@ "iLE" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -20 }, /obj/structure/bed/stool/chair/shuttle{ @@ -12331,7 +12322,6 @@ "jDs" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/camera/network/supply{ @@ -12757,7 +12747,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /obj/structure/bed/stool/chair/office/bridge, @@ -13279,7 +13268,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/teleport/pad, @@ -16943,7 +16931,6 @@ "nmF" = ( /obj/effect/floor_decal/corner/blue/full, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_x = -24; dir = 4 }, @@ -19495,7 +19482,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/shuttle/dark_blue, @@ -21129,7 +21115,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -21 }, /turf/simulated/floor/shuttle/dark_blue, @@ -25361,7 +25346,6 @@ "tYN" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/effect/floor_decal/corner/green{ @@ -27160,7 +27144,6 @@ /obj/effect/floor_decal/corner/green/full, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/structure/bed/stool/chair/office/light{ @@ -27509,7 +27492,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /obj/effect/floor_decal/corner/purple{ @@ -29503,7 +29485,6 @@ }, /obj/item/stack/nanopaste, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 22 }, /obj/effect/floor_decal/industrial/outline/yellow, diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 4aef96688ef..8dd67684a98 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -100,10 +100,7 @@ pixel_y = 2 }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (General)"; - pixel_y = 24; - wires = 7 + pixel_y = 24 }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -2319,7 +2316,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -7042,7 +7038,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/machinery/camera/network/security{ @@ -7098,7 +7093,6 @@ "dxH" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -20 }, /obj/effect/floor_decal/corner/mauve{ @@ -7908,10 +7902,7 @@ dir = 4 }, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (General)"; - pixel_y = 25; - wires = 7 + pixel_y = 25 }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -8877,7 +8868,6 @@ /obj/machinery/disposal/small/west, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/wood, @@ -9187,7 +9177,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -9237,7 +9226,6 @@ "eEB" = ( /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -25 }, /obj/structure/closet/secure_closet/operations_manager, @@ -9564,7 +9552,6 @@ "eQg" = ( /obj/structure/table/standard, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /obj/effect/floor_decal/corner/yellow/full{ @@ -12794,7 +12781,6 @@ /obj/machinery/firealarm/south, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -14846,7 +14832,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -16914,7 +16899,6 @@ "inB" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/disposal/small/west, @@ -18141,7 +18125,6 @@ /obj/structure/closet/secure_closet/engineering_chief, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/requests_console{ @@ -22269,7 +22252,6 @@ /obj/item/stock_parts/matter_bin, /obj/item/storage/toolbox/mechanical, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /turf/simulated/floor/tiled/white, @@ -23576,7 +23558,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/effect/floor_decal/corner/paleblue/full{ @@ -24680,7 +24661,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -26810,7 +26790,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/effect/floor_decal/industrial/warning{ @@ -28962,11 +28941,8 @@ "otI" = ( /obj/machinery/light, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; dir = 1; - name = "Station Intercom (General)"; - pixel_y = -24; - wires = 7 + pixel_y = -24 }, /obj/structure/disposalpipe/junction{ dir = 4; @@ -30783,7 +30759,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/camera/network/second_deck{ @@ -31738,7 +31713,6 @@ /obj/machinery/autolathe, /obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /turf/simulated/floor/tiled, @@ -36349,7 +36323,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/structure/cable/green, @@ -36913,7 +36886,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/structure/flora/pottedplant{ @@ -38868,10 +38840,7 @@ "tuD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/item/device/radio/intercom{ - desc = "Talk... listen through this."; - name = "Station Intercom (General)"; - pixel_y = 24; - wires = 7 + pixel_y = 24 }, /obj/effect/floor_decal/corner/paleblue{ dir = 5 @@ -42353,7 +42322,6 @@ /obj/structure/table/wood, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -26 }, /obj/item/device/flashlight/lamp/green, @@ -42555,7 +42523,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -26 }, /turf/simulated/floor/carpet, @@ -47494,7 +47461,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /turf/simulated/floor/wood, @@ -47962,7 +47928,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/wood, @@ -48935,7 +48900,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/corner_wide/green/full{ diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 469541770c2..af458bdf6a6 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -1299,7 +1299,6 @@ /obj/structure/table/glass, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/light{ @@ -3268,7 +3267,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /turf/simulated/floor/tiled, @@ -3768,7 +3766,6 @@ }, /obj/effect/floor_decal/industrial/hatch/yellow, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /turf/simulated/floor/tiled/dark, @@ -4158,7 +4155,6 @@ "dHD" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/spline/plain{ @@ -4717,7 +4713,6 @@ /obj/machinery/disposal/small/east, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/marble/dark, @@ -4933,7 +4928,6 @@ /area/security/investigations) "emK" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /obj/effect/floor_decal/spline/fancy/wood{ @@ -5682,7 +5676,6 @@ /obj/machinery/hologram/holopad, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /turf/simulated/floor/tiled/dark, @@ -5985,7 +5978,6 @@ "feT" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/machinery/camera/network/third_deck{ @@ -6575,7 +6567,6 @@ /area/horizon/crew_quarters/cryo/washroom) "fxi" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /obj/effect/floor_decal/corner/blue{ @@ -8796,7 +8787,6 @@ "hhO" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /obj/machinery/recharger/wallcharger{ @@ -8915,7 +8905,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/effect/floor_decal/corner_wide/green{ @@ -9035,7 +9024,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/disposal/small/west, @@ -10180,9 +10168,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/device/radio/intercom{ - frequency = 1449; - name = "Station Intercom (Interrogation)"; +/obj/item/device/radio/intercom/interrogation{ pixel_y = 24 }, /obj/effect/floor_decal/corner/blue{ @@ -10330,7 +10316,6 @@ dir = 10 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -24; dir = 1 }, @@ -10764,7 +10749,6 @@ dir = 1 }, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /turf/simulated/floor/tiled/dark, @@ -12165,7 +12149,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled, @@ -12536,7 +12519,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -13189,7 +13171,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled/dark, @@ -13986,7 +13967,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /turf/simulated/floor/tiled/white, @@ -14546,11 +14526,7 @@ /turf/simulated/floor/carpet/rubber, /area/bridge/controlroom) "lIN" = ( -/obj/item/device/radio/intercom{ - broadcasting = 1; - frequency = 1449; - listening = 0; - name = "Station Intercom (Interrogation)"; +/obj/item/device/radio/intercom/interrogation/broadcasting{ pixel_y = -24; dir = 1 }, @@ -16329,7 +16305,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -16497,7 +16472,6 @@ }, /obj/structure/bed/padded, /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 25 }, /obj/item/bedsheet/medical, @@ -16854,7 +16828,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/structure/bed/stool/chair/padded/brown, @@ -17201,7 +17174,6 @@ /obj/effect/floor_decal/corner/green/diagonal, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/machinery/camera/network/third_deck{ @@ -18081,7 +18053,6 @@ "ozN" = ( /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /obj/structure/table/wood, @@ -18586,7 +18557,6 @@ "oUl" = ( /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/structure/railing/mapped, @@ -18618,7 +18588,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -18636,7 +18605,6 @@ /obj/structure/closet/secure_closet/medical3, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 24 }, /obj/item/storage/box/gloves, @@ -20719,7 +20687,6 @@ /obj/item/reagent_containers/food/drinks/shaker, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 25 }, /obj/effect/floor_decal/corner/red/diagonal, @@ -20856,7 +20823,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /obj/structure/cable/green{ @@ -21441,7 +21407,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/tiled/dark, @@ -24046,7 +24011,6 @@ /area/crew_quarters/captain) "tpN" = ( /obj/item/device/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 24 }, /obj/machinery/light{ @@ -25199,7 +25163,6 @@ /obj/structure/table/standard, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_y = -24 }, /turf/simulated/floor/tiled/white, @@ -26370,7 +26333,6 @@ /obj/structure/bed/stool/chair/office/bridge, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -25 }, /turf/simulated/floor/carpet/rubber, @@ -28332,7 +28294,6 @@ }, /obj/item/device/radio/intercom{ dir = 4; - name = "Station Intercom (General)"; pixel_x = -24 }, /turf/simulated/floor/tiled/white, @@ -29992,7 +29953,6 @@ }, /obj/item/device/radio/intercom{ dir = 8; - name = "Station Intercom (General)"; pixel_x = 21; pixel_y = -13 }, diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 75aaaab9ebe..ff5d4e605f6 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -1547,7 +1547,6 @@ }, /obj/item/device/radio/intercom{ dir = 1; - name = "Station Intercom (General)"; pixel_x = 5; pixel_y = -22 },