Merge pull request #18729 from coiax/remove-spawn-3

Remove spawn III
This commit is contained in:
oranges
2016-06-21 20:11:08 +12:00
committed by GitHub
39 changed files with 64 additions and 127 deletions
+3 -5
View File
@@ -20,16 +20,14 @@
owner.status_flags |= XENO_HOST
START_PROCESSING(SSobj, src)
owner.med_hud_set_status()
spawn(0)
AddInfectionImages(owner)
addtimer(src, "AddInfectionImages", 0, FALSE, owner)
/obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0)
STOP_PROCESSING(SSobj, src)
if(owner)
owner.status_flags &= ~(XENO_HOST)
owner.med_hud_set_status()
spawn(0)
RemoveInfectionImages(owner)
addtimer(src, "RemoveInfectionImages", 0, FALSE, owner)
..()
/obj/item/organ/body_egg/process()
@@ -51,4 +49,4 @@
return
/obj/item/organ/body_egg/proc/RemoveInfectionImages()
return
return
@@ -92,8 +92,7 @@
target.add_overlay(image_overlay, 1)
user << "<span class='notice'>You plant the bomb. Timer counting down from [timer].</span>"
spawn(timer*10)
explode()
addtimer(src, "explode", timer * 10)
/obj/item/weapon/c4/proc/explode()
if(qdeleted(src))
@@ -45,8 +45,7 @@
var/mob/living/carbon/C = user
C.throw_mode_on()
spawn(det_time)
prime()
addtimer(src, "prime", det_time)
/obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)
@@ -43,9 +43,7 @@
payload = payload_type
active = 1
walk_away(src,loc,rand(1,4))
spawn(rand(15,60))
prime()
addtimer(src, "prime", rand(15,60))
/obj/item/weapon/grenade/clusterbuster/segment/prime()
@@ -127,4 +125,4 @@
/obj/item/weapon/grenade/clusterbuster/clf3
name = "WELCOME TO HELL"
payload = /obj/item/weapon/grenade/chem_grenade/clf3
payload = /obj/item/weapon/grenade/chem_grenade/clf3
@@ -55,8 +55,7 @@
if(iscarbon(user))
var/mob/living/carbon/C = user
C.throw_mode_on()
spawn(det_time)
prime()
addtimer(src, "prime", det_time)
/obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up
update_mob()