From 6be8897d5b98403aead1ef4793f5274d0e32f795 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Tue, 23 Nov 2021 10:41:06 -0600 Subject: [PATCH 1/3] Prevents cogscarabs from heralding ratvar --- .../antagonists/clockcult/clock_structures/heralds_beacon.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm index f7a091ccb7fc..f25bfa2ab268 100644 --- a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm +++ b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm @@ -68,6 +68,10 @@ if(!available) to_chat(user, span_danger("You can no longer vote with [src].")) return + if(issilicon(user)) + to_chat(user, span_danger("You are unable to activate [src].")) + return + var/voting = !(user.key in voters) if(alert(user, "[voting ? "Cast a" : "Undo your"] vote to activate the beacon?", "Herald's Beacon", "Change Vote", "Cancel") == "Cancel") return From e85ba62f93482c49acf887364da55b0f3b784d5f Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Tue, 23 Nov 2021 10:43:05 -0600 Subject: [PATCH 2/3] Fixing the type check for cogscarabs --- .../antagonists/clockcult/clock_structures/heralds_beacon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm index f25bfa2ab268..7f0eb599418a 100644 --- a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm +++ b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm @@ -68,7 +68,7 @@ if(!available) to_chat(user, span_danger("You can no longer vote with [src].")) return - if(issilicon(user)) + if(istype(M, /mob/living/simple_animal/drone/cogscarab)) to_chat(user, span_danger("You are unable to activate [src].")) return From 96cef0f34d73306b847802b53118144ea66559e6 Mon Sep 17 00:00:00 2001 From: Gabriel Adamson Date: Tue, 23 Nov 2021 10:53:44 -0600 Subject: [PATCH 3/3] It compiles now --- .../antagonists/clockcult/clock_structures/heralds_beacon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm index 7f0eb599418a..230f80df2f59 100644 --- a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm +++ b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm @@ -68,7 +68,7 @@ if(!available) to_chat(user, span_danger("You can no longer vote with [src].")) return - if(istype(M, /mob/living/simple_animal/drone/cogscarab)) + if(istype(user, /mob/living/simple_animal/drone/cogscarab)) to_chat(user, span_danger("You are unable to activate [src].")) return