cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7304 from KillianKirilenko/kk-bio

Browse Source 
Offload Defibrillatability from NO_SCAN
This commit is contained in:
Atermonera
2020-06-25 12:44:20 -07:00
committed by GitHub
parent d40af2f1e2 5da912d679
commit 97c1085ebf
11 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/__defines/species_languages.dm
View File

@@ -1,15 +1,16 @@
// Species flags. // Species flags.
#define NO_MINOR_CUT 0x1 // Can step on broken glass with no ill-effects. Either thick skin (diona), cut resistant (slimes) or incorporeal (shadows) #define NO_MINOR_CUT 0x1 // Can step on broken glass with no ill-effects. Either thick skin (diona), cut resistant (slimes) or incorporeal (shadows)
#define IS_PLANT 0x2 // Is a treeperson. #define IS_PLANT 0x2 // Is a treeperson.
#define NO_SCAN 0x4 // Cannot be scanned in a DNA machine/genome-stolen. #define NO_SCAN 0x4 // Cannot be scanned in a DNA machine/genome-stolen.
#define NO_PAIN 0x8 // Cannot suffer halloss/recieves deceptive health indicator. #define NO_PAIN 0x8 // Cannot suffer halloss/recieves deceptive health indicator.
#define NO_SLIP 0x10 // Cannot fall over. #define NO_SLIP 0x10 // Cannot fall over.
#define NO_POISON 0x20 // Cannot not suffer toxloss. #define NO_POISON 0x20 // Cannot not suffer toxloss.
#define NO_EMBED 0x40 // Can step on broken glass with no ill-effects and cannot have shrapnel embedded in it. #define NO_EMBED 0x40 // Can step on broken glass with no ill-effects and cannot have shrapnel embedded in it.
#define NO_HALLUCINATION 0x80 // Don't hallucinate, ever #define NO_HALLUCINATION 0x80 // Don't hallucinate, ever
#define NO_BLOOD 0x100 // Never bleed, never show blood amount #define NO_BLOOD 0x100 // Never bleed, never show blood amount
#define UNDEAD 0x200 // Various things that living things don't do, mostly for skeletons #define UNDEAD 0x200 // Various things that living things don't do, mostly for skeletons
#define NO_INFECT 0x400 // Don't allow infections in limbs or organs, similar to IS_PLANT, without other strings. #define NO_INFECT 0x400 // Don't allow infections in limbs or organs, similar to IS_PLANT, without other strings.
#define NO_DEFIB 0x800 // Don't allow them to be defibbed
// unused: 0x8000 - higher than this will overflow // unused: 0x8000 - higher than this will overflow
// Species EMP vuln for carbons // Species EMP vuln for carbons

4
code/game/objects/items/devices/defib.dm
View File

@@ -265,8 +265,8 @@
//Checks for various conditions to see if the mob is revivable //Checks for various conditions to see if the mob is revivable
/obj/item/weapon/shockpaddles/proc/can_defib(mob/living/carbon/human/H) //This is checked before doing the defib operation /obj/item/weapon/shockpaddles/proc/can_defib(mob/living/carbon/human/H) //This is checked before doing the defib operation
if((H.species.flags & NO_SCAN)) if((H.species.flags & NO_DEFIB))
return "buzzes, \"Unrecogized physiology. Operation aborted.\"" return "buzzes, \"Incompatible physiology. Operation aborted.\""
else if(H.isSynthetic() && !use_on_synthetic) else if(H.isSynthetic() && !use_on_synthetic)
return "buzzes, \"Synthetic Body. Operation aborted.\"" return "buzzes, \"Synthetic Body. Operation aborted.\""
else if(!H.isSynthetic() && use_on_synthetic) else if(!H.isSynthetic() && use_on_synthetic)

2
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -874,6 +874,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "</br><b>Does not have a respiratory system.</b>" dat += "</br><b>Does not have a respiratory system.</b>"
if(current_species.flags & NO_SCAN) if(current_species.flags & NO_SCAN)
dat += "</br><b>Does not have DNA.</b>" dat += "</br><b>Does not have DNA.</b>"
if(current_species.flags & NO_DEFIB)
dat += "</br><b>Cannot be defibrillated.</b>"
if(current_species.flags & NO_PAIN) if(current_species.flags & NO_PAIN)
dat += "</br><b>Does not feel pain.</b>" dat += "</br><b>Does not feel pain.</b>"
if(current_species.flags & NO_SLIP) if(current_species.flags & NO_SLIP)

3
code/modules/mob/living/carbon/human/species/outsider/event.dm
View File

@@ -200,6 +200,9 @@ Variables you may want to make use of are:
/datum/species/event1/proc/toggle_cloning() /datum/species/event1/proc/toggle_cloning()
flags ^= NO_SCAN flags ^= NO_SCAN
/datum/species/event1/proc/toggle_defibbing()
flags ^= NO_DEFIB
/datum/species/event1/proc/toggle_pain() /datum/species/event1/proc/toggle_pain()
flags ^= NO_PAIN flags ^= NO_PAIN

2
code/modules/mob/living/carbon/human/species/outsider/shadow.dm
View File

@@ -20,7 +20,7 @@
remains_type = /obj/effect/decal/cleanable/ash remains_type = /obj/effect/decal/cleanable/ash
death_message = "dissolves into ash..." death_message = "dissolves into ash..."
flags = NO_SCAN | NO_SLIP | NO_POISON | NO_MINOR_CUT flags = NO_SCAN | NO_SLIP | NO_POISON | NO_MINOR_CUT | NO_DEFIB
spawn_flags = SPECIES_IS_RESTRICTED spawn_flags = SPECIES_IS_RESTRICTED
genders = list(NEUTER) genders = list(NEUTER)

2
code/modules/mob/living/carbon/human/species/outsider/skeleton.dm
View File

@@ -11,7 +11,7 @@
max_age = 110 max_age = 110
health_hud_intensity = 1.5 health_hud_intensity = 1.5
flags = NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON | NO_MINOR_CUT | NO_BLOOD | UNDEAD flags = NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON | NO_MINOR_CUT | NO_BLOOD | UNDEAD | NO_DEFIB
spawn_flags = SPECIES_IS_RESTRICTED spawn_flags = SPECIES_IS_RESTRICTED
appearance_flags = null appearance_flags = null

2
code/modules/mob/living/carbon/human/species/outsider/vox.dm
View File

@@ -46,7 +46,7 @@
poison_type = "oxygen" poison_type = "oxygen"
siemens_coefficient = 0.2 siemens_coefficient = 0.2
flags = NO_SCAN flags = NO_SCAN | NO_DEFIB
spawn_flags = SPECIES_IS_WHITELISTED spawn_flags = SPECIES_IS_WHITELISTED
appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR

2
code/modules/mob/living/carbon/human/species/station/golem.dm
View File

@@ -7,7 +7,7 @@
language = "Sol Common" //todo? language = "Sol Common" //todo?
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch) unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
flags = NO_PAIN | NO_SCAN | NO_POISON | NO_MINOR_CUT flags = NO_PAIN | NO_SCAN | NO_POISON | NO_MINOR_CUT | NO_DEFIB
spawn_flags = SPECIES_IS_RESTRICTED spawn_flags = SPECIES_IS_RESTRICTED
siemens_coefficient = 0 siemens_coefficient = 0

2
code/modules/mob/living/carbon/human/species/station/prometheans.dm
View File

@@ -25,7 +25,7 @@ var/datum/species/shapeshifter/promethean/prometheans
bump_flag = SLIME bump_flag = SLIME
swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL
push_flags = MONKEY|SLIME|SIMPLE_ANIMAL push_flags = MONKEY|SLIME|SIMPLE_ANIMAL
flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT | NO_HALLUCINATION | NO_INFECT | NO_DEFIB
appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS | HAS_UNDERWEAR appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS | HAS_UNDERWEAR
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
health_hud_intensity = 2 health_hud_intensity = 2

2
code/modules/mob/living/carbon/human/species/station/station.dm
View File

@@ -521,7 +521,7 @@
body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not
flags = NO_SCAN | IS_PLANT | NO_PAIN | NO_SLIP | NO_MINOR_CUT flags = NO_SCAN | IS_PLANT | NO_PAIN | NO_SLIP | NO_MINOR_CUT | NO_DEFIB
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED
blood_color = "#004400" blood_color = "#004400"

2
code/modules/mob/living/carbon/human/species/xenomorphs/alien_species.dm
View File

@@ -24,7 +24,7 @@
cold_level_2 = -1 cold_level_2 = -1
cold_level_3 = -1 cold_level_3 = -1
flags = NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON | NO_MINOR_CUT | NO_INFECT flags = NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON | NO_MINOR_CUT | NO_INFECT | NO_DEFIB
spawn_flags = SPECIES_IS_RESTRICTED spawn_flags = SPECIES_IS_RESTRICTED
reagent_tag = IS_XENOS reagent_tag = IS_XENOS