Merge pull request #7130 from FalseIncarnate/bugfix

Allows scythes to mass-clear glowshrooms
This commit is contained in:
Fox McCloud
2017-04-26 00:10:26 -04:00
committed by GitHub
2 changed files with 18 additions and 9 deletions
+10 -1
View File
@@ -153,8 +153,17 @@
/obj/structure/glowshroom/attackby(obj/item/I, mob/user)
..()
var/damage_to_do = I.force
if(istype(I, /obj/item/weapon/scythe))
var/obj/item/weapon/scythe/S = I
if(S.extend) //so folded telescythes won't get damage boosts / insta-clears (they instead will instead be treated like non-scythes)
damage_to_do *= 4
for(var/obj/structure/glowshroom/G in range(1,src))
G.endurance -= damage_to_do
G.CheckEndurance()
return
if(I.damtype != STAMINA)
endurance -= I.force
endurance -= damage_to_do
CheckEndurance()
/obj/structure/glowshroom/ex_act(severity)