From 4a86f2f34af7dcb994a6878c253000ef6091b779 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 23 Apr 2017 10:09:50 +0100 Subject: [PATCH 1/3] Removes a disgusting hack --- code/game/gamemodes/scoreboard.dm | 7 ------- code/modules/clothing/under/jobs/civilian.dm | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 3a0d531e03a..a39692e2ffa 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -29,13 +29,6 @@ if(I.stat == DEAD && is_station_level(I.z)) score_deadcrew++ - if(I && I.mind) - if(I.mind.assigned_role == "Clown") - for(var/thing in I.attack_log) - if(findtext(thing, "")) //This has to be the hackiest fucking way _ever_ to see attacks. - score_clownabuse++ - - if(shuttle_master.emergency.mode >= SHUTTLE_ENDGAME) for(var/mob/living/player in mob_list) if(player.client) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 68307875b1b..6ebd5363194 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -72,6 +72,7 @@ /obj/item/clothing/under/rank/clown/hit_reaction() playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) + score_clownabuse++ return 0 /obj/item/clothing/under/rank/head_of_personnel From a28a7a4da58bc355ce52c31ae5543dc7fc184fc5 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 2 May 2017 07:44:23 +0100 Subject: [PATCH 2/3] Updates to check to ensure they are clowns, not imposters --- code/modules/clothing/under/jobs/civilian.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 6ebd5363194..38729fa00b9 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -72,7 +72,10 @@ /obj/item/clothing/under/rank/clown/hit_reaction() playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1) - score_clownabuse++ + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + if(H.mind && H.mind.assigned_role == "Clown") + score_clownabuse++ return 0 /obj/item/clothing/under/rank/head_of_personnel From 7283274dd7f16a08a1d59983eef32b49a745f0e0 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 May 2017 00:34:11 +0100 Subject: [PATCH 3/3] Github editor, how I hate thee let me count the ways --- code/modules/clothing/under/jobs/civilian.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 38729fa00b9..bac5b3d51e3 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -75,7 +75,7 @@ if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.mind && H.mind.assigned_role == "Clown") - score_clownabuse++ + score_clownabuse++ return 0 /obj/item/clothing/under/rank/head_of_personnel