From a100fd78bc491424fcca5b0048f3bdfadcdd19d2 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Thu, 17 May 2012 00:55:38 +0300 Subject: [PATCH] Bugfix for #1073 --- code/game/objects/items.dm | 2 +- code/game/objects/items/weapons/kitchen.dm | 4 ++-- code/modules/mob/mob.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index e44d45d7905..3993a1e2acf 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -372,7 +372,7 @@ if(M:brain_op_stage == 4.0) for(var/mob/O in viewers(M, null)) - if(O == (user || M)) + if(O == user || O == M) continue if(M == user) O.show_message(text("\red [user] inserts [src] into his head!"), 1) diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index b4187524e96..b7c6d78c736 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -164,10 +164,10 @@ KNIFE playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3 - var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later. + var/mob/living/carbon/human/H = M // Let's have this ready for later. - if(!(user.zone_sel.selecting == ("eyes" || "head"))) //////////////hitting anything else other than the eyes + if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != user.zone_sel.selecting != "head") //hitting anything else other than the eyes if(prob(33)) src.add_blood(H) var/turf/location = H.loc diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 9fa2598508c..114c569fdca 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -415,7 +415,7 @@ if ((stat != 2 || !( ticker ))) usr << "\blue You must be dead to use this!" return - if (ticker.mode.name == ("meteor" || "epidemic")) + if (ticker.mode.name == "meteor" || ticker.mode.name == "epidemic") usr << "\blue Respawn is disabled." return else