From feaa20352b5776543106703a30060bc14cc78ad7 Mon Sep 17 00:00:00 2001
From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com>
Date: Sun, 20 Jan 2019 18:28:07 +0000
Subject: [PATCH] fixes damp rag having a lid
---
.../modules/detective_work/footprints_and_rag.dm | 1 +
.../reagent_containers/glass_containers.dm | 16 +++++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/code/modules/detective_work/footprints_and_rag.dm b/code/modules/detective_work/footprints_and_rag.dm
index 31f9e66255b..af266649e3f 100644
--- a/code/modules/detective_work/footprints_and_rag.dm
+++ b/code/modules/detective_work/footprints_and_rag.dm
@@ -21,6 +21,7 @@
can_be_placed_into = null
flags = NOBLUDGEON
container_type = OPENCONTAINER
+ no_lid = TRUE
var/wipespeed = 30
/obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 20687a6b98c..f3ff5095cb2 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -12,6 +12,7 @@
possible_transfer_amounts = list(5,10,15,25,30,50)
volume = 50
container_type = OPENCONTAINER
+ var/no_lid = FALSE // Stops certain containers having lids, mainly for damp rag
var/label_text = ""
// the fucking asshole who designed this can go die in a fire - Iamgoofball
@@ -57,13 +58,14 @@
/obj/item/reagent_containers/glass/attack_self()
..()
- if(is_open_container())
- to_chat(usr, "You put the lid on [src].")
- container_type ^= REFILLABLE | DRAINABLE
- else
- to_chat(usr, "You take the lid off [src].")
- container_type |= REFILLABLE | DRAINABLE
- update_icon()
+ if(!no_lid)
+ if(is_open_container())
+ to_chat(usr, "You put the lid on [src].")
+ container_type ^= REFILLABLE | DRAINABLE
+ else
+ to_chat(usr, "You take the lid off [src].")
+ container_type |= REFILLABLE | DRAINABLE
+ update_icon()
/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
if(!proximity)