Merge remote-tracking branch 'citadel/master' into minimaps

2020-03-11 17:32:15 -07:00
parent 39a949f223 b311b62919
commit 14b22f0b67
789 changed files with 217724 additions and 211404 deletions
@@ -224,7 +224,7 @@
 /mob/living/carbon/canSuicide()
 	if(!..())
 		return
-	if(IsStun() || IsKnockdown())	//just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide
+	if(!CHECK_MULTIPLE_BITFIELDS(mobility_flags, MOBILITY_MOVE|MOBILITY_USE))	//just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide
 		to_chat(src, "You can't commit suicide while stunned! ((You can type Ghost instead however.))")
 		return
 	if(restrained())