shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing merge errors.

Browse Source 
Testmerge ready.
This commit is contained in:
Fermi
2019-06-14 21:55:17 +01:00
parent 3700e1c7cd
commit 7a66039f0c
18 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/phobia.dm
+3 -3
View File
@@ -31,7 +31,7 @@
/datum/brain_trauma/mild/phobia/on_life()
..()
if(owner.has_trait(TRAIT_FEARLESS))
if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return
if(is_blind(owner))
return
@@ -72,7 +72,7 @@
/datum/brain_trauma/mild/phobia/on_hear(message, speaker, message_language, raw_message, radio_freq)
if(!owner.can_hear() || world.time < next_scare) //words can't trigger you if you can't hear them *taps head*
return message
if(owner.has_trait(TRAIT_FEARLESS))
if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return message
for(var/word in trigger_words)
var/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i")
@@ -83,7 +83,7 @@
return message
/datum/brain_trauma/mild/phobia/on_say(message)
if(owner.has_trait(TRAIT_FEARLESS))
if(HAS_TRAIT(owner, TRAIT_FEARLESS))
return message
for(var/word in trigger_words)
var/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i")
code/datums/components/mood.dm
+2 -2
View File
@@ -179,7 +179,7 @@
amount = sanity - 0.5
// Disturbed stops you from getting any more sane
if(master.has_trait(TRAIT_UNSTABLE))
if(HAS_TRAIT(master, TRAIT_UNSTABLE))
sanity = min(amount,sanity)
else
sanity = amount
@@ -232,7 +232,7 @@
/datum/component/mood/proc/IncreaseSanity(amount, maximum = SANITY_NEUTRAL)
// Disturbed stops you from getting any more sane - I'm just gonna bung this in here
var/mob/living/owner = parent
if(owner.has_trait(TRAIT_UNSTABLE))
if(HAS_TRAIT(owner, TRAIT_UNSTABLE))
return
if(sanity > maximum)
DecreaseSanity(0.5) //Removes some sanity to go back to our current limit.
code/datums/status_effects/debuffs.dm
+4 -4
View File
@@ -521,11 +521,11 @@ datum/status_effect/pacify
. = ..()
/datum/status_effect/pacify/on_apply()
owner.add_trait(TRAIT_PACIFISM, "status_effect")
ADD_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
return ..()
/datum/status_effect/pacify/on_remove()
owner.remove_trait(TRAIT_PACIFISM, "status_effect")
REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
/datum/status_effect/trance
id = "trance"
@@ -550,7 +550,7 @@ datum/status_effect/pacify
if(!iscarbon(owner))
return FALSE
RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize)
owner.add_trait(TRAIT_MUTE, "trance")
ADD_TRAIT(owner, TRAIT_MUTE, "trance")
if(!owner.has_quirk(/datum/quirk/monochromatic))
owner.add_client_colour(/datum/client_colour/monochrome)
owner.visible_message("[stun ? "<span class='warning'>[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.</span>" : ""]", \
@@ -564,7 +564,7 @@ datum/status_effect/pacify
/datum/status_effect/trance/on_remove()
UnregisterSignal(owner, COMSIG_MOVABLE_HEAR)
owner.remove_trait(TRAIT_MUTE, "trance")
REMOVE_TRAIT(owner, TRAIT_MUTE, "trance")
owner.dizziness = 0
if(!owner.has_quirk(/datum/quirk/monochromatic))
owner.remove_client_colour(/datum/client_colour/monochrome)