From 681e892b62598759b5e43b56166dbee95be48a59 Mon Sep 17 00:00:00 2001
From: Wallemations <66052067+Wallemations@users.noreply.github.com>
Date: Thu, 5 Oct 2023 20:19:45 -0400
Subject: [PATCH] bot tle

---
 maplestation.dme                                 |   1 +
 .../temp_changes/bottles/bottle.dmi              | Bin 0 -> 2405 bytes
 .../temp_changes/bottles/bottlecode.dm           |  10 ++++++++++
 3 files changed, 11 insertions(+)
 create mode 100644 maplestation_modules/temp_changes/bottles/bottle.dmi
 create mode 100644 maplestation_modules/temp_changes/bottles/bottlecode.dm

diff --git a/maplestation.dme b/maplestation.dme
index ef5ca2a92e40..8b0b19bcd08c 100644
--- a/maplestation.dme
+++ b/maplestation.dme
@@ -5721,4 +5721,5 @@
 #include "maplestation_modules\story_content\ritz_equipment\code\ritzclothing.dm"
 #include "maplestation_modules\story_content\story_posters\code\contraband.dm"
 #include "maplestation_modules\story_content\stranger_equipment\code\strangerclothing.dm"
+#include "maplestation_modules\temp_changes\bottles\bottlecode.dm"
 // END_INCLUDE
diff --git a/maplestation_modules/temp_changes/bottles/bottle.dmi b/maplestation_modules/temp_changes/bottles/bottle.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..877f78bdc83af450f1f7b3f6411f473fd1d9ef67
GIT binary patch
literal 2405
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

literal 0
HcmV?d00001

diff --git a/maplestation_modules/temp_changes/bottles/bottlecode.dm b/maplestation_modules/temp_changes/bottles/bottlecode.dm
new file mode 100644
index 000000000000..ca0ad692acf6
--- /dev/null
+++ b/maplestation_modules/temp_changes/bottles/bottlecode.dm
@@ -0,0 +1,10 @@
+/// Fixes the weird fill icons bottles have at the moment by just overriding them.
+
+/obj/item/reagent_containers/cup/glass/bottle
+	var/maple_icon = 'maplestation_modules/temp_changes/bottles/bottle.dmi'
+
+/obj/item/reagent_containers/cup/glass/bottle/Initialize(mapload, vol)
+	. = ..()
+	if(src.type == /obj/item/reagent_containers/cup/glass/bottle || src.type == /obj/item/reagent_containers/cup/glass/bottle/small)
+		icon = maple_icon
+		fill_icon = maple_icon