From df6d3e6da29252a72222f0138c9b34d3b1992afd Mon Sep 17 00:00:00 2001 From: drynwyn Date: Fri, 10 Jun 2016 02:12:00 -0400 Subject: [PATCH 1/3] Adds factions to pod people --- code/modules/hydroponics/grown/replicapod.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 9996e4f5cf3..dac9070d4a0 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -35,6 +35,8 @@ blood_type = bloodSample.data["blood_type"] features = bloodSample.data["features"] factions = bloodSample.data["factions"] + factions |= "plants" + factions |= "vines" W.reagents.clear_reagents() user << "You inject the contents of the syringe into the seeds." contains_sample = 1 @@ -110,4 +112,4 @@ var/obj/item/seeds/replicapod/harvestseeds = src.Copy() harvestseeds.loc = user.loc - parent.update_tray() \ No newline at end of file + parent.update_tray() From aa81f49540dc5c59dbbfc721b821bd3637cb0555 Mon Sep 17 00:00:00 2001 From: drynwyn Date: Fri, 10 Jun 2016 11:12:11 -0400 Subject: [PATCH 2/3] Faction adding in species_gain rather than pod. --- code/modules/mob/living/carbon/human/species_types.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 6c88cf2a47d..11143f7f00a 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -148,6 +148,11 @@ if(/obj/item/projectile/energy/florayield) H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL) return + +/datum/species/pod/on_species_gain(mob/living/carbon/C) + ..() + C.faction |= "plants" + C.faction |= "vines" /* SHADOWPEOPLE From 14bdb5995dc319ee3f4dc1c02fd2dafdd57f8a6b Mon Sep 17 00:00:00 2001 From: drynwyn Date: Fri, 10 Jun 2016 11:13:26 -0400 Subject: [PATCH 3/3] Removes superfluous faction adding. --- code/modules/hydroponics/grown/replicapod.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index dac9070d4a0..f421032ecc2 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -35,8 +35,6 @@ blood_type = bloodSample.data["blood_type"] features = bloodSample.data["features"] factions = bloodSample.data["factions"] - factions |= "plants" - factions |= "vines" W.reagents.clear_reagents() user << "You inject the contents of the syringe into the seeds." contains_sample = 1