From c26d10f224929d8a22297ba4670aef9c6a8cb940 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sat, 31 Dec 2022 07:05:27 +1000 Subject: [PATCH] Merge pull request #14271 from Novacat/nova-basicfixes Miscallaneous Tweaks --- code/game/machinery/telecomms/presets.dm | 1 - .../objects/items/weapons/storage/firstaid_vr.dm | 2 +- .../silicon/robot/robot_modules/syndicate.dm | 2 +- maps/groundbase/gb-centcomm.dmm | 14 +++++++------- maps/groundbase/groundbase_telecomms.dm | 1 - maps/offmap_vr/om_ships/cruiser.dmm | 8 ++++---- maps/offmap_vr/om_ships/shelter_6.dmm | 8 ++++---- maps/stellar_delight/ship_centcom.dmm | 14 +++++++------- maps/stellar_delight/stellar_delight_telecomms.dm | 1 - maps/submaps/admin_use_vr/ert.dmm | 12 ++++++------ maps/tether/submaps/tether_centcom.dmm | 14 +++++++------- maps/tether/tether_telecomms.dm | 1 - 12 files changed, 37 insertions(+), 41 deletions(-) diff --git a/code/game/machinery/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm index 9eb2dd7e9a..6ddc92c1a3 100644 --- a/code/game/machinery/telecomms/presets.dm +++ b/code/game/machinery/telecomms/presets.dm @@ -7,7 +7,6 @@ /obj/machinery/telecomms/relay/preset/station id = "Station Relay" - listening_level = 1 autolinkers = list("s_relay") /obj/machinery/telecomms/relay/preset/telecomms diff --git a/code/game/objects/items/weapons/storage/firstaid_vr.dm b/code/game/objects/items/weapons/storage/firstaid_vr.dm index 7120d9c3af..72da08d6cb 100644 --- a/code/game/objects/items/weapons/storage/firstaid_vr.dm +++ b/code/game/objects/items/weapons/storage/firstaid_vr.dm @@ -66,7 +66,7 @@ /obj/item/weapon/storage/pill_bottle/corophizine, /obj/item/weapon/storage/pill_bottle/combat, /obj/item/stack/medical/splint, - /obj/item/device/healthanalyzer/advanced + /obj/item/device/healthanalyzer/phasic ) /obj/item/weapon/storage/firstaid/surgery diff --git a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm index 324e4afabc..a74d6fd860 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm @@ -150,7 +150,7 @@ /obj/item/weapon/robot_module/robot/syndicate/combat_medic/New(var/mob/living/silicon/robot/R) ..() src.modules += new /obj/item/borg/sight/hud/med(src) - src.modules += new /obj/item/device/healthanalyzer/advanced(src) + src.modules += new /obj/item/device/healthanalyzer/phasic(src) src.modules += new /obj/item/weapon/reagent_containers/borghypo/merc(src) // Surgery things. diff --git a/maps/groundbase/gb-centcomm.dmm b/maps/groundbase/gb-centcomm.dmm index 89864b7f4f..e48811a593 100644 --- a/maps/groundbase/gb-centcomm.dmm +++ b/maps/groundbase/gb-centcomm.dmm @@ -1135,10 +1135,10 @@ /area/centcom/medical) "dV" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "dX" = ( @@ -7683,7 +7683,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "zv" = ( @@ -12424,7 +12424,7 @@ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Pb" = ( @@ -13860,7 +13860,7 @@ /area/centcom/command) "Tw" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Tx" = ( diff --git a/maps/groundbase/groundbase_telecomms.dm b/maps/groundbase/groundbase_telecomms.dm index 6e509b0262..a515deed68 100644 --- a/maps/groundbase/groundbase_telecomms.dm +++ b/maps/groundbase/groundbase_telecomms.dm @@ -5,7 +5,6 @@ // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. /obj/machinery/telecomms/relay/preset/station id = "groundbase Relay" - listening_level = 9 autolinkers = list("groundbase_relay") // #### Hub #### diff --git a/maps/offmap_vr/om_ships/cruiser.dmm b/maps/offmap_vr/om_ships/cruiser.dmm index 54d0fa930a..aac8aa1865 100644 --- a/maps/offmap_vr/om_ships/cruiser.dmm +++ b/maps/offmap_vr/om_ships/cruiser.dmm @@ -5899,10 +5899,10 @@ /turf/simulated/floor/tiled/white, /area/mothership/medical) "lM" = ( -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/hypospray, /obj/item/weapon/reagent_containers/hypospray, diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index c7d3a9fec8..cf5c20d94b 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -882,10 +882,10 @@ /obj/item/stack/nanopaste/advanced, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/fitnessflask/glucose, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, /obj/item/bodybag/cryobag, diff --git a/maps/stellar_delight/ship_centcom.dmm b/maps/stellar_delight/ship_centcom.dmm index 54048e59db..5be783af22 100644 --- a/maps/stellar_delight/ship_centcom.dmm +++ b/maps/stellar_delight/ship_centcom.dmm @@ -860,10 +860,10 @@ /area/centcom/medical) "cL" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cN" = ( @@ -10490,7 +10490,7 @@ /area/centcom/medical) "MJ" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "MK" = ( @@ -11538,7 +11538,7 @@ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Pv" = ( @@ -12737,7 +12737,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Sx" = ( diff --git a/maps/stellar_delight/stellar_delight_telecomms.dm b/maps/stellar_delight/stellar_delight_telecomms.dm index 7ddefa3365..7b36a00971 100644 --- a/maps/stellar_delight/stellar_delight_telecomms.dm +++ b/maps/stellar_delight/stellar_delight_telecomms.dm @@ -5,7 +5,6 @@ // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. /obj/machinery/telecomms/relay/preset/station id = "SD Relay" - listening_level = 9 autolinkers = list("sd_relay") // #### Hub #### diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index b56d1f7575..5e1afa312d 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -1681,12 +1681,12 @@ /turf/simulated/wall/shull, /area/ship/ert/dock_port) "iC" = ( -/obj/item/device/healthanalyzer/advanced{ +/obj/item/device/healthanalyzer/phasic{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced{ +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic{ pixel_x = -2; pixel_y = -2 }, @@ -3519,12 +3519,12 @@ /turf/simulated/floor/airless, /area/ship/ert/gunnery) "ug" = ( -/obj/item/device/healthanalyzer/advanced{ +/obj/item/device/healthanalyzer/phasic{ pixel_x = 2; pixel_y = 2 }, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced{ +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic{ pixel_x = -2; pixel_y = -2 }, diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index ef54e274f3..c305c472e9 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -876,10 +876,10 @@ /area/centcom/medical) "cL" = ( /obj/structure/table/reinforced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/dark, /area/centcom/specops) "cO" = ( @@ -10535,7 +10535,7 @@ /area/centcom/medical) "MJ" = ( /obj/structure/table/glass, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "MK" = ( @@ -11613,7 +11613,7 @@ pixel_x = 4; pixel_y = 2 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Pv" = ( @@ -12822,7 +12822,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 4 }, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/phasic, /turf/simulated/floor/tiled/white, /area/centcom/medical) "Sx" = ( diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index 9adb24aed1..baaff3fb76 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -5,7 +5,6 @@ // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. /obj/machinery/telecomms/relay/preset/station id = "Tether Relay" - listening_level = 9 autolinkers = list("tether_relay") // #### Hub ####