From cfff6677b416326abfba36b86abf70a0b04f4e52 Mon Sep 17 00:00:00 2001 From: dapnee <33661984+dapnee@users.noreply.github.com> Date: Sun, 21 Jun 2020 18:14:34 -0600 Subject: [PATCH 1/5] wataur hahaha, imagine if this worked --- .../reagents/reagent_containers/glass.dm | 17 +++++++++++++++++ icons/obj/drinks.dmi | Bin 102685 -> 103077 bytes icons/obj/reagentfillings.dmi | Bin 4148 -> 4548 bytes 3 files changed, 17 insertions(+) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 800d66969d..4c20b4cb8a 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -386,6 +386,23 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() +/obj/item/reagent_containers/food/drinks/waterbottle/wataur + name = "Bottled Watuar" + desc = "Finally, a bottle as proportionate as you." + icon = 'icons/obj/drinks.dmi' + icon_state = "wataur" + item_state = "wataur" + list_reagents = list(/datum/reagent/water = 100) + custom_materials = list(/datum/material/glass=0) + volume = 100 + amount_per_transfer_from_this = 20 + possible_transfer_amounts = list(5,10,15,20,25,30,50, 100) + container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB + container_HP = 1 + +/obj/item/reagent_containers/food/drinks/waterbottle/wataur/empty + list_reagents = list() + /obj/item/reagent_containers/glass/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle") diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 07e7bf1da88bb6c08316a613720f6ae3b1a9ef14..6ba11b1ca339c0d081fce5f84ee0c17d9dce8882 100644 GIT binary patch delta 5433 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 Date: Sun, 21 Jun 2020 18:49:58 -0600 Subject: [PATCH 2/5] hey look, I'm finished with a single meme item hahaha --- code/modules/reagents/reagent_containers/glass.dm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 4c20b4cb8a..5c2a9d58e9 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -386,22 +386,19 @@ /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty list_reagents = list() -/obj/item/reagent_containers/food/drinks/waterbottle/wataur - name = "Bottled Watuar" +/obj/item/reagent_containers/glass/beaker/waterbottle/wataur + name = "Bottled Wataur" desc = "Finally, a bottle as proportionate as you." icon = 'icons/obj/drinks.dmi' icon_state = "wataur" - item_state = "wataur" + custom_materials = list(/datum/material/plastic=0) list_reagents = list(/datum/reagent/water = 100) - custom_materials = list(/datum/material/glass=0) volume = 100 amount_per_transfer_from_this = 20 possible_transfer_amounts = list(5,10,15,20,25,30,50, 100) container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB container_HP = 1 - -/obj/item/reagent_containers/food/drinks/waterbottle/wataur/empty - list_reagents = list() + cached_icon = "wataur" /obj/item/reagent_containers/glass/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "bottle") From a899bde0ba057cecf9c511c7e28aa57b2785d962 Mon Sep 17 00:00:00 2001 From: dapnee <33661984+dapnee@users.noreply.github.com> Date: Mon, 22 Jun 2020 15:25:42 -0600 Subject: [PATCH 3/5] Let's try again aaaaaaaaa --- icons/obj/drinks.dmi | Bin 109743 -> 110176 bytes icons/obj/reagentfillings.dmi | Bin 4626 -> 4926 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 27caef76b202b49b8e8b1885422cecaae666f0fe..5962e7522dbc57f14b2e64492d43a43d23295c70 100644 GIT binary patch delta 12163 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 Ag#Z8m diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 05337721c7bb58179c3d734b36450efec7239087..d7a9a03c415094ff97942bc575255ee4faf6d7dc 100644 GIT binary patch delta 4199 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 delta 3881 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 Date: Mon, 22 Jun 2020 18:17:21 -0600 Subject: [PATCH 4/5] Update cola.dm adds wataur to cola machine --- code/modules/vending/cola.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index b667f4c7c9..4b62e721ba 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -15,7 +15,8 @@ /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) + /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6 + /obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2) premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, /obj/item/reagent_containers/food/drinks/soda_cans/grey_bull = 1, From 147fd2d95389bdab20f7cc8fa84d1dd82294b587 Mon Sep 17 00:00:00 2001 From: dapnee <33661984+dapnee@users.noreply.github.com> Date: Mon, 22 Jun 2020 19:35:27 -0600 Subject: [PATCH 5/5] imagine forgetting a comma oop --- code/modules/vending/cola.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 4b62e721ba..bb5b8ef288 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -15,7 +15,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, - /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6 + /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6, /obj/item/reagent_containers/glass/beaker/waterbottle/wataur = 2) premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, /obj/item/reagent_containers/food/drinks/soda_cans/air = 1,