Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

# Conflicts:
#	code/game/machinery/doors/airlock.dm
This commit is contained in:
Aurorablade
2016-12-29 11:01:43 -05:00
209 changed files with 13486 additions and 11449 deletions
-8
View File
@@ -2222,14 +2222,6 @@
qdel(O)
for(var/obj/structure/grille/O in world)
qdel(O)
/* for(var/obj/machinery/vehicle/pod/O in world)
for(var/mob/M in src)
M.loc = src.loc
if(M.client)
M.client.perspective = MOB_PERSPECTIVE
M.client.eye = M
qdel(O)
ok = 1*/
if("monkey")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","M")