From 884b8b8c4d8c900199ce7e0ae7bfb2ee3b828e5c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 13 May 2018 11:54:34 -0500 Subject: [PATCH] Update smokebomb.dm --- code/game/objects/items/grenades/smokebomb.dm | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm index 5b2ab3aede..d822ede78c 100644 --- a/code/game/objects/items/grenades/smokebomb.dm +++ b/code/game/objects/items/grenades/smokebomb.dm @@ -1,36 +1,3 @@ -<<<<<<< HEAD -/obj/item/grenade/smokebomb - name = "smoke grenade" - desc = "The word 'Dank' is scribbled on it in crayon." - icon = 'icons/obj/grenade.dmi' - icon_state = "smokewhite" - det_time = 20 - item_state = "flashbang" - slot_flags = SLOT_BELT - var/datum/effect_system/smoke_spread/bad/smoke - -/obj/item/grenade/smokebomb/New() - ..() - src.smoke = new /datum/effect_system/smoke_spread/bad - src.smoke.attach(src) - -/obj/item/grenade/smokebomb/Destroy() - qdel(smoke) - return ..() - -/obj/item/grenade/smokebomb/prime() - update_mob() - playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) - smoke.set_up(4, src) - smoke.start() - - - for(var/obj/structure/blob/B in view(8,src)) - var/damage = round(30/(get_dist(B,src)+1)) - B.take_damage(damage, BURN, "melee", 0) - sleep(80) - qdel(src) -======= /obj/item/grenade/smokebomb name = "smoke grenade" desc = "The word 'Dank' is scribbled on it in crayon." @@ -62,4 +29,3 @@ B.take_damage(damage, BURN, "melee", 0) sleep(80) qdel(src) ->>>>>>> ecd0d8b... Merge pull request #37476 from AnturK/thisalwaysbuggedme