cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes it so security level blue starts even on extended to reduce meta

Browse Source 
Fixes universal recoders using fix from bs12
Adds a sanity check to telecoms
Sets coder.bad to zero (or at least deincrements it!) and uploads the map that fixes telecom turret access

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3213 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
VivianFoxfoot@gmail.com
2012-02-29 01:30:05 +00:00
parent 0efad22795
commit 587a385173
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/gamemodes/extended/extended.dm
View File

@@ -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 << "<B>The current game mode is - Extended Role-Playing!</B>"
world << "<B>Just have fun and role-play!</B>"
@@ -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()
..()

18
code/modules/mob/living/say.dm
View File

@@ -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)

3
code/modules/scripting/Implementations/Telecomms.dm
View File

@@ -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"])

8
maps/tgstation.2.0.8.dmm
View File

@@ -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)