diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index cfe2d18304..fed83f7bde 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -3,6 +3,9 @@ config_tag = "extended" required_players = 0 + var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds) + var/const/waittime_h = 1800 + /datum/game_mode/announce() world << "The current game mode is - Extended Role-Playing!" world << "Just have fun and role-play!" @@ -11,3 +14,8 @@ setup_sectors() spawn_exporation_packs() return 1 + +/datum/game_mode/extended/post_setup() + spawn (rand(waittime_l, waittime_h)) // To reduce extended meta. + send_intercept() + ..() \ No newline at end of file diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 3f1b721c42..bed90f7cda 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -298,13 +298,29 @@ var/turf/T = get_turf(src) var/list/V = view(message_range, T) + var/list/W = V + + + for (var/obj/O in ((W | contents)-used_radios)) + W |= O + + for (var/mob/M in W) + W |= M.contents + + for (var/obj/O in W) //radio in pocket could work, radio in backpack wouldn't --rastaf0 + spawn (0) + if(O && !istype(O.loc, /obj/item/weapon/storage)) + O.hear_talk(src, message) + + +/* Commented out as replaced by code above from BS12 for (var/obj/O in ((V | contents)-used_radios)) //radio in pocket could work, radio in backpack wouldn't --rastaf0 spawn (0) if (O) O.hear_talk(src, message) - +*/ if(isbrain(src))//For brains to properly talk if they are in an MMI..or in a brain. Could be extended to other mobs I guess. for(var/obj/O in loc)//Kinda ugly but whatever. if(O) diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm index b95ace19aa..cec1f9911a 100644 --- a/code/modules/scripting/Implementations/Telecomms.dm +++ b/code/modules/scripting/Implementations/Telecomms.dm @@ -63,6 +63,9 @@ if(!ready) return + if(!interpreter) + return + interpreter.SetVar("$content", signal.data["message"]) interpreter.SetVar("$freq" , signal.frequency) interpreter.SetVar("$source" , signal.data["name"]) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 53301ea31b..d50128314e 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -6185,7 +6185,7 @@ "coW" = (/obj/machinery/door/airlock/external,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "NTrasen"; name = "Outer Airlock"; opacity = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) "coX" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/specops/centcom) "coY" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access_txt = "101"},/turf/unsimulated/floor{icon_state = "delivery"},/area/centcom/control) -"coZ" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'icons/obj/assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) +"coZ" = (/obj/structure/table,/obj/item/assembly/shock_kit{icon = 'assemblies.dmi'},/obj/item/device/assembly/signaler,/obj/item/weapon/handcuffs,/obj/item/weapon/melee/classic_baton,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area/centcom/control) "cpa" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion (EAST)"; icon_state = "propulsion"; dir = 4},/turf/space,/area/shuttle/specops/centcom) "cpb" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/shuttle/engine/heater{tag = "icon-heater (WEST)"; icon_state = "heater"; dir = 8},/turf/unsimulated/floor,/area/shuttle/specops/centcom) "cpc" = (/obj/effect/landmark{name = "Commando-Bomb"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/specops/centcom) @@ -6979,11 +6979,11 @@ "cEk" = (/obj/structure/window/reinforced,/turf/space,/area/turret_protected/tcomwest) "cEl" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/effect/sign/securearea,/turf/simulated/floor/plating,/area/turret_protected/tcomfoyer) "cEm" = (/obj/machinery/turret,/turf/simulated/floor{tag = "icon-warningcorner (NORTH)"; icon_state = "warningcorner"; dir = 1},/area/turret_protected/tcomfoyer) -"cEn" = (/obj/machinery/turretid{ailock = 1; control_area = "Telecommunications Satellite West Wing"; icon_state = "motion1"; lethal = 1; name = "West Wing Turret deactivation control"; pixel_y = 29},/turf/simulated/floor,/area/turret_protected/tcomfoyer) +"cEn" = (/obj/machinery/turretid{ailock = 1; control_area = "Telecommunications Satellite West Wing"; icon_state = "motion1"; lethal = 1; name = "West Wing Turret deactivation control"; pixel_y = 29; req_access = list(61)},/turf/simulated/floor,/area/turret_protected/tcomfoyer) "cEo" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/power/apc{dir = 1; name = "Com Sat Foyer APC"; pixel_y = 26},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/turret_protected/tcomfoyer) "cEp" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/turret_protected/tcomfoyer) "cEq" = (/obj/structure/stool/bed/chair,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/turret_protected/tcomfoyer) -"cEr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/turretid{ailock = 1; control_area = "Telecommunications Satellite East Wing"; icon_state = "motion1"; lethal = 1; name = "East Wing Turret deactivation control"; pixel_y = 29},/turf/simulated/floor,/area/turret_protected/tcomfoyer) +"cEr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/machinery/turretid{ailock = 1; control_area = "Telecommunications Satellite East Wing"; icon_state = "motion1"; lethal = 1; name = "East Wing Turret deactivation control"; pixel_y = 29; req_access = list(61)},/turf/simulated/floor,/area/turret_protected/tcomfoyer) "cEs" = (/obj/machinery/turret,/turf/simulated/floor{tag = "icon-warningcorner"; icon_state = "warningcorner"; dir = 2},/area/turret_protected/tcomfoyer) "cEt" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/effect/sign/securearea,/turf/simulated/floor/plating,/area/turret_protected/tcomfoyer) "cEu" = (/obj/structure/window/reinforced,/turf/space,/area/turret_protected/tcomeast) @@ -7022,7 +7022,7 @@ "cFb" = (/obj/machinery/power/terminal{dir = 8},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/light{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/turret_protected/tcomfoyer) "cFc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/effect/sign/electricshock,/turf/simulated/wall/r_wall,/area/turret_protected/tcomfoyer) "cFd" = (/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/turret_protected/tcomfoyer) -"cFe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/turretid{ailock = 1; pixel_y = 29},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/turret_protected/tcomfoyer) +"cFe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/turretid{ailock = 1; pixel_y = 29; req_access = list(61)},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/turret_protected/tcomfoyer) "cFf" = (/obj/effect/sign/electricshock,/turf/simulated/wall/r_wall,/area/turret_protected/tcomfoyer) "cFg" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/turret_protected/tcomfoyer) "cFh" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/turret_protected/tcomfoyer)