fixing flowers

This commit is contained in:
Fox-McCloud
2017-01-26 06:23:10 -05:00
parent 73ac77e8df
commit 5e9e417bb4
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -177,8 +177,7 @@
force = round((5 + seed.potency / 5), 1)
/obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M, mob/user)
if(!..())
return
..()
if(isliving(M))
to_chat(M, "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>")
M.adjust_fire_stacks(seed.potency / 20)
@@ -187,7 +186,8 @@
log_game("[key_name(user)] set [key_name(M)] on fire")
/obj/item/weapon/grown/novaflower/afterattack(atom/A as mob|obj, mob/user,proximity)
if(!proximity) return
if(!proximity)
return
if(force > 0)
force -= rand(1, (force / 3) + 1)
else
+3 -3
View File
@@ -65,7 +65,8 @@
/obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity)
if(!proximity) return
if(!proximity)
return
if(force > 0)
force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off
else
@@ -100,8 +101,7 @@
to_chat(user, "<span class='userdanger'>You are stunned by the Deathnettle when you try picking it up!</span>")
/obj/item/weapon/grown/nettle/death/attack(mob/living/carbon/M, mob/user)
if(!..())
return
..()
if(isliving(M))
to_chat(M, "<span class='danger'>You are stunned by the powerful acid of the Deathnettle!</span>")
add_logs(user, M, "attacked", src)