mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-06-27 16:23:32 +01:00
FalseIncarnate
27f4ccda36
Fixes the reagent grinder machines not properly grinding tomato into ketchup and rice into rice Updates botany code to use qdel over del to help alleviate potential lag from del calls Removes the PanDEMIC 2200 board from Tech Storage and the Circuit Imprinter, as the computer it builds has been commented out for a long time. Also deletes the commented out code (over 250 lines of commented out code deleted)
87 lines
2.3 KiB
Plaintext
87 lines
2.3 KiB
Plaintext
// **********************
|
|
// Other harvested materials from plants (that are not food)
|
|
// **********************
|
|
|
|
/obj/item/weapon/grown // Grown weapons
|
|
name = "grown_weapon"
|
|
icon = 'icons/obj/weapons.dmi'
|
|
var/plantname
|
|
var/potency = 1
|
|
|
|
/obj/item/weapon/grown/New(newloc,planttype)
|
|
|
|
..()
|
|
|
|
var/datum/reagents/R = new/datum/reagents(50)
|
|
reagents = R
|
|
R.my_atom = src
|
|
|
|
//Handle some post-spawn var stuff.
|
|
if(planttype)
|
|
plantname = planttype
|
|
var/datum/seed/S = plant_controller.seeds[plantname]
|
|
if(!S || !S.chems)
|
|
return
|
|
|
|
potency = S.get_trait(TRAIT_POTENCY)
|
|
|
|
for(var/rid in S.chems)
|
|
var/list/reagent_data = S.chems[rid]
|
|
var/rtotal = reagent_data[1]
|
|
if(reagent_data.len > 1 && potency > 0)
|
|
rtotal += round(potency/reagent_data[2])
|
|
reagents.add_reagent(rid,max(1,rtotal))
|
|
|
|
/obj/item/weapon/grown/deathnettle // -- Skie
|
|
plantname = "deathnettle"
|
|
desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
|
|
icon = 'icons/obj/weapons.dmi'
|
|
name = "deathnettle"
|
|
icon_state = "deathnettle"
|
|
damtype = "fire"
|
|
force = 30
|
|
throwforce = 1
|
|
w_class = 2.0
|
|
throw_speed = 1
|
|
throw_range = 3
|
|
origin_tech = "combat=3"
|
|
attack_verb = list("stung")
|
|
New()
|
|
..()
|
|
spawn(5)
|
|
force = round((5+potency/2.5), 1)
|
|
|
|
suicide_act(mob/user)
|
|
viewers(user) << "\red <b>[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.</b>"
|
|
return (BRUTELOSS|TOXLOSS)
|
|
|
|
/obj/item/weapon/corncob
|
|
name = "corn cob"
|
|
desc = "A reminder of meals gone by."
|
|
icon = 'icons/obj/trash.dmi'
|
|
icon_state = "corncob"
|
|
item_state = "corncob"
|
|
w_class = 2.0
|
|
throwforce = 0
|
|
throw_speed = 4
|
|
throw_range = 20
|
|
|
|
/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
|
..()
|
|
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/kitchenknife/ritual))
|
|
user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
|
|
new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
|
|
qdel(src)
|
|
return
|
|
|
|
/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 = 2.0
|
|
throwforce = 0
|
|
throw_speed = 4
|
|
throw_range = 20
|