Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-04-19 20:41:05 +02:00
committed by GitHub
64 changed files with 973 additions and 502 deletions
+4 -1
View File
@@ -20,6 +20,9 @@
wizardstart += loc
qdel(src)
if("avatarspawn")
avatarspawn += loc
if("JoinLate")
latejoin += loc
qdel(src)
@@ -251,7 +254,7 @@
new /obj/item/clothing/mask/gas/sexymime(src.loc)
new /obj/item/clothing/under/sexymime(src.loc)
qdel(src)
/obj/effect/landmark/ruin
var/datum/map_template/ruin/ruin_template