cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-02 13:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes cult datum giving the action button to the mind instead of mob. Also fixes trying to replace the mind instead of the body when the player is jobbaned.

Browse Source
This commit is contained in:
Lzimann
2017-04-30 23:53:00 -03:00
parent 862a3d80c8
commit dbdf2a7e3e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/antagonists/datum_clockcult.dm
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

6
code/datums/antagonists/datum_cult.dm
View File

@@ -10,20 +10,20 @@
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()
. = ..()
owner.current.faction |= "cult"
owner.current.verbs += /mob/living/proc/cult_help
communion.Grant(owner)
communion.Grant(owner.current)
/datum/antagonist/cult/remove_innate_effects()
. = ..()
owner.current.faction -= "cult"
owner.current.verbs -= /mob/living/proc/cult_help
communion.Remove(owner.current)
/datum/antagonist/cult/on_removal()
. = ..()