mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
fixes, comfrey, and aloe
This commit is contained in:
@@ -117,5 +117,5 @@
|
||||
/obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM)
|
||||
if(iscarbon(AM))
|
||||
var/mob/living/carbon/carbon = AM
|
||||
if(carbon.slip(2, 2, src, FALSE))
|
||||
if(carbon.slip("[src]", 2, 2))
|
||||
qdel(src)
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
/obj/item/seeds/comfrey
|
||||
name = "pack of comfrey seeds"
|
||||
desc = "These seeds grow into comfrey."
|
||||
icon_state = "seed-cabbage"
|
||||
species = "cabbage"
|
||||
plantname = "comfrey"
|
||||
product = /obj/item/weapon/grown/holder_spawner/comfrey
|
||||
yield = 4
|
||||
maturation = 3
|
||||
growthstages = 1
|
||||
growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner/comfrey
|
||||
spawned_thing = /obj/item/stack/medical/bruise_pack/comfrey
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner/comfrey/alter_stats(obj/item/stack/medical/bruise_pack/comfrey/C)
|
||||
C.heal_brute = seed.potency
|
||||
|
||||
|
||||
/obj/item/seeds/aloe
|
||||
name = "pack of aloe seeds"
|
||||
desc = "These seeds grow into aloe vera plant."
|
||||
icon_state = "seed-ambrosiavulgaris"
|
||||
species = "ambrosiavulgaris"
|
||||
plantname = "Aloe Vera Plant"
|
||||
product = /obj/item/weapon/grown/holder_spawner/aloe
|
||||
yield = 4
|
||||
icon_dead = "ambrosia-dead"
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner/aloe
|
||||
spawned_thing = /obj/item/stack/medical/ointment/aloe
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner/aloe/alter_stats(obj/item/stack/medical/ointment/aloe/A)
|
||||
A.heal_burn = seed.potency
|
||||
@@ -58,4 +58,19 @@
|
||||
if(!..()) //was it caught by a mob?
|
||||
if(seed)
|
||||
for(var/datum/plant_gene/trait/T in seed.genes)
|
||||
T.on_throw_impact(src, hit_atom)
|
||||
T.on_throw_impact(src, hit_atom)
|
||||
|
||||
|
||||
//For if You want to spawn something that is a non-grown and alter it stats
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner
|
||||
var/obj/item/spawned_thing = null
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner/proc/alter_stats(obj/item/I)
|
||||
return
|
||||
|
||||
/obj/item/weapon/grown/holder_spawner/New()
|
||||
..()
|
||||
new spawned_thing(loc)
|
||||
alter_stats(spawned_thing)
|
||||
qdel(src)
|
||||
@@ -219,7 +219,7 @@
|
||||
var/stun = min(stun_len, 7)
|
||||
var/weaken = min(stun_len, 7)
|
||||
|
||||
if(M.slip(stun, weaken, G))
|
||||
if(M.slip("[G]", stun, weaken))
|
||||
for(var/datum/plant_gene/trait/T in seed.genes)
|
||||
T.on_slip(G, M)
|
||||
|
||||
@@ -386,10 +386,10 @@
|
||||
/datum/plant_gene/trait/smoke/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
|
||||
var/datum/effect/system/chem_smoke_spread/S = new
|
||||
var/splat_location = get_turf(target)
|
||||
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1) //FOX CHANGE THIS FORMULA FOR PARA.
|
||||
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
|
||||
S.attach(splat_location)
|
||||
S.set_up(G.reagents, smoke_amount, splat_location, 0)
|
||||
S.start()
|
||||
S.set_up(G.reagents, 2, 0, splat_location)
|
||||
S.start(smoke_amount)
|
||||
G.reagents.clear_reagents()
|
||||
|
||||
/datum/plant_gene/trait/plant_type // Parent type
|
||||
|
||||
Reference in New Issue
Block a user