From 59469fae2e7c804103a91370334b29137cae5518 Mon Sep 17 00:00:00 2001 From: Fermi Date: Mon, 17 Jun 2019 12:40:30 +0100 Subject: [PATCH] Oops. --- code/datums/brain_damage/hypnosis.dm | 3 ++- code/datums/status_effects/debuffs.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/datums/brain_damage/hypnosis.dm b/code/datums/brain_damage/hypnosis.dm index 16e3bc58c9..c0c969503d 100644 --- a/code/datums/brain_damage/hypnosis.dm +++ b/code/datums/brain_damage/hypnosis.dm @@ -5,11 +5,12 @@ gain_text = "" lose_text = "" resilience = TRAUMA_RESILIENCE_SURGERY + var/priority = TRUE var/hypnotic_phrase = "" var/regex/target_phrase -/datum/brain_trauma/hypnosis/New(phrase, var/priority = TRUE) +/datum/brain_trauma/hypnosis/New(phrase, priority) if(!phrase) qdel(src) if(priority == TRUE) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index be8a2ddd27..ecddad2e27 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -534,6 +534,7 @@ datum/status_effect/pacify tick_interval = 10 examine_text = "SUBJECTPRONOUN seems slow and unfocused." var/stun = TRUE + var/priority = TRUE alert_type = /obj/screen/alert/status_effect/trance /obj/screen/alert/status_effect/trance @@ -558,7 +559,7 @@ datum/status_effect/pacify "[pick("You feel your thoughts slow down...", "You suddenly feel extremely dizzy...", "You feel like you're in the middle of a dream...","You feel incredibly relaxed...")]") return TRUE -/datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE, priority = TRUE)//priority == FALSE makes no visible message, prevents self antag messages, and places phrase below objectives. +/datum/status_effect/trance/on_creation(mob/living/new_owner, _duration, _stun = TRUE)//priority == FALSE makes no visible message, prevents self antag messages, and places phrase below objectives. duration = _duration stun = _stun return ..()