Merge pull request #7157 from SamHPurp/clown-abuse

Removes a disgusting hack
This commit is contained in:
Fox McCloud
2017-05-07 17:47:59 -04:00
committed by GitHub
2 changed files with 4 additions and 7 deletions
-7
View File
@@ -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, "<font color='orange'>")) //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)
@@ -72,6 +72,10 @@
/obj/item/clothing/under/rank/clown/hit_reaction()
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
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