diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index aa332bec2487..4873cf7873fd 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) @@ -938,7 +938,7 @@ 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!" 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..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,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 - heat_level_1_threshold = 320 heat_level_2_threshold = 400 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 78d27cb90238..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,18 +11,15 @@ 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" 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 var/charge = PRETERNIS_LEVEL_FULL var/eating_msg_cooldown = FALSE var/emag_lvl = 0 @@ -90,15 +87,17 @@ 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("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")) - H.adjustFireLoss(-1*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. + . = TRUE - if(H.reagents.has_reagent("teslium",10)) //10 u otherwise it wont update and they will remain quikk + if(H.reagents.has_reagent(/datum/reagent/teslium,10)) //10 u otherwise it wont update and they will remain quick 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) @@ -130,7 +129,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) . = ..() 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 ..() || .