Merge branch 'master' into upstream-merge-31037

2017-10-01 02:53:03 -04:00
parent ee0c45751b 7980a72092
commit 6a8ca2e02c
399 changed files with 77218 additions and 9566 deletions
@@ -436,7 +436,7 @@
 	set name = "Respawn"
 	set category = "OOC"

-	if (!( GLOB.abandon_allowed ))
+	if (CONFIG_GET(flag/norespawn))
 		return
 	if ((stat != DEAD || !( SSticker )))
 		to_chat(usr, "<span class='boldnotice'>You must be dead to use this!</span>")