ports some trait changes
This commit is contained in:
@@ -216,6 +216,10 @@
|
|||||||
name = "Liquid Contents"
|
name = "Liquid Contents"
|
||||||
examine_line = "<span class='info'>It has a lot of liquid contents inside.</span>"
|
examine_line = "<span class='info'>It has a lot of liquid contents inside.</span>"
|
||||||
|
|
||||||
|
/datum/plant_gene/trait/squash/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
|
||||||
|
// Squash the plant on slip.
|
||||||
|
G.squash(C)
|
||||||
|
|
||||||
/datum/plant_gene/trait/slip
|
/datum/plant_gene/trait/slip
|
||||||
// Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
|
// Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
|
||||||
// Applies other trait effects (teleporting, etc) to the target by on_slip.
|
// Applies other trait effects (teleporting, etc) to the target by on_slip.
|
||||||
@@ -361,20 +365,6 @@
|
|||||||
new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
|
new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect...
|
||||||
qdel(G)
|
qdel(G)
|
||||||
|
|
||||||
|
|
||||||
/datum/plant_gene/trait/noreact
|
|
||||||
// Makes plant reagents not react until squashed.
|
|
||||||
name = "Separated Chemicals"
|
|
||||||
|
|
||||||
/datum/plant_gene/trait/noreact/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
|
|
||||||
..()
|
|
||||||
ENABLE_BITFIELD(G.reagents.reagents_holder_flags, NO_REACT)
|
|
||||||
|
|
||||||
/datum/plant_gene/trait/noreact/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
|
|
||||||
DISABLE_BITFIELD(G.reagents.reagents_holder_flags, NO_REACT)
|
|
||||||
G.reagents.handle_reactions()
|
|
||||||
|
|
||||||
|
|
||||||
/datum/plant_gene/trait/maxchem
|
/datum/plant_gene/trait/maxchem
|
||||||
// 2x to max reagents volume.
|
// 2x to max reagents volume.
|
||||||
name = "Densified Chemicals"
|
name = "Densified Chemicals"
|
||||||
@@ -425,6 +415,9 @@
|
|||||||
/datum/plant_gene/trait/stinging
|
/datum/plant_gene/trait/stinging
|
||||||
name = "Hypodermic Prickles"
|
name = "Hypodermic Prickles"
|
||||||
|
|
||||||
|
/datum/plant_gene/trait/stinging/on_slip(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
|
||||||
|
on_throw_impact(G, target)
|
||||||
|
|
||||||
/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
|
/datum/plant_gene/trait/stinging/on_throw_impact(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
|
||||||
if(isliving(target) && G.reagents && G.reagents.total_volume)
|
if(isliving(target) && G.reagents && G.reagents.total_volume)
|
||||||
var/mob/living/L = target
|
var/mob/living/L = target
|
||||||
|
|||||||
Reference in New Issue
Block a user