diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 75d3e402f8a..c6c0e4586b9 100644
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -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"
diff --git a/code/game/machinery/computer/telescience.dm b/code/game/machinery/computer/telescience.dm
index 1b3b875d836..b0ce949fc0c 100644
--- a/code/game/machinery/computer/telescience.dm
+++ b/code/game/machinery/computer/telescience.dm
@@ -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)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 3164eb7886c..31f8cae721e 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -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
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 98657e717ec..df113bc08bb 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -55,6 +55,7 @@
Change all maintenance doors to engie/brig access only
Change all maintenance doors to brig access only
Remove cap on security officers
+ Change Security Level
Coder Secrets
@@ -115,6 +116,13 @@
Make all items look like guns
Japanese Animes Mode
Egalitarian Station Mode
+
+ Change Security Level To Green
+ Change Security Level To Blue
+ Change Security Level To Red
+ Change Security Level To Gamma
+ Change Security Level To Epsilon
+ Change Security Level To Delta
"}
dat += "