From 5211f7ffbba5cc3430684c7b034c2cb888efaaad Mon Sep 17 00:00:00 2001 From: xxalpha Date: Wed, 29 Oct 2014 20:44:58 +0000 Subject: [PATCH] Tweaked --- code/modules/clothing/shoes/bananashoes.dm | 4 ++-- code/modules/hydroponics/growninedible.dm | 13 +++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index 57773c7c187..6c1999ac6e1 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -1,8 +1,8 @@ //banana flavored chaos and horror ahead /obj/item/clothing/shoes/clown_shoes/banana_shoes - desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake." name = "mk-honk prototype shoes" + desc = "Lost prototype of advanced clown tech. Powered by bananium, these shoes leave a trail of chaos in their wake." icon_state = "clown_prototype_off" var/on = 0 var/bananium = 0 @@ -16,7 +16,7 @@ else footstep++ - new/obj/item/weapon/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180))) //honk + new/obj/item/weapon/grown/bananapeel/specialpeel(get_step(src,turn(usr.dir, 180)), 5) //honk bananium -= 100 if(bananium < 100) on = !on diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 74b843aa1fd..def1291608f 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -264,21 +264,14 @@ var/stun = Clamp(potency / 10, 1, 10) var/weaken = Clamp(potency / 20, 0.5, 5) M.slip(stun, weaken, src) + return 1 -//===================banana shoes peels================================ -/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes +/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes name = "synthesized banana peel" desc = "A synthetic banana peel." -/obj/item/weapon/grown/bananapeel/specialpeel/New(newloc, new_potency = 5) - ..() - /obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM) - ..() - if(istype(AM, /mob/living/carbon)) //aahhhh - qdel(src) - -//===================================================================== + if(..()) qdel(src) /obj/item/weapon/grown/corncob name = "corn cob"