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

2019-10-15 20:40:07 +02:00
parent ac0b3629f1 26617ba780
commit aa6860250b
269 changed files with 57558 additions and 56476 deletions
@@ -42,7 +42,7 @@
 		if(brainmob.mind)
 			brainmob.mind.transfer_to(C)
 		else
-			C.key = brainmob.key
+			brainmob.transfer_ckey(C)

 		QDEL_NULL(brainmob)