Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Preternis QoL Update(STOP FUCKING INJECTING ME MEDIBOT) #8143

Merged
SomeguyManperson merged 2 commits into from
Apr 15, 2020
Merged

Preternis QoL Update(STOP FUCKING INJECTING ME MEDIBOT) #8143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb9a4fd
TraitDefine,Medbot Ignore,Preternis Trait ADD
Code611 Apr 9, 2020
811beba
Update yogstation/code/modules/mob/living/carbon/human/species_types/…
Codeatmos Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/simple_animal/bot/medbot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down