From ad8c1f11cd842818eb7821e3a674f100c61640d6 Mon Sep 17 00:00:00 2001
From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com>
Date: Wed, 16 Jan 2019 19:51:47 +0000
Subject: [PATCH 1/3] Examining backpacks now gives a rough indication of
remaining space
---
.../objects/items/weapons/storage/backpack.dm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 2edc0351285..79666c2eefa 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -26,6 +26,23 @@
playsound(src.loc, "rustle", 50, 1, -5)
return ..()
+/obj/item/storage/backpack/examine(mob/user)
+ var/space_used = 0
+ for(var/obj/item/I in contents)
+ space_used += I.w_class
+ if(!..(user, 1))
+ return
+ if(!space_used)
+ to_chat(user, " \The [src] is empty.")
+ else if(space_used <= max_combined_w_class*0.6)
+ to_chat(user, " \The [src] still has plenty of remaining space.")
+ else if(space_used <= max_combined_w_class*0.8)
+ to_chat(user, " \The [src] is beginning to run out of space.")
+ else if(space_used < max_combined_w_class)
+ to_chat(user, " \The [src] doesn't have much space left.")
+ else
+ to_chat(user, " \The [src] is full.")
+
/*
* Backpack Types
*/
From 32cacc95ad5eedc5b56dec2f3b01af6233cc70b1 Mon Sep 17 00:00:00 2001
From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com>
Date: Thu, 17 Jan 2019 00:09:27 +0000
Subject: [PATCH 2/3] Removal of "The"
---
code/game/objects/items/weapons/storage/backpack.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 79666c2eefa..5faa2c79968 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -33,15 +33,15 @@
if(!..(user, 1))
return
if(!space_used)
- to_chat(user, " \The [src] is empty.")
+ to_chat(user, " [src] is empty.")
else if(space_used <= max_combined_w_class*0.6)
- to_chat(user, " \The [src] still has plenty of remaining space.")
+ to_chat(user, " [src] still has plenty of remaining space.")
else if(space_used <= max_combined_w_class*0.8)
- to_chat(user, " \The [src] is beginning to run out of space.")
+ to_chat(user, " [src] is beginning to run out of space.")
else if(space_used < max_combined_w_class)
- to_chat(user, " \The [src] doesn't have much space left.")
+ to_chat(user, " [src] doesn't have much space left.")
else
- to_chat(user, " \The [src] is full.")
+ to_chat(user, " [src] is full.")
/*
* Backpack Types
From a57e5b1cc84ce6bf991e0eae5f0c85758b9979d8 Mon Sep 17 00:00:00 2001
From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com>
Date: Thu, 17 Jan 2019 21:39:56 +0000
Subject: [PATCH 3/3] improved logic
---
code/game/objects/items/weapons/storage/backpack.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 5faa2c79968..cdcc299ecaf 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -28,10 +28,10 @@
/obj/item/storage/backpack/examine(mob/user)
var/space_used = 0
- for(var/obj/item/I in contents)
- space_used += I.w_class
if(!..(user, 1))
return
+ for(var/obj/item/I in contents)
+ space_used += I.w_class
if(!space_used)
to_chat(user, " [src] is empty.")
else if(space_used <= max_combined_w_class*0.6)