cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Phoron Immune Tweak (#12076)

Browse Source 
* Phoron Immune Tweak

* IPCs too
This commit is contained in:
Geeves
2021-06-25 02:48:47 +02:00
committed by GitHub
parent 9ed7a3a8af
commit d5e2c04eaa
7 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,7 +644,7 @@
move_delay_mod += -1.5 * chem_effects[CE_SPEEDBOOST]
for(var/obj/item/I in src)
if(I.contaminated && !(isvaurca(src) && src.species.has_organ[BP_FILTRATION_BIT]))
if(I.contaminated && !(species.flags & PHORON_IMMUNE))
if(I == r_hand)
apply_damage(vsc.plc.CONTAMINATION_LOSS, BURN, BP_R_HAND)
else if(I == l_hand)

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

@@ -30,7 +30,7 @@ var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
language = "Ceti Basic"
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch)
flags = NO_BREATHE | NO_PAIN | NO_BLOOD | NO_SCAN | NO_POISON | NO_EMBED
flags = NO_BREATHE | NO_PAIN | NO_BLOOD | NO_SCAN | NO_POISON | NO_EMBED | PHORON_IMMUNE
spawn_flags = IS_RESTRICTED
siemens_coefficient = 1
rarity_value = 5
@@ -776,7 +776,7 @@ var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
short_name = null
name_plural = "homunculus"
flags = NO_PAIN | NO_SCAN
flags = NO_PAIN | NO_SCAN | PHORON_IMMUNE
unarmed_types = list(
/datum/unarmed_attack/claws,

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

@@ -70,7 +70,7 @@
heat_level_1 = 330 //Default 360
heat_level_2 = 380 //Default 400
heat_level_3 = 600 //Default 1000
flags = NO_SLIP | NO_CHUBBY | NO_ARTERIES
flags = NO_SLIP | NO_CHUBBY | NO_ARTERIES | PHORON_IMMUNE
spawn_flags = CAN_JOIN | IS_WHITELISTED | NO_AGE_MINIMUM
appearance_flags = HAS_SKIN_COLOR | HAS_HAIR_COLOR
blood_color = COLOR_VAURCA_BLOOD // dark yellow

4
code/modules/mob/living/carbon/human/species/station/vaurca/vaurca_subspecies.dm
View File

@@ -76,7 +76,7 @@
stamina_recovery = 3
spawn_flags = IS_RESTRICTED
flags = NO_SCAN | NO_SLIP | NO_ARTERIES
flags = NO_SCAN | NO_SLIP | NO_ARTERIES | PHORON_IMMUNE
inherent_verbs = list(
/mob/living/carbon/human/proc/bugbite
@@ -137,7 +137,7 @@
warning_high_pressure = 3250 //Default 325
spawn_flags = IS_RESTRICTED
flags = NO_SCAN | NO_SLIP | NO_PAIN | NO_BREATHE | NO_ARTERIES
flags = NO_SCAN | NO_SLIP | NO_PAIN | NO_BREATHE | NO_ARTERIES | PHORON_IMMUNE
inherent_verbs = list(
/mob/living/carbon/human/proc/rebel_yell,