From 54ec88707fb93f777cbe7969b356ea0a5fc51c75 Mon Sep 17 00:00:00 2001 From: DZD Date: Wed, 21 Jan 2015 19:38:11 -0500 Subject: [PATCH 1/2] Admin Logs and Rev Fix - Fixes Space Pod Pilot being a candidate for Rev Head - Adds attack and admin logs to borer mind control (including when the host takes control back). - Adds admin logs and improves attack logs on pyrokinesis (requires testing). --- code/game/dna/genes/goon_disabilities.dm | 5 ++++- code/game/gamemodes/revolution/revolution.dm | 2 +- code/modules/mob/living/simple_animal/borer.dm | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 68827157d55..4ca77d00162 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -325,7 +325,10 @@ return var/mob/living/carbon/L = targets[1] - + if(L) + usr.attack_log += text("\[[time_stamp()]\] [usr.real_name] ([usr.ckey]) cast the spell [name] on [L.real_name] ([L.ckey].") + L.attack_log += text("\[[time_stamp()]\] [usr.real_name] ([usr.ckey]) cast the spell [name] on [L.real_name] ([L.ckey].") + msg_admin_attack("[usr.real_name] ([usr.ckey]) has cast the spell [name] on [L.real_name] ([L.ckey]) (JMP)") L.adjust_fire_stacks(0.5) // Same as walking into fire. Was 100 (goon fire) L.visible_message("\red [L.name] suddenly bursts into flames!") L.on_fire = 1 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 87858b18be7..6aeafe753c3 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -14,7 +14,7 @@ /datum/game_mode/revolution name = "revolution" config_tag = "revolution" - restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician") + restricted_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician") protected_jobs = list() required_players = 4 required_players_secret = 15 diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index 425c6b241be..56ca314b62e 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -234,6 +234,8 @@ src << "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system." host << "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours." + host.attack_log += text("\[[time_stamp()]\] [src.name] ([src.ckey]) has assumed control of [host.name] ([host.ckey])") + msg_admin_attack("[src.name] ([src.ckey]) has assumed control of [host.name] ([host.ckey]) (JMP)") // host -> brain var/h2b_id = host.computer_id var/h2b_ip= host.lastKnownIP @@ -356,7 +358,8 @@ mob/living/simple_animal/borer/proc/detatch() if(host_brain) - + host.attack_log += text("\[[time_stamp()]\] [host_brain.name] ([host_brain.ckey]) has taken control back from [src.name] ([host.ckey])") + msg_admin_attack("[host_brain.name] ([host_brain.ckey]) has taken control back from [src.name] ([host.ckey]) (JMP)") // host -> self var/h2s_id = host.computer_id var/h2s_ip= host.lastKnownIP From 81e5103738f230aaf07759a066fcb3764d502ad1 Mon Sep 17 00:00:00 2001 From: DZD Date: Wed, 21 Jan 2015 20:38:57 -0500 Subject: [PATCH 2/2] Fix Missing Parenthesis Formatting fix. --- code/game/dna/genes/goon_disabilities.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 4ca77d00162..746a6d77686 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -326,8 +326,8 @@ var/mob/living/carbon/L = targets[1] if(L) - usr.attack_log += text("\[[time_stamp()]\] [usr.real_name] ([usr.ckey]) cast the spell [name] on [L.real_name] ([L.ckey].") - L.attack_log += text("\[[time_stamp()]\] [usr.real_name] ([usr.ckey]) cast the spell [name] on [L.real_name] ([L.ckey].") + usr.attack_log += text("\[[time_stamp()]\] [usr.real_name] ([usr.ckey]) cast the spell [name] on [L.real_name] ([L.ckey]).") + L.attack_log += text("\[[time_stamp()]\] [usr.real_name] ([usr.ckey]) cast the spell [name] on [L.real_name] ([L.ckey]).") msg_admin_attack("[usr.real_name] ([usr.ckey]) has cast the spell [name] on [L.real_name] ([L.ckey]) (JMP)") L.adjust_fire_stacks(0.5) // Same as walking into fire. Was 100 (goon fire) L.visible_message("\red [L.name] suddenly bursts into flames!")