Bug fixes: asteroid deletation and smokebomb edition (#12001)

This commit is contained in:
Alberyk
2021-06-04 12:41:27 -03:00
committed by GitHub
parent 8e7960d075
commit e52425ef6e
7 changed files with 32 additions and 21 deletions
@@ -7,6 +7,7 @@
item_state = "flashbang"
slot_flags = SLOT_BELT
var/datum/effect/effect/system/smoke_spread/bad/smoke
var/smoke_times = 4
/obj/item/grenade/smokebomb/New()
..()
@@ -14,29 +15,28 @@
src.smoke.attach(src)
/obj/item/grenade/smokebomb/Destroy()
qdel(smoke)
QDEL_NULL(smoke)
smoke = null
return ..()
/obj/item/grenade/smokebomb/prime()
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
src.smoke.set_up(10, 0, usr.loc)
spawn(0)
src.smoke.start()
sleep(10)
src.smoke.start()
sleep(10)
src.smoke.start()
sleep(10)
src.smoke.start()
smoke = new /datum/effect/effect/system/smoke_spread/bad
smoke.attach(src)
smoke.set_up(10, 0, get_turf(src))
START_PROCESSING(SSprocessing, src)
for(var/obj/effect/blob/B in view(8,src))
var/damage = round(30/(get_dist(B,src)+1))
B.health -= damage
B.update_icon()
sleep(80)
qdel(src)
return
QDEL_IN(src, 8 SECONDS)
/obj/item/grenade/smokebomb/process()
if(!QDELETED(smoke) && (smoke_times > 0))
smoke_times--
smoke.start()
return
return PROCESS_KILL
/obj/item/grenade/smokebomb/cyborg
name = "mounted smoke deployer"