From 83dd0acf5b5e9fc7696441dc8313029ab5ff77e9 Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Fri, 22 May 2020 21:27:03 +0100 Subject: [PATCH] Bugfixes round 1 --- _maps/map_files/cyberiad/cyberiad.dmm | 5 + _maps/map_files/generic/tcommsat-blown.dmm | 612 ++++++++---------- .../game/objects/items/devices/radio/radio.dm | 11 +- .../mob/living/simple_animal/bot/bot.dm | 1 + code/modules/ruins/ruin_areas.dm | 5 + nano/templates/tcomms_core.tmpl | 2 +- 6 files changed, 275 insertions(+), 361 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 42683cf4c26..36dbb929ff9 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -96336,6 +96336,11 @@ "fAw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/tcomms/core/station, +/obj/machinery/camera{ + c_tag = "Telecommunications Core"; + dir = 4; + network = list("SS13") + }, /turf/simulated/floor/plasteel/dark, /area/tcommsat/chamber) "gMZ" = ( diff --git a/_maps/map_files/generic/tcommsat-blown.dmm b/_maps/map_files/generic/tcommsat-blown.dmm index 1f9801d8b80..ee06423a8be 100644 --- a/_maps/map_files/generic/tcommsat-blown.dmm +++ b/_maps/map_files/generic/tcommsat-blown.dmm @@ -16,109 +16,82 @@ /area/space) "ac" = ( /obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ad" = ( /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ae" = ( /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "af" = ( /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ag" = ( /obj/item/paper/crumpled, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ah" = ( /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ai" = ( /obj/machinery/light/small, /obj/item/paper, /obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "aj" = ( /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ak" = ( /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "al" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "am" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "an" = ( /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ao" = ( /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ap" = ( /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "aq" = ( /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ar" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "as" = ( /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "at" = ( /obj/structure/closet/crate, /obj/item/clothing/glasses/night, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "au" = ( /obj/item/storage/toolbox/electrical{ pixel_x = 1; @@ -126,33 +99,26 @@ }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "av" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "aw" = ( /obj/machinery/light/small{ dir = 4 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ax" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ay" = ( /obj/structure/lattice, /turf/space, /area/space/nearstation) -"az" = ( -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plating/airless{ - dir = 1; - icon_state = "floor" - }, -/area/tcommsat/chamber) "be" = ( /obj/item/trash/cheesie, /turf/space, @@ -183,16 +149,16 @@ /area/space/nearstation) "bp" = ( /turf/simulated/wall/r_wall, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bq" = ( /obj/structure/girder, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "br" = ( /obj/structure/table, /obj/item/flashlight/lamp, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bs" = ( /obj/structure/window/reinforced{ dir = 4 @@ -204,7 +170,7 @@ dir = 8 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bu" = ( /obj/machinery/power/apc{ cell_type = 2500; @@ -218,7 +184,7 @@ d2 = 4 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bv" = ( /obj/machinery/light/small{ dir = 1 @@ -229,29 +195,29 @@ icon_state = "2-8" }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bw" = ( /obj/item/stock_parts/cell, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bx" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "by" = ( /obj/item/coin/clown, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bz" = ( /obj/structure/bed, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bA" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bD" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -267,18 +233,18 @@ pixel_y = 0 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bF" = ( /obj/item/wrench, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bG" = ( /obj/structure/window/reinforced{ dir = 4 }, /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bH" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -288,12 +254,12 @@ /area/space/nearstation) "bI" = ( /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bJ" = ( /obj/structure/table, /obj/item/paper, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bK" = ( /obj/structure/table, /obj/item/paper_bin, @@ -302,46 +268,46 @@ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bL" = ( /obj/structure/computerframe, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bM" = ( /obj/structure/table, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bN" = ( /obj/item/reagent_containers/food/snacks/meat/syntiflesh{ name = "Cuban Pete-Meat" }, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bO" = ( /obj/structure/grille, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bP" = ( /obj/structure/grille/broken, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bQ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 8 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bR" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bS" = ( /obj/item/stack/cable_coil/cut{ amount = 1 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bT" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -349,7 +315,7 @@ }, /obj/structure/closet, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bU" = ( /obj/structure/window/reinforced{ dir = 8 @@ -359,12 +325,12 @@ "bV" = ( /obj/item/folder/yellow, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bW" = ( /obj/structure/bed, /obj/effect/decal/remains/human, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "bX" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -392,7 +358,7 @@ dir = 4 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ca" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -414,34 +380,34 @@ "cd" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ce" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cf" = ( /obj/item/paper/crumpled, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cg" = ( /obj/structure/chair{ dir = 4 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ch" = ( /obj/structure/table, /obj/item/storage/fancy/cigarettes, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ci" = ( /obj/structure/chair{ dir = 8 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cj" = ( /obj/structure/window/reinforced{ dir = 1 @@ -449,72 +415,60 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ck" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) -"cl" = ( -/obj/structure/window/reinforced, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cm" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 1 }, /obj/item/airlock_electronics, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cn" = ( /obj/structure/door_assembly/door_assembly_hatch, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "co" = ( /obj/effect/spawner/window/reinforced{ useFull = 0 }, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cp" = ( /obj/machinery/vending/snack, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cq" = ( /obj/machinery/vending/cola, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cr" = ( /obj/structure/chair{ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cs" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ dir = 4 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ct" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall/r_wall, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -543,17 +497,6 @@ }, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"cy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) "cz" = ( /obj/structure/window/reinforced{ dir = 8 @@ -580,28 +523,23 @@ /obj/structure/table, /obj/item/radio/off, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cD" = ( /obj/structure/chair, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cE" = ( /obj/machinery/door/airlock/maintenance_hatch, /turf/simulated/floor/plating/airless{ icon_state = "dark" }, -/area/tcommsat/chamber) -"cF" = ( -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cG" = ( /obj/machinery/door/airlock/hatch, /turf/simulated/floor/plating/airless{ icon_state = "dark" }, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cH" = ( /turf/simulated/floor/plasteel{ icon_state = "solarpanel" @@ -621,10 +559,8 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cK" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -635,14 +571,14 @@ dir = 8 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cL" = ( /obj/structure/grille, /obj/structure/window/reinforced{ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cM" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -650,7 +586,7 @@ dir = 1 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cN" = ( /obj/structure/grille, /obj/structure/window/reinforced, @@ -661,7 +597,7 @@ dir = 4 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cO" = ( /obj/structure/window/reinforced{ dir = 4 @@ -669,10 +605,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cP" = ( /obj/structure/window/reinforced{ dir = 8 @@ -688,33 +622,21 @@ dir = 8 }, /obj/item/stack/rods, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cR" = ( /obj/item/stack/rods, /obj/item/shard{ icon_state = "medium" }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) -"cS" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "cT" = ( /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cU" = ( /obj/effect/spawner/window/reinforced{ useFull = 0 @@ -726,10 +648,8 @@ /obj/item/scalpel{ pixel_y = 12 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "cY" = ( /obj/structure/window/reinforced{ dir = 4 @@ -737,25 +657,21 @@ /obj/item/shard{ icon_state = "medium" }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "da" = ( /obj/structure/rack, /obj/item/circuitboard/teleporter, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "db" = ( /obj/item/radio/off, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dd" = ( /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "de" = ( /obj/effect/decal/cleanable/blood, /obj/structure/chair, @@ -763,71 +679,59 @@ /obj/item/restraints/handcuffs, /obj/effect/decal/remains/human, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dg" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dh" = ( /obj/structure/door_assembly/door_assembly_mhatch, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "di" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dj" = ( /obj/item/cigbutt, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dk" = ( /obj/effect/decal/cleanable/blood, /obj/item/assembly/signaler, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dl" = ( /obj/structure/table, /obj/item/reagent_containers/syringe/lethal{ pixel_y = 4 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dn" = ( /obj/item/storage/toolbox/syndicate, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "do" = ( /obj/structure/table, /obj/item/radio/electropack, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dp" = ( /obj/structure/table, /obj/item/hemostat, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dq" = ( /obj/structure/table, /obj/item/circular_saw, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "ds" = ( /obj/structure/window/reinforced{ dir = 8 @@ -836,10 +740,8 @@ dir = 4 }, /obj/item/stack/rods, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dt" = ( /obj/structure/window/reinforced{ dir = 8 @@ -859,28 +761,17 @@ /obj/structure/window/reinforced, /turf/space, /area/space/nearstation) -"dA" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) "dC" = ( /obj/item/stack/rods, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dE" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plating/airless{ - icon_state = "dark" - }, -/area/tcommsat/chamber) +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) "dI" = ( /obj/item/shard{ icon_state = "medium" @@ -902,7 +793,7 @@ }, /obj/structure/window/reinforced, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dM" = ( /obj/structure/grille/broken, /turf/space, @@ -910,36 +801,36 @@ "dO" = ( /obj/machinery/door/airlock/hatch, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dT" = ( /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dV" = ( /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dW" = ( /obj/structure/sign/vacuum, /turf/simulated/wall/r_wall, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dY" = ( /obj/item/paper/crumpled, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "dZ" = ( /obj/structure/closet/malf/suits, /turf/simulated/floor/plasteel, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ea" = ( /obj/structure/door_assembly/door_assembly_ext, /turf/simulated/floor/plating/airless, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "eb" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ed" = ( /obj/item/crowbar, /turf/simulated/floor/plating/airless, @@ -947,15 +838,15 @@ "ej" = ( /obj/structure/computerframe, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "ek" = ( /obj/machinery/teleport/station, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "el" = ( /obj/machinery/teleport/hub, /turf/simulated/floor/plating, -/area/tcommsat/chamber) +/area/ruin/tcommsat) "em" = ( /turf/simulated/wall/r_wall, /area/AIsattele) @@ -1066,10 +957,17 @@ }, /turf/simulated/floor/plating/airless, /area/AIsattele) +"yn" = ( +/turf/space, +/area/space/nearstation) "AV" = ( /obj/machinery/atmospherics/unary/tank/oxygen_agent_b, /turf/simulated/floor/plating/airless, /area/AIsattele) +"Fv" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/turf/simulated/floor/plating/airless, +/area/ruin/tcommsat) (1,1,1) = {" aa @@ -31000,23 +30898,23 @@ bn bs bD bs -aa +yn bs bs cI bs bs -aa +yn bs cI bs -aa +yn bs -aa +yn cI bs bs -aa +yn aa ay aa @@ -31259,20 +31157,20 @@ bt bQ bX cj -cy +bZ cJ cQ -cS -cy +bt +bZ cO -cy -cy +bZ +bZ cO -cy +bZ ds cY cO -dA +bQ cB aa ay @@ -31524,12 +31422,12 @@ cP bU bH bU -aa +yn bU bU bH dt -cl +bR cB aa ay @@ -31772,7 +31670,7 @@ bv bE bS bZ -cl +bR cA bp bp @@ -32047,9 +31945,9 @@ ck cB aa dJ -bn -bn -bn +bp +bp +bp bl bl bp @@ -32286,27 +32184,27 @@ bx bG bT cb -cl +bR cB bp bI bI -cF -cF -cF -cF -cF -cF +bI +bI +bI +bI +bI +bI bI bp -aa +yn ck cB bp dK bp bp -bn +bp bl bl bp @@ -32538,7 +32436,7 @@ ay aa bl bn -bn +bp bp bH bU @@ -32547,12 +32445,12 @@ cm cB bp bI -cF -cF -cF -cF -cF -cF +bI +bI +bI +bI +bI +bI bI bI bp @@ -32560,10 +32458,10 @@ bp cG bp bp -az +ax bI bp -bn +bp bl bp dW @@ -32795,7 +32693,7 @@ bj ay bl bn -bn +bp bp bp bp @@ -32804,13 +32702,13 @@ cn bp bp bI -cF -cF -cF -cF bI -cF -cF +bI +bI +bI +bI +bI +bI bI bp ad @@ -32820,7 +32718,7 @@ bp bI bI bp -bn +bp bp bp aq @@ -33052,7 +32950,7 @@ bj aa bl bn -bn +bp bp bI bI @@ -33062,12 +32960,12 @@ bI cK bI bI -cF -cF bI -cF -cF -cF +bI +bI +bI +bI +bI bI bp ac @@ -33309,7 +33207,7 @@ bj aa bl bn -bn +bp bp bI bV @@ -33318,18 +33216,18 @@ bI cC cL cR -cF -cF -cF +bI +bI +bI dd -cF -cF -cF +bI +bI +bI bI bp -az +ax bI -az +ax bp bI bI @@ -33566,7 +33464,7 @@ bj bj bm bn -bn +bp bp bJ bI @@ -33575,20 +33473,20 @@ dj cD cM bI -cF +bI bI bI de dj do -cF +bI bI bp ae bI -az ax -az +ax +ax bI dO al @@ -33823,7 +33721,7 @@ bj aa bl bn -bn +bp bp bK bI @@ -33832,13 +33730,13 @@ bI bI cM bI -cF -cF -cF +bI +bI +bI bI dk dp -cF +bI bI bp ac @@ -34080,7 +33978,7 @@ bj aa bk bn -bn +bp bp bL bI @@ -34089,13 +33987,13 @@ bI bI cN bI -cF +bI cX db br dl dq -cF +bI bI bp ax @@ -34337,7 +34235,7 @@ bj ay bl bn -bn +bp bp bM bL @@ -34346,13 +34244,13 @@ bp cE bp bI -cF -cF -cF -cF -cF -cF -cF +bI +bI +bI +bI +bI +bI +bI bI bp af @@ -34362,7 +34260,7 @@ bp bI bI bp -bn +bp bp bp dZ @@ -34594,22 +34492,22 @@ ay aa bl bn -bn bp bp bp bp bp -cF -cE -cF -cF -cF -cF -cF -cF -cF -cF +bp +bI +Fv +bI +bI +bI +bI +bI +bI +bI +bI bI bp bp @@ -34619,7 +34517,7 @@ bp bL bI bp -bn +bp bl bp bp @@ -34859,14 +34757,14 @@ bN bp bp bp -cF bI -cF -cF -cF -cF bI -cF +bI +bI +bI +bI +bI +bI bI bp cc @@ -34876,7 +34774,7 @@ bp co bp bp -bn +bp bl bl bl @@ -35127,13 +35025,13 @@ bI bI bp cc -cl +bR cB aa ay -bn -bn -bj +bp +bp +bI bl bl bk @@ -35636,7 +35534,7 @@ cI cI cI bs -aa +yn bs bs cI @@ -35891,7 +35789,7 @@ cO cT cY cO -cS +bt cO cO cO @@ -36144,7 +36042,7 @@ cg dj bp cP -aa +yn bU bU cc @@ -36156,7 +36054,7 @@ bU bH bU bU -aa +yn aa aa aa @@ -37430,13 +37328,13 @@ cu bn bn bn -bn bp bp bp bp bp -bn +bp +bp bn bo ay diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index b812a195842..53eff8f144f 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -236,7 +236,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( add_fingerprint(usr) -/obj/item/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels, var/role = "Unknown") //BS12 EDIT +/obj/item/radio/proc/autosay(var/message, var/from, var/channel, var/role = "Unknown") //BS12 EDIT var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if(channel == "department") @@ -272,13 +272,17 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( tcm.sender_job = "Automated Announcement" tcm.vname = "synthesized voice" tcm.data = SIGNALTYPE_AINOTRACK - tcm.source_level = zlevel + // Datum radios dont have a location (obviously + if(loc && loc.z) + tcm.source_level = loc.z // For anyone that reads this: This used to pull from a LIST from the CONFIG DATUM. WHYYYYYYYYY!!!!!!!! -aa + else + tcm.source_level = 1 // Assume Z1 if we dont have an actual Z level available to us. tcm.freq = connection.frequency tcm.follow_target = follow_target // Now put that through the stuff for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines) - INVOKE_ASYNC(C, /obj/machinery/tcomms/core.proc/handle_message, tcm) + C.handle_message(tcm) qdel(A) // Just a dummy mob used for making announcements, so we don't create AIs to do this @@ -416,6 +420,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( tcm.needs_tcomms = requires_tcomms tcm.connection = connection tcm.vname = M.voice_name + tcm.follow_target = follow_target // Make sure the AI can follow people // Now put that through the stuff var/handled = FALSE if(connection) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 07210674303..88d130ddc82 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -94,6 +94,7 @@ /obj/item/radio/headset/bot subspace_transmission = 1 + requires_tcomms = FALSE canhear_range = 0 /obj/item/radio/headset/bot/recalculateChannels() diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm index 2d8ce5a33ac..754f8d44f29 100644 --- a/code/modules/ruins/ruin_areas.dm +++ b/code/modules/ruins/ruin_areas.dm @@ -44,3 +44,8 @@ /area/ruin/onehalf/bridge name = "Bridge" icon_state = "bridge" + +// Old tcommsat +/area/ruin/tcommsat + name = "Telecommunications Satellite" + icon_state = "tcomsatcham" diff --git a/nano/templates/tcomms_core.tmpl b/nano/templates/tcomms_core.tmpl index 2cf56a9f204..028f087aec8 100644 --- a/nano/templates/tcomms_core.tmpl +++ b/nano/templates/tcomms_core.tmpl @@ -130,7 +130,7 @@ {{:value.addr}} {{:value.net_id}} {{:value.sector}} - {{:value.status ? 'Active' : 'Error'}} + {{:value.status ? 'Active' : 'Offline'}} {{:helper.link('Unlink', 'unlink', {'unlink' : value.addr}, null, 'infoButton')}} {{/for}}