From 07ca64fdbb0fa9d325fe872fe76f9c186f9c11af Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 1 Feb 2016 22:11:46 -0600 Subject: [PATCH 1/2] King of the Hill Fixes --- code/modules/awaymissions/capture_the_flag.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 3464903d1f7..890699c2719 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -190,9 +190,13 @@ for(var/obj/item/weapon/twohanded/required/ctf/W in M) M.unEquip(W) M.dust() + for(var/obj/machinery/control_point/control in machines) + control.icon_state = "dominator" + control.controlling = null for(var/obj/machinery/capture_the_flag/CTF in machines) if(CTF.ctf_enabled == TRUE) CTF.points = 0 + CTF.control_points = 0 CTF.ctf_enabled = FALSE CTF.team_members = list() spawn(300) From 0f39a20d4aab186315d99faedc646fe393ab7074 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Mon, 1 Feb 2016 22:40:22 -0600 Subject: [PATCH 2/2] Machines are apparently not anchored by default --- code/modules/awaymissions/capture_the_flag.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 890699c2719..41342e2afbf 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -92,6 +92,7 @@ desc = "Used for running friendly games of capture the flag." icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" + anchored = 1 var/team = WHITE_TEAM //Capture the Flag scoring var/points = 0 @@ -316,6 +317,7 @@ desc = "You should capture this." icon = 'icons/obj/machines/dominator.dmi' icon_state = "dominator" + anchored = 1 var/obj/machinery/capture_the_flag/controlling var/team = "none" var/point_rate = 1