mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 13:07:46 +01:00
fixes, comfrey, and aloe
This commit is contained in:
@@ -5,26 +5,6 @@
|
||||
* Bike Horns
|
||||
*/
|
||||
|
||||
/*
|
||||
* Banana Peals
|
||||
*/
|
||||
|
||||
/obj/item/weapon/bananapeel
|
||||
name = "banana peel"
|
||||
desc = "A peel from a banana."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
icon_state = "banana_peel"
|
||||
item_state = "banana_peel"
|
||||
w_class = 1
|
||||
throwforce = 0
|
||||
throw_speed = 4
|
||||
throw_range = 20
|
||||
|
||||
/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
|
||||
if(istype(AM, /mob/living/carbon))
|
||||
var/mob/living/carbon/M = AM
|
||||
M.slip("banana peel", 4, 2)
|
||||
|
||||
/*
|
||||
* Soap
|
||||
*/
|
||||
|
||||
@@ -9,7 +9,7 @@ var/turf/T
|
||||
icon_state = "banana"
|
||||
item_state = "flashbang"
|
||||
var/deliveryamt = 8
|
||||
var/spawner_type = /obj/item/weapon/bananapeel
|
||||
var/spawner_type = /obj/item/weapon/grown/bananapeel
|
||||
|
||||
/obj/item/weapon/grenade/bananade/prime()
|
||||
if(spawner_type && deliveryamt)
|
||||
@@ -38,7 +38,7 @@ var/turf/T
|
||||
|
||||
|
||||
/obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params)
|
||||
if(istype(I, /obj/item/weapon/bananapeel))
|
||||
if(istype(I, /obj/item/weapon/grown/bananapeel))
|
||||
if(fillamt < 9)
|
||||
to_chat(usr, "<span class='notice'>You add another banana peel to the assembly.</span>")
|
||||
fillamt += 1
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
for(var/direction in alldirs)
|
||||
for(i = 0; i < 2; i++)
|
||||
number++
|
||||
var/obj/item/weapon/bananapeel/traitorpeel/peel = new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
|
||||
var/obj/item/weapon/grown/bananapeel/traitorpeel/peel = new /obj/item/weapon/grown/bananapeel/traitorpeel(get_turf(src.loc))
|
||||
/* var/direction = pick(alldirs)
|
||||
var/spaces = pick(1;150, 2)
|
||||
var/a = 0
|
||||
@@ -35,7 +35,7 @@
|
||||
step(peel,direction)
|
||||
else
|
||||
step(peel,direction)
|
||||
new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
|
||||
new /obj/item/weapon/grown/bananapeel/traitorpeel(get_turf(src.loc))
|
||||
qdel(src)
|
||||
return
|
||||
/*
|
||||
@@ -46,10 +46,10 @@
|
||||
return
|
||||
if(locate(/obj/structure/window) in T)
|
||||
return
|
||||
new /obj/item/weapon/bananapeel/traitorpeel(T)
|
||||
new /obj/item/weapon/grown/bananapeel/traitorpeel(T)
|
||||
*/
|
||||
|
||||
/obj/item/weapon/bananapeel/traitorpeel
|
||||
/obj/item/weapon/grown/bananapeel/traitorpeel
|
||||
name = "banana peel"
|
||||
desc = "A peel from a banana."
|
||||
icon = 'icons/obj/items.dmi'
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
|
||||
/obj/item/weapon/grenade/clusterbuster/honk
|
||||
name = "Mega Honk Grenade"
|
||||
payload = /obj/item/weapon/bananapeel
|
||||
payload = /obj/item/weapon/grown/bananapeel
|
||||
|
||||
/obj/item/weapon/grenade/clusterbuster/honk_evil
|
||||
name = "Evil Mega Honk Grenade"
|
||||
|
||||
Reference in New Issue
Block a user