From a6648fa822ed11209e7ce5e6503ed056a4e6a543 Mon Sep 17 00:00:00 2001
From: Dahlular <55758850+Dahlular@users.noreply.github.com>
Date: Fri, 25 Sep 2020 06:23:51 -0600
Subject: [PATCH] Revert "Cursed Blood Trait"
---
code/__DEFINES/traits.dm | 1 -
code/datums/traits/neutral.dm | 11 +-----
.../hostile/megafauna/blood_drunk_miner.dm | 2 --
.../chemistry/reagents/other_reagents.dm | 36 +++++--------------
4 files changed, 9 insertions(+), 41 deletions(-)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index e86200ce..57125ec6 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -122,7 +122,6 @@
#define TRAIT_STRONG_GRABBER "strong_grabber"
#define TRAIT_CALCIUM_HEALER "calcium_healer"
#define TRAIT_ALCOHOL_LIGHTWEIGHT "alcohol_lightweight" //Skyrat port
-#define TRAIT_CURSED_BLOOD "cursed_blood" //Yo dawg I heard you like bloodborne references so I put a
//non-mob traits
#define TRAIT_PARALYSIS "paralysis" //Used for limb-based paralysis, where replacing the limb will fix it
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index 42ebf4d3..527f00c4 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -118,13 +118,4 @@
mob_trait = TRAIT_ALCOHOL_LIGHTWEIGHT
gain_text = "You feel woozy thinking of alcohol."
lose_text = "You regain your stomach for drinks."
-//Skyrat port stop
-
-/datum/quirk/cursed_blood
- name = "Cursed Blood"
- desc = "Your lineage is cursed with the paleblood curse. Best to stay away from holy water... Hell water, on the other hand..."
- value = 0
- mob_trait = TRAIT_CURSED_BLOOD
- gain_text = "A curse from a land where men return as beasts runs deep in your blood. Best to stay away from holy water... Hell water, on the other hand..."
- lose_text = "You feel the weight of the curse in your blood finally gone."
- medical_record_text = "Patient from an unknown type of aversion to holy reagents. Keep them away from a chaplain."
+//Skyrat port stop
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index ac99c71d..899e9018 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -144,8 +144,6 @@ Difficulty: Medium
wander = TRUE
transform_weapon()
INVOKE_ASYNC(src, .proc/quick_attack_loop)
- if(HAS_TRAIT(target, TRAIT_CURSED_BLOOD))
- say(pick("Hunter, you must accept your death, be freed from the night.","The night, and the dream, were long...","Beasts all over the shop... You'll be one of them, sooner or later...","The night blocks all sight..."))
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/OpenFire()
Goto(target, move_to_delay, minimum_distance)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 55bf9595..544c379c 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -248,18 +248,6 @@
"You can't save him. Nothing can save him now", "It seems that Nar'Sie will triumph after all")].")
if("emote")
M.visible_message("[M] [pick("whimpers quietly", "shivers as though cold", "glances around in paranoia")].")
- else if(HAS_TRAIT(M, TRAIT_CURSED_BLOOD) && prob(12))
- M.say(pick("Somebody help me...","Unshackle me please...","Anybody... I've had enough of this dream...","The night blocks all sight...","Oh, somebody, please..."), forced = "holy water")
- if(prob(10))
- M.visible_message("[M] starts having a seizure!", "You have a seizure!")
- M.Unconscious(120)
- to_chat(M, "[pick("The moon is close. It will be a long hunt tonight.", "Ludwig, why have you forsaken me?", \
- "The night is near its end...", "Fear the blood...")]")
- if(prob(25) //Prob of a prob.. Shouldn't happen too often but hey, that's what you get.
- M.IgniteMob()
- else
- M.adjustToxLoss(1, 0)
- M.adjustFireLoss(1, 0)
if(data >= 60) // 30 units, 135 seconds
if(iscultist(M, FALSE, TRUE) || is_servant_of_ratvar(M, FALSE, TRUE))
if(iscultist(M))
@@ -316,28 +304,20 @@
holder.remove_reagent(id, 1)
return TRUE
-/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldritch god
+/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
name = "Hell Water"
id = "hell_water"
description = "YOUR FLESH! IT BURNS!"
taste_description = "burning"
/datum/reagent/hellwater/on_mob_life(mob/living/carbon/M)
- if(HAS_TRAIT(M, TRAIT_CURSED_BLOOD))
- M.adjustToxLoss(-0.75*REM, 0)
- M.adjustOxyLoss(-0.75*REM, 0)
- M.adjustBruteLoss(-0.75*REM, 0)
- M.adjustFireLoss(-0.75*REM, 0)
- M.ExtinguishMob()
- holder.remove_reagent(id, 1)
- else
- M.fire_stacks = min(5,M.fire_stacks + 3)
- M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
- M.adjustToxLoss(1, 0)
- M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150)
- holder.remove_reagent(id, 1)
- pH = 0.1
+ M.fire_stacks = min(5,M.fire_stacks + 3)
+ M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
+ M.adjustToxLoss(1, 0)
+ M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
+ M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150)
+ holder.remove_reagent(id, 1)
+ pH = 0.1
/datum/reagent/fuel/holyoil //Its oil
name = "Zelus Oil"