From 922129abd27fc801aab953582e715b1cf33d0916 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sun, 15 Nov 2020 21:12:01 +0100 Subject: [PATCH] proc override stuff --- code/modules/antagonists/devil/true_devil/_true_devil.dm | 2 +- code/modules/mob/living/carbon/alien/damage_procs.dm | 4 ++-- code/modules/mob/living/silicon/damage_procs.dm | 4 ++-- code/modules/mob/living/silicon/pai/pai_defense.dm | 6 +++--- code/modules/mob/living/simple_animal/damage_procs.dm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index 272b154828..293b1de3dc 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -105,7 +105,7 @@ /mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null) return 666 -/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) +/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash, override_protection = 0) if(mind && has_bane(BANE_LIGHT)) mind.disrupt_spells(-500) return ..() //flashes don't stop devils UNLESS it's their bane. diff --git a/code/modules/mob/living/carbon/alien/damage_procs.dm b/code/modules/mob/living/carbon/alien/damage_procs.dm index 66738b2208..1b16537816 100644 --- a/code/modules/mob/living/carbon/alien/damage_procs.dm +++ b/code/modules/mob/living/carbon/alien/damage_procs.dm @@ -1,8 +1,8 @@ -/mob/living/carbon/alien/getToxLoss() +/mob/living/carbon/alien/getToxLoss(toxins_type = TOX_OMNI) return 0 -/mob/living/carbon/alien/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) //alien immune to tox damage +/mob/living/carbon/alien/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_DEFAULT) //alien immune to tox damage return FALSE //aliens are immune to stamina damage. diff --git a/code/modules/mob/living/silicon/damage_procs.dm b/code/modules/mob/living/silicon/damage_procs.dm index 7530630d74..f49c5933bb 100644 --- a/code/modules/mob/living/silicon/damage_procs.dm +++ b/code/modules/mob/living/silicon/damage_procs.dm @@ -18,10 +18,10 @@ /mob/living/silicon/apply_effect(effect = 0,effecttype = EFFECT_STUN, blocked = FALSE) return FALSE //The only effect that can hit them atm is flashes and they still directly edit so this works for now -/mob/living/silicon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) //immune to tox damage +/mob/living/silicon/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_DEFAULT) //immune to tox damage return FALSE -/mob/living/silicon/setToxLoss(amount, updating_health = TRUE, forced = FALSE) +/mob/living/silicon/setToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_OMNI) return FALSE /mob/living/silicon/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE) //immune to clone damage diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index d8c1b8fe7d..c5fa5ece1f 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -87,7 +87,7 @@ /mob/living/silicon/pai/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE) return take_holo_damage(amount) -/mob/living/silicon/pai/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) +/mob/living/silicon/pai/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_DEFAULT) return FALSE /mob/living/silicon/pai/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE) @@ -111,7 +111,7 @@ /mob/living/silicon/pai/getFireLoss() return emittermaxhealth - emitterhealth -/mob/living/silicon/pai/getToxLoss() +/mob/living/silicon/pai/getToxLoss(toxins_type = TOX_OMNI) return FALSE /mob/living/silicon/pai/getOxyLoss() @@ -129,7 +129,7 @@ /mob/living/silicon/pai/setStaminaLoss() return FALSE -/mob/living/silicon/pai/setToxLoss() +/mob/living/silicon/pai/setToxLoss(toxins_type = TOX_OMNI) return FALSE /mob/living/silicon/pai/setOxyLoss() diff --git a/code/modules/mob/living/simple_animal/damage_procs.dm b/code/modules/mob/living/simple_animal/damage_procs.dm index 90fdeb0a62..9a2921cc0e 100644 --- a/code/modules/mob/living/simple_animal/damage_procs.dm +++ b/code/modules/mob/living/simple_animal/damage_procs.dm @@ -25,7 +25,7 @@ else if(damage_coeff[OXY]) . = adjustHealth(amount * damage_coeff[OXY] * CONFIG_GET(number/damage_multiplier), updating_health, forced) -/mob/living/simple_animal/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE) +/mob/living/simple_animal/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE, toxins_type = TOX_DEFAULT) if(forced) . = adjustHealth(amount * CONFIG_GET(number/damage_multiplier), updating_health, forced) else if(damage_coeff[TOX])