Merge pull request #11638 from Ghommie/Ghommie-cit646

Moderately unoriginal PR title about runtime errors.
This commit is contained in:
Putnam3145
2020-03-27 17:12:49 -07:00
committed by GitHub
6 changed files with 19 additions and 17 deletions
+1 -1
View File
@@ -88,7 +88,7 @@
brainmob.stored_dna = new /datum/dna/stored(brainmob)
C.dna.copy_dna(brainmob.stored_dna)
if(HAS_TRAIT(L, TRAIT_NOCLONE))
brainmob.status_traits[TRAIT_NOCLONE] = L.status_traits[TRAIT_NOCLONE]
LAZYSET(brainmob.status_traits, TRAIT_NOCLONE, L.status_traits[TRAIT_NOCLONE])
var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE)
if(ZI)
brainmob.set_species(ZI.old_species) //For if the brain is cloned
+2
View File
@@ -283,6 +283,8 @@
/mob/living/carbon/resist_buckle()
. = FALSE
if(!buckled)
return
if(restrained())
// too soon.
if(last_special > world.time)
+1 -1
View File
@@ -715,7 +715,7 @@
return TRUE
/mob/living/proc/resist_buckle()
buckled.user_unbuckle_mob(src,src)
buckled?.user_unbuckle_mob(src,src)
/mob/living/proc/resist_fire()
return