From d0a229c899c3af78e4b615f1f69ac672669ecfe4 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 7 Feb 2016 16:46:28 +0200 Subject: [PATCH 1/4] Fixing handle_ban_mirroring() It was supposed to pass a list into the Execute() proc, but wasn't. --- code/modules/admin/DB ban/ban_mirroring.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/DB ban/ban_mirroring.dm b/code/modules/admin/DB ban/ban_mirroring.dm index a2be1c78074..588acbdfccb 100644 --- a/code/modules/admin/DB ban/ban_mirroring.dm +++ b/code/modules/admin/DB ban/ban_mirroring.dm @@ -49,7 +49,7 @@ if (bad_data) var/DBQuery/new_mirror = dbcon.NewQuery("INSERT INTO ss13_ban_mirrors (ban_id, player_ckey, ban_mirror_ip, ban_mirror_computerid, ban_mirror_datetime) VALUES (:ban_id, :ckey, :address, :computerid, NOW())") - new_mirror.Execute(":ban_id" = ban_id, ":ckey" = ckey, ":address" = address, ":computerid" = computer_id) + new_mirror.Execute(list(":ban_id" = ban_id, ":ckey" = ckey, ":address" = address, ":computerid" = computer_id)) log_misc("Mirrored ban #[ban_id] for player [ckey] from [address]-[computer_id].") From 5d5a43e4ff326df9eb9bd163afed81d83d980e46 Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 8 Feb 2016 22:31:47 +0200 Subject: [PATCH 2/4] .DME update Enables fix #59 --- baystation12.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/baystation12.dme b/baystation12.dme index f72742a15ae..ebdf9775b3f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1275,6 +1275,7 @@ #include "code\modules\mob\living\silicon\decoy\life.dm" #include "code\modules\mob\living\silicon\pai\admin.dm" #include "code\modules\mob\living\silicon\pai\death.dm" +#include "code\modules\mob\living\silicon\pai\emote.dm" #include "code\modules\mob\living\silicon\pai\examine.dm" #include "code\modules\mob\living\silicon\pai\life.dm" #include "code\modules\mob\living\silicon\pai\pai.dm" From f1ebd94d4a0c5e70f0bc164952daf04ecd0b36d8 Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 8 Feb 2016 23:44:24 +0200 Subject: [PATCH 3/4] Fixing Adminhelps Stupid mistake while removing R_MENTOR. --- code/modules/admin/verbs/adminhelp.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 162fc5e3918..1c36dbff722 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -107,8 +107,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," admin_number_afk++ if(X.prefs.toggles & SOUND_ADMINHELP) X << 'sound/effects/adminhelp.ogg' - else - X << msg + + X << msg //show it to the person adminhelping too src << "PM to-Staff : [original_msg]" From 289cd15b82fa90f4d3ecc1558a049f6e3102a211 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Thu, 11 Feb 2016 16:40:23 +0000 Subject: [PATCH 4/4] fixes #55 --- code/game/jobs/job_controller.dm | 2 +- code/modules/mob/living/silicon/ai/latejoin.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index 82441ead326..4c4ecbd8e75 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -250,7 +250,7 @@ var/global/datum/controller/occupations/job_master // Loop through all jobs for(var/datum/job/job in shuffledoccupations) // SHUFFLE ME BABY - if(!job || ticker.mode.disabled_jobs.Find(job.title) ) + if(!job || (job.title in ticker.mode.disabled_jobs) ) //11/2/16 continue if(jobban_isbanned(player, job.title)) diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index 7c60bb75e43..4e2285bbb64 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -1,6 +1,8 @@ var/global/list/empty_playable_ai_cores = list() /hook/roundstart/proc/spawn_empty_ai() + if("AI" in ticker.mode.disabled_jobs) + return 1 // Don't make empty AI's on malf. for(var/obj/effect/landmark/start/S in landmarks_list) if(S.name != "AI") continue