From accafd8deb64ce1ba5f8e3d30c9f2064f3041bee Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Fri, 19 Feb 2021 14:08:50 +0100
Subject: [PATCH] [MIRROR] Cleans up living duffel bag code to meet guidelines
(#3501)
* Cleans up living duffel bag code to meet guidelines (#57014)
* Cleans up living duffel bag code to meet guidelines
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
---
code/game/objects/items/storage/backpack.dm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 1472255a7c7..19682dadd74 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -399,10 +399,8 @@
. = ..()
/obj/item/storage/backpack/duffelbag/cursed/process()
- ///don't process if it's somehow on the floor
- if(!iscarbon(src.loc))
- return
- var/mob/living/carbon/user = src.loc
+
+ var/mob/living/carbon/user = loc
///check hp
if(obj_integrity == 0)
user.dropItemToGround(src, TRUE)
@@ -411,16 +409,16 @@
if((hunger > 50) && prob(20))
for(var/obj/item/I in contents)
if(IS_EDIBLE(I))
- var/obj/item/food/F = I
- F.forceMove(user.loc)
+ var/obj/item/food/hunger_breaks = I //If you fed them poundland microwave meals, it probably would kill them
+ hunger_breaks.forceMove(user.loc)
playsound(src, 'sound/items/eatfood.ogg', 20, TRUE)
///poisoned food damages it
- if(istype(F, /obj/item/food/badrecipe))
+ if(istype(hunger_breaks, /obj/item/food/badrecipe))
to_chat(user, "The [name] grumbles!")
obj_integrity -= 50
else
- to_chat(user, "The [name] eats your [F]!")
- qdel(F)
+ to_chat(user, "The [name] eats your [hunger_breaks]!")
+ QDEL_NULL(hunger_breaks)
hunger = 0
return
///no food found: it bites you and loses some hp