From 7b7ad6cf562dbd94d6b3ee11585dbc85fd96cb3a Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 11:31:59 -0500 Subject: [PATCH 01/13] i miss colton :( --- .../carbon/human/species_types/preternis/organs.dm | 14 ++------------ .../human/species_types/preternis/preternis.dm | 8 +++----- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm index 2206003e834d..54a782881aa9 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm @@ -46,17 +46,7 @@ name = "preternis lungs" desc = "An experimental set of lungs.Due to the cybernetic nature of these lungs,they are less resistant to heat and cold but are more efficent at filtering oxygen." icon_state = "lungs-c" - safe_oxygen_min = 12 - safe_toxins_max = 10 - gas_stimulation_min = 0.1 //fucking filters removing my stimulants - - cold_level_1_threshold = 280 - cold_level_1_damage = 1.5 - cold_level_2_threshold = 260 - cold_level_2_damage = 3 - cold_level_3_threshold = 200 - cold_level_3_damage = 4.5 - + gas_stimulation_min = 0.1 //fucking filters removing my stimulants this is so cringe can we NEVER HAVE THIS FEATURE,ALEXKAR YOU FAT FUCKING WHORE WHO USES STIMULIUM LITERALLY WH heat_level_1_threshold = 320 heat_level_2_threshold = 400 - heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE + heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE+fuck cold because monstermos and its consequences for the human race have been a disaster for preternis diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 78d27cb90238..e48236db0ec2 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -16,20 +16,18 @@ adjust_charge - take a positive or negative value to adjust the charge level attack_verb = "assault" meat = /obj/item/reagent_containers/food/snacks/meat/slab/synthmeat toxic_food = NONE - brutemod = 1.25 - burnmod = 1.5 yogs_draw_robot_hair = TRUE mutanteyes = /obj/item/organ/eyes/preternis mutantlungs = /obj/item/organ/lungs/preternis yogs_virus_infect_chance = 20 - virus_resistance_boost = 10 //YEOUTCH,good luck getting it out + // Remember the Virus boost? Me neither you powergaming FUCK. var/charge = PRETERNIS_LEVEL_FULL var/eating_msg_cooldown = FALSE var/emag_lvl = 0 var/power_drain = 0.5 //probably going to have to tweak this shit var/tesliumtrip = FALSE var/draining = FALSE - screamsound = 'goon/sound/robot_scream.ogg' + screamsound = 'goon/sound/robot_scream.ogg' //haha stole from goon lol species_language_holder = /datum/language_holder/preternis /datum/species/preternis/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) @@ -96,7 +94,7 @@ adjust_charge - take a positive or negative value to adjust the charge level H.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) if(H.reagents.has_reagent("welding_fuel")) - H.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) + H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat. if(H.reagents.has_reagent("teslium",10)) //10 u otherwise it wont update and they will remain quikk H.add_movespeed_modifier("preternis_teslium", update=TRUE, priority=101, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) From c9e1154dab92fae6861e6dbd377e44615265394f Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 11:35:25 -0500 Subject: [PATCH 02/13] i miss lily :( --- .../living/carbon/human/species_types/preternis/preternis.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index e48236db0ec2..4f20d1b8a304 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -10,7 +10,7 @@ adjust_charge - take a positive or negative value to adjust the charge level id = "preternis" default_color = "FFFFFF" changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT - inherent_traits = list(TRAIT_NOHUNGER,TRAIT_RADIMMUNE) + inherent_traits = list(TRAIT_NOHUNGER) //im sorry atmos,forgive me but it MUST BE DONE! species_traits = list(EYECOLOR,HAIR,LIPS) say_mod = "intones" attack_verb = "assault" From ab298c1cb2f54e641ba24364a3682dd1995be09a Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 12:00:09 -0500 Subject: [PATCH 03/13] bugs,lots of them --- .../carbon/human/species_types/preternis/preternis.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 4f20d1b8a304..4a4d15b9bbb7 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -90,13 +90,13 @@ adjust_charge - take a positive or negative value to adjust the charge level /datum/species/preternis/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) . = ..() - if(H.reagents.has_reagent("oil")) + if(H.reagents.has_reagent(/datum/reagent/oil)) H.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) - if(H.reagents.has_reagent("welding_fuel")) + if(H.reagents.has_reagent(/datum/reagent/fuel)) H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat. - - if(H.reagents.has_reagent("teslium",10)) //10 u otherwise it wont update and they will remain quikk + H.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER) //im a lazy man + if(H.reagents.has_reagent(/datum/reagent/teslium,10)) //10 u otherwise it wont update and they will remain quikk H.add_movespeed_modifier("preternis_teslium", update=TRUE, priority=101, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) if(H.health < 50 && H.health > 0) H.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER) From 3c8dc40d5962926dfb7f602a489f23510b19739c Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 12:31:39 -0500 Subject: [PATCH 04/13] nice cock alexkar. --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 5 +++-- .../living/carbon/human/species_types/preternis/preternis.dm | 2 +- .../modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index aa332bec2487..93050c282baf 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -926,7 +926,7 @@ taste_description = "gross metal" glass_icon_state = "dr_gibb_glass" glass_name = "glass of welder fuel" - glass_desc = "Unless you're an industrial tool, this is probably not safe for consumption." + glass_desc = "Unless you're an industrial tool or a preternis, this is probably not safe for consumption." /datum/reagent/fuel/reaction_mob(mob/living/M, method=TOUCH, reac_volume)//Splashing people with welding fuel to make them easy to ignite! if(method == TOUCH || method == VAPOR) @@ -935,7 +935,8 @@ ..() /datum/reagent/fuel/on_mob_life(mob/living/carbon/M) - M.adjustToxLoss(1, 0) + if(!ispreternis(M)) + M.adjustToxLoss(1, 0) ..() return TRUE diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 4a4d15b9bbb7..c8616268688f 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -95,7 +95,7 @@ adjust_charge - take a positive or negative value to adjust the charge level if(H.reagents.has_reagent(/datum/reagent/fuel)) H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat. - H.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER) //im a lazy man + if(H.reagents.has_reagent(/datum/reagent/teslium,10)) //10 u otherwise it wont update and they will remain quikk H.add_movespeed_modifier("preternis_teslium", update=TRUE, priority=101, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) if(H.health < 50 && H.health > 0) diff --git a/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm b/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm index 245e25bbc280..dfcc7eed77d0 100644 --- a/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/yogstation/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -35,4 +35,4 @@ M.adjustOxyLoss(-2, 0) M.adjustToxLoss(-2, 0) . = 1 - return ..() || . \ No newline at end of file + return ..() || . From c5ea497ec1cd4cea99b09a6fcdb0938cea839108 Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 13:18:13 -0500 Subject: [PATCH 05/13] help --- 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 93050c282baf..14cd8ae92afb 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -938,7 +938,7 @@ if(!ispreternis(M)) M.adjustToxLoss(1, 0) ..() - return TRUE + return TRUE //more like stupid ternis lol /datum/reagent/space_cleaner name = "Space cleaner" From b27b999f6bfb65485b0340f4a71a6449fdfa982e Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 13:22:36 -0500 Subject: [PATCH 06/13] uh oh no icons git is killing itself uh oh stinky --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 2 +- .../mob/living/carbon/human/species_types/preternis/organs.dm | 2 +- .../living/carbon/human/species_types/preternis/preternis.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 14cd8ae92afb..f5720ee235fc 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -938,7 +938,7 @@ if(!ispreternis(M)) M.adjustToxLoss(1, 0) ..() - return TRUE //more like stupid ternis lol + return TRUE //more like stupid ternis lol. /datum/reagent/space_cleaner name = "Space cleaner" diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm index 54a782881aa9..4b2a11640a14 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm @@ -49,4 +49,4 @@ gas_stimulation_min = 0.1 //fucking filters removing my stimulants this is so cringe can we NEVER HAVE THIS FEATURE,ALEXKAR YOU FAT FUCKING WHORE WHO USES STIMULIUM LITERALLY WH heat_level_1_threshold = 320 heat_level_2_threshold = 400 - heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE+fuck cold because monstermos and its consequences for the human race have been a disaster for preternis + heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE+fuck cold because monstermos and its consequences for the human race have been a disaster for preternis. diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index c8616268688f..0fa87365c6c7 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -94,7 +94,7 @@ adjust_charge - take a positive or negative value to adjust the charge level H.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) if(H.reagents.has_reagent(/datum/reagent/fuel)) - H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat. + H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat... if(H.reagents.has_reagent(/datum/reagent/teslium,10)) //10 u otherwise it wont update and they will remain quikk H.add_movespeed_modifier("preternis_teslium", update=TRUE, priority=101, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) From 0156720efe5d0bb37503e7a62f5e904ef78fa686 Mon Sep 17 00:00:00 2001 From: Code611 <44381232+Code611@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:45:30 -0500 Subject: [PATCH 07/13] Update yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- .../mob/living/carbon/human/species_types/preternis/preternis.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index c8616268688f..ef68c4168559 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -95,6 +95,7 @@ adjust_charge - take a positive or negative value to adjust the charge level if(H.reagents.has_reagent(/datum/reagent/fuel)) H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat. + . = TRUE if(H.reagents.has_reagent(/datum/reagent/teslium,10)) //10 u otherwise it wont update and they will remain quikk H.add_movespeed_modifier("preternis_teslium", update=TRUE, priority=101, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) From 11369d735fa797cb1ff24d4fd8a26b1147a4fdbe Mon Sep 17 00:00:00 2001 From: Code611 <44381232+Code611@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:45:38 -0500 Subject: [PATCH 08/13] Update yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- .../living/carbon/human/species_types/preternis/preternis.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index ef68c4168559..46f5a36fbf4c 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -88,7 +88,8 @@ adjust_charge - take a positive or negative value to adjust the charge level to_chat(H,"ALERT! OPTIC SENSORS FAILURE.VISION PROCESSOR COMPROMISED.") /datum/species/preternis/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H) - . = ..() + ..() + . = FALSE if(H.reagents.has_reagent(/datum/reagent/oil)) H.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) From 3f9d935956d4868026ddfa0aff104f54ea0ea9c6 Mon Sep 17 00:00:00 2001 From: Code611 <44381232+Code611@users.noreply.github.com> Date: Tue, 31 Mar 2020 16:45:44 -0500 Subject: [PATCH 09/13] Update yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm Co-Authored-By: alexkar598 <25136265+alexkar598@users.noreply.github.com> --- .../living/carbon/human/species_types/preternis/preternis.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 46f5a36fbf4c..06b78fc29ace 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -10,7 +10,7 @@ adjust_charge - take a positive or negative value to adjust the charge level id = "preternis" default_color = "FFFFFF" changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT - inherent_traits = list(TRAIT_NOHUNGER) //im sorry atmos,forgive me but it MUST BE DONE! + inherent_traits = list(TRAIT_NOHUNGER) species_traits = list(EYECOLOR,HAIR,LIPS) say_mod = "intones" attack_verb = "assault" From 4e663403aea91dfa317fd5e9703caed991b5f5b9 Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 17:07:22 -0500 Subject: [PATCH 10/13] demanded changes and diary of a wimpy kid removal --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 6 ------ .../living/carbon/human/species_types/preternis/organs.dm | 4 ++-- .../carbon/human/species_types/preternis/preternis.dm | 7 +++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index f5720ee235fc..65000faff1bd 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -934,12 +934,6 @@ return ..() -/datum/reagent/fuel/on_mob_life(mob/living/carbon/M) - if(!ispreternis(M)) - M.adjustToxLoss(1, 0) - ..() - return TRUE //more like stupid ternis lol. - /datum/reagent/space_cleaner name = "Space cleaner" description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm index 4b2a11640a14..a2132c6313a0 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm @@ -46,7 +46,7 @@ name = "preternis lungs" desc = "An experimental set of lungs.Due to the cybernetic nature of these lungs,they are less resistant to heat and cold but are more efficent at filtering oxygen." icon_state = "lungs-c" - gas_stimulation_min = 0.1 //fucking filters removing my stimulants this is so cringe can we NEVER HAVE THIS FEATURE,ALEXKAR YOU FAT FUCKING WHORE WHO USES STIMULIUM LITERALLY WH + gas_stimulation_min = 0.1 //fucking filters removing my stimulants heat_level_1_threshold = 320 heat_level_2_threshold = 400 - heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE+fuck cold because monstermos and its consequences for the human race have been a disaster for preternis. + heat_level_3_threshold = 600 //HALP MY LUNGS ARE ON FIRE diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 0fa87365c6c7..0dbd65ecee67 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -20,14 +20,13 @@ adjust_charge - take a positive or negative value to adjust the charge level mutanteyes = /obj/item/organ/eyes/preternis mutantlungs = /obj/item/organ/lungs/preternis yogs_virus_infect_chance = 20 - // Remember the Virus boost? Me neither you powergaming FUCK. var/charge = PRETERNIS_LEVEL_FULL var/eating_msg_cooldown = FALSE var/emag_lvl = 0 var/power_drain = 0.5 //probably going to have to tweak this shit var/tesliumtrip = FALSE var/draining = FALSE - screamsound = 'goon/sound/robot_scream.ogg' //haha stole from goon lol + screamsound = 'goon/sound/robot_scream.ogg' species_language_holder = /datum/language_holder/preternis /datum/species/preternis/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) @@ -94,7 +93,7 @@ adjust_charge - take a positive or negative value to adjust the charge level H.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) if(H.reagents.has_reagent(/datum/reagent/fuel)) - H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) //Preternis can have a little bit of brute healing,as a treat... + H.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER,FALSE,FALSE, BODYPART_ANY) if(H.reagents.has_reagent(/datum/reagent/teslium,10)) //10 u otherwise it wont update and they will remain quikk H.add_movespeed_modifier("preternis_teslium", update=TRUE, priority=101, multiplicative_slowdown=-2, blacklisted_movetypes=(FLYING|FLOATING)) @@ -128,7 +127,7 @@ adjust_charge - take a positive or negative value to adjust the charge level H.reagents.del_reagent(chem.type) - return FALSE + return /datum/species/preternis/spec_fully_heal(mob/living/carbon/human/H) . = ..() From dfe9a88bb6a02920907c2fedbb76f5f3e3fcb60e Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 18:33:23 -0500 Subject: [PATCH 11/13] woops --- code/modules/reagents/chemistry/reagents/other_reagents.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 65000faff1bd..4873cf7873fd 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -934,6 +934,11 @@ return ..() +/datum/reagent/fuel/on_mob_life(mob/living/carbon/M) + M.adjustToxLoss(1, 0) + ..() + return TRUE + /datum/reagent/space_cleaner name = "Space cleaner" description = "A compound used to clean things. Now with 50% more sodium hypochlorite!" From 6eb85904361b5e50f676b88928bbaacfb06668ab Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 19:40:04 -0500 Subject: [PATCH 12/13] Rad Immunity+Virus Immunity Re-add and Buff --- .../living/carbon/human/species_types/preternis/preternis.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 5fce443bf6cb..45bb17316836 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -10,7 +10,7 @@ adjust_charge - take a positive or negative value to adjust the charge level id = "preternis" default_color = "FFFFFF" changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT - inherent_traits = list(TRAIT_NOHUNGER) + inherent_traits = list(TRAIT_NOHUNGER,TRAIT_RADIMMUNE) species_traits = list(EYECOLOR,HAIR,LIPS) say_mod = "intones" attack_verb = "assault" @@ -19,7 +19,7 @@ adjust_charge - take a positive or negative value to adjust the charge level yogs_draw_robot_hair = TRUE mutanteyes = /obj/item/organ/eyes/preternis mutantlungs = /obj/item/organ/lungs/preternis - yogs_virus_infect_chance = 20 + yogs_virus_infect_chance = 0 var/charge = PRETERNIS_LEVEL_FULL var/eating_msg_cooldown = FALSE var/emag_lvl = 0 From 526e55b7bab5bff20782e96369f5a4dae36293f1 Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Tue, 31 Mar 2020 19:48:23 -0500 Subject: [PATCH 13/13] Inorganic Biology Instead of Virus Immunity --- .../living/carbon/human/species_types/preternis/preternis.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 45bb17316836..ec9cfec8f762 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -11,6 +11,7 @@ adjust_charge - take a positive or negative value to adjust the charge level default_color = "FFFFFF" changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT inherent_traits = list(TRAIT_NOHUNGER,TRAIT_RADIMMUNE) + inherent_biotypes = list(MOB_INORGANIC) species_traits = list(EYECOLOR,HAIR,LIPS) say_mod = "intones" attack_verb = "assault" @@ -19,7 +20,6 @@ adjust_charge - take a positive or negative value to adjust the charge level yogs_draw_robot_hair = TRUE mutanteyes = /obj/item/organ/eyes/preternis mutantlungs = /obj/item/organ/lungs/preternis - yogs_virus_infect_chance = 0 var/charge = PRETERNIS_LEVEL_FULL var/eating_msg_cooldown = FALSE var/emag_lvl = 0