From d756a5de00ea5355f5d972823426588a3ed0b40f Mon Sep 17 00:00:00 2001 From: Molti <108117184+Moltijoe@users.noreply.github.com> Date: Sun, 26 Feb 2023 03:18:18 -0600 Subject: [PATCH 1/4] Update other_reagents.dm (#18073) --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 804ab97cc7a5..7653cca307d8 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -102,7 +102,7 @@ taste_description = "slime" /datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume) - if(islist(data) && (method == INGEST || method == INJECT)) + if(islist(data) && method == INJECT) for(var/thing in L.diseases) var/datum/disease/D = thing if(D.GetDiseaseID() in data) From 9b54cac22cc2caec5cdb4dc1bf6f2d28c906b5e8 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 19:16:23 -0600 Subject: [PATCH 2/4] Update polysmorphs.dm --- .../carbon/human/species_types/polysmorphs.dm | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm b/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm index 9447592a23e4..c00fd1a876e3 100644 --- a/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm +++ b/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm @@ -2,34 +2,37 @@ //Human xenopmorph hybrid name = "Polysmorph" id = "polysmorph" + species_traits = list(NOEYESPRITES, FGENDER, MUTCOLORS, NOCOLORCHANGE, DIGITIGRADE, HAS_FLESH, HAS_TAIL) + inherent_traits = list(TRAIT_ACIDBLOOD, TRAIT_SKINNY) + inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) exotic_blood = /datum/reagent/toxin/acid //Hell yeah sulphuric acid blood meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno liked_food = GROSS | MEAT | MICE disliked_food = GRAIN | DAIRY | VEGETABLES | FRUIT say_mod = "hisses" species_language_holder = /datum/language_holder/polysmorph + brutemod = 0.9 //exoskeleton protects against brute + burnmod = 1.35 //residual plasma inside them, highly flammable coldmod = 0.75 heatmod = 1.5 acidmod = 0.2 //Their blood is literally acid - burnmod = 1.25 + action_speed_coefficient = 1.1 //claws aren't dextrous like hands + speedmod = -0.1 //apex predator humanoid hybrid payday_modifier = 0.6 //Negatively viewed by NT damage_overlay_type = "polysmorph" deathsound = 'sound/voice/hiss6.ogg' screamsound = 'sound/voice/hiss5.ogg' - species_traits = list(NOEYESPRITES, FGENDER, MUTCOLORS, NOCOLORCHANGE, DIGITIGRADE, HAS_FLESH, HAS_BONE, HAS_TAIL) - inherent_traits = list(TRAIT_ACIDBLOOD, TRAIT_SKINNY) - inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID) mutanteyes = /obj/item/organ/eyes/polysmorph mutantliver = /obj/item/organ/liver/alien + mutanttongue = /obj/item/organ/tongue/polysmorph + mutanttail = /obj/item/organ/tail/polysmorph + mutantlungs = /obj/item/organ/lungs/xeno attack_verb = "slash" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' fixed_mut_color = "444466" //don't mess with this if you don't feel like manually adjusting the mutant bodypart sprites mutant_bodyparts = list("tail_polysmorph", "dome", "dorsal_tubes", "teeth", "legs") default_features = list("tail_polysmorph" = "Polys", "dome" = "None", "dorsal_tubes" = "No", "teeth" = "None", "legs" = "Normal Legs") - mutanttongue = /obj/item/organ/tongue/polysmorph - mutanttail = /obj/item/organ/tail/polysmorph - mutantlungs = /obj/item/organ/lungs/xeno changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT smells_like = "charred, acidic meat" @@ -46,12 +49,12 @@ .=..() var/mob/living/carbon/human/H = C if(H.physiology) - H.physiology.armor.wound += 10 //Pseudo-exoskeleton makes them harder to wound + H.physiology.armor.wound += 5 //Pseudo-exoskeleton makes them harder to wound /datum/species/polysmorph/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load) .=..() if(C.physiology) - C.physiology.armor.wound -= 10 + C.physiology.armor.wound -= 5 /datum/species/polysmorph/get_species_description() return ""//"TODO: This is polysmorph description" From db11c6086275ce38e3a09d7e484bf7986bfe5b02 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 19:38:02 -0600 Subject: [PATCH 3/4] Update polysmorphs.dm --- .../mob/living/carbon/human/species_types/polysmorphs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm b/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm index c00fd1a876e3..4d8207855729 100644 --- a/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm +++ b/code/modules/mob/living/carbon/human/species_types/polysmorphs.dm @@ -18,6 +18,8 @@ acidmod = 0.2 //Their blood is literally acid action_speed_coefficient = 1.1 //claws aren't dextrous like hands speedmod = -0.1 //apex predator humanoid hybrid + punchdamagehigh = 11 //slightly better high end of damage + punchstunthreshold = 11 //technically slightly worse stunchance payday_modifier = 0.6 //Negatively viewed by NT damage_overlay_type = "polysmorph" deathsound = 'sound/voice/hiss6.ogg' From 6b84cc2243d26f187dcc1b1a1e8a51973e31bf71 Mon Sep 17 00:00:00 2001 From: Molti Date: Sun, 26 Feb 2023 20:07:30 -0600 Subject: [PATCH 4/4] Revert "Update other_reagents.dm (#18073)" This reverts commit d756a5de00ea5355f5d972823426588a3ed0b40f. --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 7653cca307d8..804ab97cc7a5 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -102,7 +102,7 @@ taste_description = "slime" /datum/reagent/vaccine/reaction_mob(mob/living/L, method=TOUCH, reac_volume) - if(islist(data) && method == INJECT) + if(islist(data) && (method == INGEST || method == INJECT)) for(var/thing in L.diseases) var/datum/disease/D = thing if(D.GetDiseaseID() in data)