From 6593b2a5a71aa1c976785ed01070aa565086c754 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 15 Dec 2019 23:02:41 +0100
Subject: [PATCH 1/2] Fixes some quirks not being properly removed when
deleted.
---
code/datums/traits/negative.dm | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 178e1aaeb0..d5fdb8abb7 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -332,16 +332,19 @@
medical_record_text = "Patient has an extreme or irrational fear and aversion to an undefined stimuli."
var/datum/brain_trauma/mild/phobia/phobia
-/datum/quirk/phobia/add()
+/datum/quirk/phobia/post_add()
var/mob/living/carbon/human/H = quirk_holder
phobia = new
- H.gain_trauma(phobia, TRAUMA_RESILIENCE_SURGERY)
+ H.gain_trauma(phobia, TRAUMA_RESILIENCE_ABSOLUTE)
+
+/datum/quirk/phobia/remove()
+ var/mob/living/carbon/human/H = quirk_holder
+ H?.cure_trauma_type(phobia, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/mute
name = "Mute"
desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak."
value = -2 //HALP MAINTS
- mob_trait = TRAIT_MUTE
gain_text = "You find yourself unable to speak!"
lose_text = "You feel a growing strength in your vocal chords."
medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity."
@@ -350,13 +353,11 @@
/datum/quirk/mute/add()
var/mob/living/carbon/human/H = quirk_holder
mute = new
- H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY)
-
-/datum/quirk/mute/on_process()
- if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
- to_chat(quirk_holder, "Your antagonistic nature has caused your voice to be heard.")
- qdel(src)
+ H.gain_trauma(mute, TRAUMA_RESILIENCE_ABSOLUTE)
+/datum/quirk/mute/remove()
+ var/mob/living/carbon/human/H = quirk_holder
+ H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE)
/datum/quirk/unstable
name = "Unstable"
@@ -384,3 +385,6 @@
if(!H.equip_to_slot_if_possible(glasses, SLOT_GLASSES, bypass_equip_delay_self = TRUE)) //if you can't put it on the user's eyes, put it in their hands, otherwise put it on their eyes eyes
H.put_in_hands(glasses)
H.regenerate_icons()
+
+/datum/quirk/blindness/remove()
+ quirk_holder?.cure_blind(ROUNDSTART_TRAIT)
From 71182109118ab5af61077f3110c46c1b6a827b98 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 15 Dec 2019 23:07:18 +0100
Subject: [PATCH 2/2] GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE
STOPPED FROM BEING QUIRK'D. WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW.
---
code/datums/traits/negative.dm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index d5fdb8abb7..2dd6ba2eba 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -359,6 +359,11 @@
var/mob/living/carbon/human/H = quirk_holder
H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE)
+/datum/quirk/mute/on_process()
+ if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
+ to_chat(quirk_holder, "Your antagonistic nature has caused your voice to be heard.")
+ qdel(src)
+
/datum/quirk/unstable
name = "Unstable"
desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!"