From 874fe4bf9cf3d44b4db4ccdf77e89c23727bc787 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:01:11 -0700 Subject: [PATCH 1/7] Update plantpeople.dm --- .../mob/living/carbon/human/species_types/plantpeople.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm index 301761acbb5c..d7ac0c309a53 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm @@ -280,3 +280,6 @@ H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL) #undef STATUS_MESSAGE_COOLDOWN + +/datum/species/pod/syndicate +changesource_flags = MIRROR_BADMIN From aed0f86cff67b27a84192563f7bd6696768876ab Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:13:44 -0700 Subject: [PATCH 2/7] Update other_reagents.dm --- .../modules/reagents/chemistry/reagents/other_reagents.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index d3f393a1dde4..e740ae8d5f54 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -571,6 +571,12 @@ race = /datum/species/lizard mutationtext = span_danger("The pain subsides. You feel... scaly.") +/datum/reagent/mutationtoxin/pod/syndicate + name = "Advanced Phytosian Mutation Toxin" + color = "#5EFF3B" //RGB: 94, 255, 59 + race = /datum/species/pod/syndicate + mutationtext = span_danger("The pain subsides. You feel Faster.") + /datum/reagent/mutationtoxin/fly name = "Fly Mutation Toxin" description = "An insectifying toxin." @@ -2131,4 +2137,4 @@ /datum/reagent/adrenaline/on_mob_delete(mob/living/L) . = ..() - REMOVE_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type) \ No newline at end of file + REMOVE_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type) From 69941e55160655f0755d2155940f4a302da4b529 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:17:40 -0700 Subject: [PATCH 3/7] Update hypospray.dm --- code/modules/reagents/reagent_containers/hypospray.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 03514fcdf3b2..82256f457bdc 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -675,6 +675,14 @@ if(hypo.penetrates) to_chat(user, span_notice("[hypo] already has a piercing mechanism!")) return FALSE + +/obj/item/reagent_containers/autoinjector/magillitis + name = "experimental phytosian autoinjector" + desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum that combats phytosians natural slowness." + icon_state = "hypo_syndie" + volume = 5 + reagent_flags = NONE + list_reagents = list(/datum/reagent/mutationtoxin/pod/syndicate = 5) else hypo.penetrates = TRUE return TRUE From 288f698ddf47a96e65b21db4a8dc2bfd672a9272 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:18:04 -0700 Subject: [PATCH 4/7] Update hypospray.dm --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 82256f457bdc..730aee698276 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -676,7 +676,7 @@ to_chat(user, span_notice("[hypo] already has a piercing mechanism!")) return FALSE -/obj/item/reagent_containers/autoinjector/magillitis +/obj/item/reagent_containers/autoinjector/phytosiansyndicateshit name = "experimental phytosian autoinjector" desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum that combats phytosians natural slowness." icon_state = "hypo_syndie" From e6cdc2056720aecdee0f9a1d9a6bd00db4f2d755 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:19:06 -0700 Subject: [PATCH 5/7] Update hypospray.dm --- code/modules/reagents/reagent_containers/hypospray.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 730aee698276..d0a59a44fd65 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -678,7 +678,7 @@ /obj/item/reagent_containers/autoinjector/phytosiansyndicateshit name = "experimental phytosian autoinjector" - desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum that combats phytosians natural slowness." + desc = "A modified air-needle autoinjector with a small single-use reservoir. It contains an experimental serum that acts on phytosians genetics to make them faster." icon_state = "hypo_syndie" volume = 5 reagent_flags = NONE From 8ff8fc6943d58793ffea3456ef5d79dd9c4690ff Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:21:20 -0700 Subject: [PATCH 6/7] Update uplink_items.dm --- code/modules/uplink/uplink_items.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index bcb456116d8a..6f366b428b5c 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -2011,6 +2011,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/seeds/tomato/killer restricted_species = list("pod") +/datum/uplink_item/race_restricted/podevolver + name = "Phytosian Evolver" + desc = "The Syndicates Geneticist have cooked up a mutation toxin that eliminates phytosians natural slowness." + cost = 3 + manufacturer = /datum/corporation/traitor/donkco + item = /obj/item/reagent_containers/autoinjector/phytosiansyndicateshit + restricted_species = list("pod") + + /datum/uplink_item/race_restricted/radiationbomb name = "Radiation grenade" desc = "A radiation bomb guaranteed to irradiate the fuck out of non-gaseous lifeforms." From bcaae9fe8d989a6cc756692f8f646f7edb9636b4 Mon Sep 17 00:00:00 2001 From: boodaliboo <40642354+boodaliboo@users.noreply.github.com> Date: Sat, 24 Sep 2022 14:27:12 -0700 Subject: [PATCH 7/7] Update plantpeople.dm --- .../mob/living/carbon/human/species_types/plantpeople.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm index d7ac0c309a53..f57c5a96e69b 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm @@ -282,4 +282,5 @@ #undef STATUS_MESSAGE_COOLDOWN /datum/species/pod/syndicate -changesource_flags = MIRROR_BADMIN + changesource_flags = MIRROR_BADMIN + speedmod = 0