From dedea7c1d2a315d1d736a32807f3652c48368441 Mon Sep 17 00:00:00 2001 From: FlattestGuitar Date: Sun, 2 Oct 2016 16:48:27 +0200 Subject: [PATCH 1/2] adds logs to missionary stuffs --- code/game/objects/items/weapons/holy_weapons.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 600ff934a8f..58efa2290f4 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -568,6 +568,7 @@ faith -= 100 //if you made it this far: congratulations! you are now a religious zealot! target.mind.make_zealot(missionary, convert_duration, team_color) + add_logs(missionary, target, "converted", src, "for [convert_duration/600] minutes") target << sound('sound/misc/wololo.ogg', 0, 1, 25) missionary.say("WOLOLO!") From 03cc776d40d8b24fd079338f5b3d58083e2dc969 Mon Sep 17 00:00:00 2001 From: FlattestGuitar Date: Tue, 4 Oct 2016 13:58:30 +0200 Subject: [PATCH 2/2] moves the stuffs to mind.dm --- code/datums/mind.dm | 4 ++-- code/game/objects/items/weapons/holy_weapons.dm | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 0fc63dd0ae9..b21cd769fb1 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1523,7 +1523,7 @@ jumpsuit.color = team_color H.update_inv_w_uniform(0,0) - log_admin("[ckey(missionary.key)] has converted [ckey(current.key)] as a zealot.") + add_logs(missionary, current, "converted", addition = "for [convert_duration/600] minutes") addtimer(src, "remove_zealot", convert_duration, FALSE, jumpsuit) //deconverts after the timer expires return 1 @@ -1532,7 +1532,7 @@ if(!zealot_master) //if they aren't a zealot, we can't remove their zealot status, obviously. don't bother with the rest so we don't confuse them with the messages return ticker.mode.remove_traitor_mind(src) - log_admin("[ckey(current.key)] has deconverted and is no longer a zealot of [ckey(zealot_master.key)].") + add_logs(zealot_master, current, "lost control of", addition = "as their zealot master") zealot_master = null if(jumpsuit) diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 58efa2290f4..600ff934a8f 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -568,7 +568,6 @@ faith -= 100 //if you made it this far: congratulations! you are now a religious zealot! target.mind.make_zealot(missionary, convert_duration, team_color) - add_logs(missionary, target, "converted", src, "for [convert_duration/600] minutes") target << sound('sound/misc/wololo.ogg', 0, 1, 25) missionary.say("WOLOLO!")