Moderately unoriginal PR title about runtime errors.

This commit is contained in:
Ghommie
2020-03-26 23:22:51 +01:00
parent 613c66d88e
commit 3c42e9eefd
6 changed files with 19 additions and 17 deletions
+2
View File
@@ -2131,6 +2131,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
toggles ^= MEMBER_PUBLIC
if("gender")
var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) as null|anything in list(MALE,FEMALE,"nonbinary","object")
if(!chosengender)
return
switch(chosengender)
if("nonbinary")
chosengender = PLURAL
+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
+4 -4
View File
@@ -65,10 +65,10 @@
update_icon()
/obj/item/gun/energy/Destroy()
if(flags_1 & INITIALIZED_1)
QDEL_NULL(cell)
QDEL_LIST(ammo_type)
STOP_PROCESSING(SSobj, src)
//no need to delete them, since contents are already deleted in atom/movable/Destroy().
cell = null
ammo_type = null
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/gun/energy/examine(mob/user)