Pretty much finished new sec levels Yay

This commit is contained in:
ZomgPonies
2013-11-26 14:36:36 -05:00
parent 5bba589687
commit 348faebe7c
7 changed files with 4764 additions and 4717 deletions
+3
View File
@@ -1234,6 +1234,9 @@ proc/process_ghost_teleport_locs()
/area/security/armoury
name = "\improper Armory"
icon_state = "Warden"
/area/security/armoury/gamma
name = "\improper Gamma Armory"
icon_state = "Warden"
/area/security/hos
name = "\improper Head of Security's Office"
@@ -191,6 +191,9 @@
if(z_co == 2 || z_co < 1 || z_co > 6)
usr << "\red Error: Z is less than 1, greater than 6, or equal to 2."
fail = 1
if(istype(get_area(locate(x_co,y_co,z_co)), /area/security/armoury/gamma))
usr << "\red Error: Attempting to access telescience-protected area."
fail = 1
return fail
/obj/machinery/computer/telescience/Topic(href, href_list)
+13 -1
View File
@@ -6,6 +6,8 @@
var/health = 100
var/destroyed = 0
var/inertia_dir = 0
var/allowMove = 1
var/delay = 1
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread
/obj/structure/stool/bed/chair/cart/Move()
@@ -321,10 +323,15 @@
if((istype(src.loc, /turf/space)))
if(!src.Process_Spacemove(0)) return
if(istype(user.l_hand, /obj/item/key) || istype(user.r_hand, /obj/item/key))
if(!allowMove)
return
allowMove = 0
step(src, direction)
update_mob()
handle_rotation()
/*
sleep(delay)
allowMove = 1
/*
if(istype(src.loc, /turf/space) && (!src.Process_Spacemove(0, user)))
var/turf/space/S = src.loc
S.Entered(src)*/
@@ -353,6 +360,9 @@
if((istype(src.loc, /turf/space)))
if(!src.Process_Spacemove(0)) return
if(istype(user.l_hand, /obj/item/key) || istype(user.r_hand, /obj/item/key))
if(!allowMove)
return
allowMove = 0
step(src, direction)
// NEW PULLING CODE
if (istype(user.pulling, /obj/structure/stool/bed/roller))
@@ -362,6 +372,8 @@
// END NEW PULLING CODE
update_mob()
handle_rotation()
sleep(delay)
allowMove = 1
/*
if(istype(src.loc, /turf/space) && (!src.Process_Spacemove(0, user)))
var/turf/space/S = src.loc
+8
View File
@@ -55,6 +55,7 @@
<A href='?src=\ref[src];secretscoder=maint_access_engiebrig'>Change all maintenance doors to engie/brig access only</A><BR>
<A href='?src=\ref[src];secretscoder=maint_access_brig'>Change all maintenance doors to brig access only</A><BR>
<A href='?src=\ref[src];secretscoder=infinite_sec'>Remove cap on security officers</A><BR>
<A href='?src=\ref[src];secretscoder=maint_access_engiebrig'>Change Security Level </A><BR>
<BR>
<B>Coder Secrets</B><BR>
<BR>
@@ -115,6 +116,13 @@
<A href='?src=\ref[src];secretsfun=fakeguns'>Make all items look like guns</A><BR>
<A href='?src=\ref[src];secretsfun=schoolgirl'>Japanese Animes Mode</A><BR>
<A href='?src=\ref[src];secretsfun=eagles'>Egalitarian Station Mode</A><BR>
<BR>
<A href='?src=\ref[src];secretsfun=securitylevel0'>Change Security Level To Green</A><BR>
<A href='?src=\ref[src];secretsfun=securitylevel1'>Change Security Level To Blue</A><BR>
<A href='?src=\ref[src];secretsfun=securitylevel2'>Change Security Level To Red</A><BR>
<A href='?src=\ref[src];secretsfun=securitylevel3'>Change Security Level To Gamma</A><BR>
<A href='?src=\ref[src];secretsfun=securitylevel4'>Change Security Level To Epsilon</A><BR>
<A href='?src=\ref[src];secretsfun=securitylevel5'>Change Security Level To Delta</A><BR>
"}
dat += "</center></body></html>"
var/datum/browser/popup = new(usr, "secrets", "<div align='center'>Admin Secrets</div>", 610, 650)
+19
View File
@@ -1894,6 +1894,7 @@
var/turf/loc = find_loc(H)
var/security = 0
if(loc.z > 1 || prisonwarped.Find(H))
//don't warp them if they aren't ready or are already there
continue
H.Paralyse(5)
@@ -2243,6 +2244,24 @@
feedback_add_details("admin_secrets_fun_used","OO")
usr.client.only_one()
// message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)")
if("securitylevel0")
set_security_level(0)
message_admins("\blue [key_name_admin(usr)] change security level to Green.", 1)
if("securitylevel1")
set_security_level(1)
message_admins("\blue [key_name_admin(usr)] change security level to Blue.", 1)
if("securitylevel2")
set_security_level(2)
message_admins("\blue [key_name_admin(usr)] change security level to Red.", 1)
if("securitylevel3")
set_security_level(3)
message_admins("\blue [key_name_admin(usr)] change security level to Gamma.", 1)
if("securitylevel4")
set_security_level(4)
message_admins("\blue [key_name_admin(usr)] change security level to Epsilon.", 1)
if("securitylevel5")
set_security_level(5)
message_admins("\blue [key_name_admin(usr)] change security level to Delta.", 1)
if(usr)
log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
if (ok)
@@ -18,7 +18,7 @@
level = SEC_LEVEL_RED
if("gamma")
level = SEC_LEVEL_GAMMA
if("epsiolon")
if("epsilon")
level = SEC_LEVEL_EPSILON
if("delta")
level = SEC_LEVEL_DELTA
@@ -54,10 +54,11 @@
world << "<font size=4 color='red'>Attention! Code red!</font>"
world << "<font color='red'>[config.alert_desc_red_downto]</font>"
security_level = SEC_LEVEL_RED
for(var/obj/machinery/door/airlock/highsecurity/red/R in machines)
if(R.z == 1)
R.locked = 0
R.update_icon()
var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in world
message_admins("Found [R]")
if(R && R.z == 1)
R.locked = 0
R.update_icon()
/* - At the time of commit, setting status displays didn't work properly
var/obj/machinery/computer/communications/CC = locate(/obj/machinery/computer/communications,world)
if(CC)
@@ -72,11 +73,11 @@
world << "<font size=4 color='red'>Attention! GAMMA security level activated!</font>"
world << "<font color='red'>[config.alert_desc_red_upto]</font>"
if(security_level < SEC_LEVEL_RED)
for(var/obj/machinery/door/airlock/highsecurity/red/R in machines)
for(var/obj/machinery/door/airlock/highsecurity/red/R in world)
if(R.z == 1)
R.locked = 0
R.update_icon()
for(var/obj/machinery/door/airlock/hatch/gamma/H in machines)
for(var/obj/machinery/door/airlock/hatch/gamma/H in world)
if(H.z == 1)
H.open()
spawn(10)
+4710 -4709
View File
File diff suppressed because it is too large Load Diff