fixes the runtimes

This commit is contained in:
Fox McCloud
2018-04-04 19:14:22 -04:00
parent 29a59cc06d
commit f7521320a0
16 changed files with 53 additions and 90 deletions
+3 -3
View File
@@ -94,6 +94,7 @@
w_class = WEIGHT_CLASS_TINY
resist_time = 150
mute = MUTE_MUFFLE
flags = DROPDEL
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
@@ -109,9 +110,8 @@
R.loc = T
transfer_fingerprints_to(R)
playsound(src,'sound/items/poster_ripped.ogg',40,1)
spawn(0) // Because of how dropping is done, if the muzzle gets deleted now, icons won't properly update and the whole unEquip() proc will break stuff.
qdel(src) // This makes sure it gets deleted AFTER all that has to be done is done.
user.emote("scream")
user.emote("scream")
. = ..()
/obj/item/clothing/mask/muzzle/safety
name = "safety muzzle"
@@ -93,13 +93,13 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
item_state = "tribble1"
w_class = 10
var/gestation = 0
flags = DROPDEL
/obj/item/toy/tribble/attack_self(mob/user as mob) //hug that tribble (and play a sound if we add one)
..()
to_chat(user, "<span class='notice'>You nuzzle the tribble and it trills softly.</span>")
/obj/item/toy/tribble/dropped(mob/user as mob) //now you can't item form them to get rid of them all so easily
..()
new /mob/living/simple_animal/tribble(user.loc)
for(var/mob/living/simple_animal/tribble/T in user.loc)
T.icon_state = src.icon_state
@@ -108,7 +108,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
T.gestation = src.gestation
to_chat(user, "<span class='notice'>The tribble gets up and wanders around.</span>")
qdel(src)
. = ..()
/obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering
..()
+2 -1
View File
@@ -434,7 +434,8 @@
return EAT_TIME_FAT //if it doesn't fit into the above, it's probably a fat guy, take EAT_TIME_FAT to do it
/obj/item/weapon/grab/dropped()
qdel(src)
if(!QDELETED(src))
qdel(src)
/obj/item/weapon/grab/Destroy()