From 0dcc630c4adaf6facd0b87438cfcfbaaba5cedcd Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 2 Apr 2020 21:15:04 +0100 Subject: [PATCH 1/5] ports some trait changes --- code/modules/hydroponics/plant_genes.dm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index b3ec36e0bb..c34aba28c8 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -216,6 +216,10 @@ name = "Liquid Contents" examine_line = "It has a lot of liquid contents inside." +/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 // 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. @@ -361,20 +365,6 @@ new /obj/effect/decal/cleanable/molten_object(T) //Leave a pile of goo behind for dramatic effect... 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 // 2x to max reagents volume. name = "Densified Chemicals" @@ -425,6 +415,9 @@ /datum/plant_gene/trait/stinging 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) if(isliving(target) && G.reagents && G.reagents.total_volume) var/mob/living/L = target From 6b3de998c0a4285b1dce615baae4cc3560b85438 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 2 Apr 2020 21:18:27 +0100 Subject: [PATCH 2/5] remove noreact from being used in plants --- code/modules/hydroponics/grown/berries.dm | 2 +- code/modules/hydroponics/grown/misc.dm | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 80792538d6..eba7a3d3c4 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -90,7 +90,7 @@ lifespan = 30 endurance = 25 mutatelist = list() - genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/noreact, /datum/plant_gene/trait/repeated_harvest) + genes = list(/datum/plant_gene/trait/glow/white, /datum/plant_gene/trait/repeated_harvest) reagents_add = list(/datum/reagent/uranium = 0.25, /datum/reagent/iodine = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) rarity = 20 diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 44abb4939b..f356ed7b68 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -492,9 +492,6 @@ return var/turf/T = get_turf(src) reagents.chem_temp = 1000 - //Disable seperated contents when the grenade primes - if (seed.get_gene(/datum/plant_gene/trait/noreact)) - DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT) reagents.handle_reactions() log_game("Coconut bomb detonation at [AREACOORD(T)], location [loc]") qdel(src) From 378e188b3b627fb9ab3410f1f96cf6be079c9f08 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 6 Apr 2020 23:57:00 +0100 Subject: [PATCH 3/5] goodbye slip prickles --- code/modules/hydroponics/plant_genes.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index c34aba28c8..a82634ae26 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -415,9 +415,6 @@ /datum/plant_gene/trait/stinging 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) if(isliving(target) && G.reagents && G.reagents.total_volume) var/mob/living/L = target From 1b940a54649fa03016e944d301d6ca15fcc733d3 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Tue, 7 Apr 2020 00:01:27 +0100 Subject: [PATCH 4/5] space tobacco now has gaseous --- code/modules/hydroponics/grown/tobacco.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index 1e2d25d825..d223a3609e 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -41,4 +41,5 @@ desc = "Dry them out to make some space-smokes." icon_state = "stobacco_leaves" distill_reagent = null - wine_power = 50 \ No newline at end of file + wine_power = 50 + genes = list(/datum/plant_gene/trait/smoke) //get it? because you smoke tobacco? i'm hilarious. From c28aa08c713c75d9f8cf4588957fac6290857050 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Tue, 7 Apr 2020 00:16:28 +0100 Subject: [PATCH 5/5] woops i didnt add it to the seed --- code/modules/hydroponics/grown/tobacco.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index d223a3609e..db929d45fb 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -34,6 +34,7 @@ mutatelist = list() reagents_add = list(/datum/reagent/medicine/salbutamol = 0.05, /datum/reagent/drug/nicotine = 0.08, /datum/reagent/consumable/nutriment = 0.03) rarity = 20 + genes = list(/datum/plant_gene/trait/smoke) //get it? because you smoke tobacco? i'm hilarious. /obj/item/reagent_containers/food/snacks/grown/tobacco/space seed = /obj/item/seeds/tobacco/space @@ -41,5 +42,4 @@ desc = "Dry them out to make some space-smokes." icon_state = "stobacco_leaves" distill_reagent = null - wine_power = 50 - genes = list(/datum/plant_gene/trait/smoke) //get it? because you smoke tobacco? i'm hilarious. + wine_power = 50 \ No newline at end of file