Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792

2020-05-31 16:08:52 +02:00
parent 949e8f6b3a b7411bf9a0
commit 2f3fd48b84
363 changed files with 10012 additions and 3157 deletions
@@ -97,9 +97,6 @@
 	if(current)	// remove ourself from our old body's mind variable
 		current.mind = null
 		SStgui.on_transfer(current, new_character)
-		if(iscarbon(current))
-			var/mob/living/carbon/C = current
-			C.disable_intentional_combat_mode(TRUE)

 	if(key)
 		if(new_character.key != key)					//if we're transferring into a body with a key associated which is not ours