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

Merge pull request #709 from Citadel-Station-13/upstream-merge-26762

Browse Source 
[MIRROR] Fixes cult datum giving the action button to the mind instead of mob
This commit is contained in:
LetterJay
2017-05-02 18:47:55 -05:00
committed by GitHub
parent 5edd88cd07 3fff6d4a1d
commit 368a2e82c1
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/antagonists/datum_clockcult.dm
+1 -1
View File
@@ -16,7 +16,7 @@
if(!istype(current))
return
if(jobban_isbanned(current, ROLE_SERVANT_OF_RATVAR))
addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, current, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR), 0)
owner.current.log_message("<font color=#BE8700>Has been converted to the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
if(issilicon(current))
var/mob/living/silicon/S = owner
code/datums/antagonists/datum_cult.dm
+16 -10
View File
@@ -10,20 +10,26 @@
if(!owner)
return
if(jobban_isbanned(owner.current, ROLE_CULTIST))
addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST), 0)
addtimer(CALLBACK(SSticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner.current, ROLE_CULTIST, ROLE_CULTIST), 0)
owner.current.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
/datum/antagonist/cult/apply_innate_effects()
/datum/antagonist/cult/apply_innate_effects(mob/living/mob_override)
. = ..()
owner.current.faction |= "cult"
owner.current.verbs += /mob/living/proc/cult_help
communion.Grant(owner)
var/mob/living/current = owner.current
if(mob_override)
current = mob_override
current.faction |= "cult"
current.verbs += /mob/living/proc/cult_help
communion.Grant(current)
/datum/antagonist/cult/remove_innate_effects()
/datum/antagonist/cult/remove_innate_effects(mob/living/mob_override)
. = ..()
owner.current.faction -= "cult"
owner.current.verbs -= /mob/living/proc/cult_help
var/mob/living/current = owner.current
if(mob_override)
current = mob_override
current.faction -= "cult"
current.verbs -= /mob/living/proc/cult_help
communion.Remove(current)
/datum/antagonist/cult/on_removal()
. = ..()
@@ -31,4 +37,4 @@
to_chat(owner, "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.</span>")
owner.current.log_message("<font color=#960000>Has renounced the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
if(!silent)
owner.current.visible_message("<span class='big'>[owner] looks like [owner.current.p_they()] just reverted to their old faith!</span>")
owner.current.visible_message("<span class='big'>[owner] looks like [owner.current.p_they()] just reverted to their old faith!</span>")