cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

virus immunity trait not var

Browse Source
This commit is contained in:
Fox-McCloud
2017-07-13 19:47:23 -04:00
parent a7249cf930
commit d35a5ea6e3
9 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/genetics.dm
+2 -1
View File
@@ -132,4 +132,5 @@
#define NO_INTORGANS 9
#define RADIMMUNE 10
#define NOGUNS 11
#define NOTRANSSTING 12
#define NOTRANSSTING 12
#define VIRUSIMMUNE 13
code/datums/diseases/_MobProcs.dm
+1 -1
View File
@@ -134,7 +134,7 @@
/mob/living/carbon/human/CanContractDisease(datum/disease/D)
if(species.virus_immune && !D.bypasses_immunity)
if((VIRUSIMMUNE in species.species_traits) && !D.bypasses_immunity)
return 0
for(var/thing in D.required_organs)
if(!((locate(thing) in bodyparts) || (locate(thing) in internal_organs)))
code/modules/events/disease_outbreak.dm
+1 -1
View File
@@ -18,7 +18,7 @@
continue
if(!H.client)
continue
if(H.species.virus_immune) //don't let virus immune things get diseases they're not supposed to get.
if(VIRUSIMMUNE in H.species.species_traits) //don't let virus immune things get diseases they're not supposed to get.
continue
var/turf/T = get_turf(H)
if(!T)
code/modules/mob/living/carbon/human/species/abductor.dm
+1 -2
View File
@@ -18,11 +18,10 @@
"eyes" = /obj/item/organ/internal/eyes/abductor //3 darksight.
)
species_traits = list(NO_BLOOD, NO_BREATHE, NOGUNS)
species_traits = list(NO_BLOOD, NO_BREATHE, VIRUSIMMUNE, NOGUNS)
oxy_mod = 0
virus_immune = 1
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
dietflags = DIET_OMNI
reagent_tag = PROCESS_ORG
code/modules/mob/living/carbon/human/species/golem.dm
+1 -2
View File
@@ -6,11 +6,10 @@
deform = 'icons/mob/human_races/r_golem.dmi'
default_language = "Galactic Common"
species_traits = list(NO_BREATHE, NO_BLOOD, RADIMMUNE, NOGUNS)
species_traits = list(NO_BREATHE, NO_BLOOD, RADIMMUNE, VIRUSIMMUNE, NOGUNS)
oxy_mod = 0
virus_immune = 1
dietflags = DIET_OMNI //golems can eat anything because they are magic or something
reagent_tag = PROCESS_ORG
code/modules/mob/living/carbon/human/species/shadow.dm
+1 -3
View File
@@ -17,12 +17,10 @@
"eyes" = /obj/item/organ/internal/eyes/shadow //8 darksight.
)
species_traits = list(NO_BREATHE, NO_BLOOD, RADIMMUNE)
species_traits = list(NO_BREATHE, NO_BLOOD, RADIMMUNE, VIRUSIMMUNE)
oxy_mod = 0
virus_immune = 1
dietflags = DIET_OMNI //the mutation process allowed you to now digest all foods regardless of initial race
reagent_tag = PROCESS_ORG
suicide_messages = list(
code/modules/mob/living/carbon/human/species/skeleton.dm
+1 -2
View File
@@ -13,11 +13,10 @@
blood_color = "#FFFFFF"
flesh_color = "#E6E6C6"
species_traits = list(NO_BREATHE, NO_BLOOD, RADIMMUNE)
species_traits = list(NO_BREATHE, NO_BLOOD, RADIMMUNE, VIRUSIMMUNE)
oxy_mod = 0
virus_immune = 1 //why is this a var and not a flag?
dietflags = DIET_OMNI
reagent_tag = PROCESS_ORG
code/modules/mob/living/carbon/human/species/species.dm
-1
View File
@@ -111,7 +111,6 @@
var/icon/icon_template
var/is_small
var/show_ssd = 1
var/virus_immune
var/can_revive_by_healing // Determines whether or not this species can be revived by simply healing them
var/has_gender = TRUE
code/modules/mob/living/carbon/human/species/station.dm
+1 -2
View File
@@ -904,7 +904,7 @@
oxy_mod = 0
death_message = "gives one shrill beep before falling limp, their monitor flashing blue before completely shutting off..."
species_traits = list(IS_WHITELISTED, NO_BREATHE, NO_SCAN, NO_BLOOD, NO_PAIN, NO_DNA, RADIMMUNE, NOTRANSSTING)
species_traits = list(IS_WHITELISTED, NO_BREATHE, NO_SCAN, NO_BLOOD, NO_PAIN, NO_DNA, RADIMMUNE, VIRUSIMMUNE, NOTRANSSTING)
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_COLOR | HAS_HEAD_MARKINGS | HAS_HEAD_ACCESSORY | ALL_RPARTS
dietflags = 0 //IPCs can't eat, so no diet
@@ -912,7 +912,6 @@
flesh_color = "#AAAAAA"
//Default styles for created mobs.
default_hair = "Blue IPC Screen"
virus_immune = 1
can_revive_by_healing = 1
has_gender = FALSE
reagent_tag = PROCESS_SYN