From fb9a4fd1ac12ce0c117f47c17c178a449a2a274a Mon Sep 17 00:00:00 2001 From: Codeatmos Date: Thu, 9 Apr 2020 10:58:56 -0500 Subject: [PATCH 1/2] TraitDefine,Medbot Ignore,Preternis Trait ADD --- code/__DEFINES/traits.dm | 1 + code/modules/mob/living/simple_animal/bot/medbot.dm | 4 ++++ .../living/carbon/human/species_types/preternis/preternis.dm | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 8516afc8940f..493a238d68fc 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -141,6 +141,7 @@ #define TRAIT_SHELTERED "sheltered" #define TRAIT_ONEWAYROAD "one-way road" #define TRAIT_RANDOM_ACCENT "random_accent" +#define TRAIT_MEDICALIGNORE "medical_ignore" //non-mob traits #define TRAIT_PARALYSIS "paralysis" //Used for limb-based paralysis, where replacing the limb will fix it diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 4e43002d78ef..94eec8245eb3 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -355,6 +355,9 @@ if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins) return TRUE + if(HAS_TRAIT(C,TRAIT_MEDICALIGNORE)) + return FALSE + if(ishuman(C)) var/mob/living/carbon/human/H = C if (H.wear_suit && H.head && istype(H.wear_suit, /obj/item/clothing) && istype(H.head, /obj/item/clothing)) @@ -363,6 +366,7 @@ if (CS.clothing_flags & CH.clothing_flags & THICKMATERIAL) return FALSE // Skip over them if they have no exposed flesh. + if(declare_crit && C.health <= 0) //Critical condition! Call for help! declare(C) 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 c11d6fb5e42d..a9c053af6c26 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,TRAIT_RADIMMUNE,TRAIT_MEDICALIGNORE) //Medical Ignore doesn't prevent basic treatment,only things that cannot help preternis,such as cryo and medbots species_traits = list(EYECOLOR,HAIR,LIPS) say_mod = "intones" attack_verb = "assault" From 811beba5b4086f65128b8bf27f7d1ef152ad55ee Mon Sep 17 00:00:00 2001 From: Codeatmos <50836043+Codeatmos@users.noreply.github.com> Date: Sun, 12 Apr 2020 12:54:50 -0500 Subject: [PATCH 2/2] 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 a9c053af6c26..17acb67a8206 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,TRAIT_MEDICALIGNORE) //Medical Ignore doesn't prevent basic treatment,only things that cannot help preternis,such as cryo and medbots + inherent_traits = list(TRAIT_NOHUNGER, TRAIT_RADIMMUNE, TRAIT_MEDICALIGNORE) //Medical Ignore doesn't prevent basic treatment,only things that cannot help preternis,such as cryo and medbots species_traits = list(EYECOLOR,HAIR,LIPS) say_mod = "intones" attack_verb = "assault"