From a90d5c8eff9eed08356817f2b29992337b9145bd Mon Sep 17 00:00:00 2001 From: AlManiak Date: Thu, 24 Oct 2024 14:27:48 +0200 Subject: [PATCH] Added Big gulps --- .../drinks/drinks/drinkingglass.dm | 52 +++++++++++++++++++ ...utolathe_designs_medical_and_dinnerware.dm | 41 +++++++++++++++ code/modules/vending/boozeomat.dm | 6 ++- 3 files changed, 98 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index f51530a972..4eab03a37d 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -132,3 +132,55 @@ reagents.clear_reagents() return +//GS 13 - Port +/obj/item/reagent_containers/food/drinks/flask/paper_cup + name = "paper cup" + icon = 'GainStation13/icons/obj/paper_cups.dmi' + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) + volume = 50 + reagent_flags = OPENCONTAINER + spillable = TRUE + container_HP = 5 + + pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg' + drop_sound = 'sound/items/handling/cardboardbox_drop.ogg' + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/small + name = "Small Gulp Cup" + desc = "A paper cup. It can hold up to 50 units. It's not very strong." + icon_state = "small" + materials = list(MAT_PLASTIC=200) + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/medium + name = "Medium Gulp Cup" + desc = "It's a paper cup, but you wouldn't call it 'medium' though. It can hold up to 75 units. It's not very strong." + icon_state = "medium" + volume = 75 + materials = list(MAT_PLASTIC=300) + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/big + name = "Big Gulp Cup" + desc = "A huge paper cup, a normal person would struggle to drink it all in one sitting. It can hold up to 120 units. It's not very strong." + icon_state = "big" + volume = 120 + materials = list(MAT_PLASTIC=500) + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big + name = "Extra Big Gulp Cup" + desc = "A comically large paper cup. It can hold up to 160 units. It's not very strong." + icon_state = "extra_big" + volume = 160 + materials = list(MAT_PLASTIC=600) + w_class = WEIGHT_CLASS_BULKY + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big + name = "Super Extra Big Gulp Cup" + desc = "Its called a paper 'cup', but it looks more like an oversized bucket to you. It can hold up to 250 units. It's not very strong." + icon_state = "super_extra_big" + volume = 250 + materials = list(MAT_PLASTIC=1000) + w_class = WEIGHT_CLASS_HUGE diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm index fbfd626ae7..a32af4d9a7 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm @@ -77,6 +77,47 @@ build_path = /obj/item/reagent_containers/food/drinks/shaker category = list("initial","Dinnerware") +//GS13 Port - Add gulp cups +/datum/design/small_cup + name = "Small Gulp Cup" + id = "Small_Gulp" + build_type = AUTOLATHE + materials = list(MAT_PLASTIC=200) + build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/small + category = list("initial","Dinnerware") + +/datum/design/medium_cup + name = "Medium Gulp Cup" + id = "Medium_Gulp" + build_type = AUTOLATHE + materials = list(MAT_PLASTIC=300) + build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium + category = list("initial","Dinnerware") + +/datum/design/small_cup + name = "Big Gulp Cup" + id = "Big_Gulp" + build_type = AUTOLATHE + materials = list(MAT_PLASTIC=500) + build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/big + category = list("initial","Dinnerware") + +/datum/design/extra_big_cup + name = "Extra Big Gulp Cup" + id = "Extra_Big_Gulp" + build_type = AUTOLATHE + materials = list(MAT_PLASTIC=600) + build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big + category = list("initial","Dinnerware") + +/datum/design/super_extra_big_cup + name = "Super Extra Big Gulp Cup" + id = "Super_Extra_Big_Gulp" + build_type = AUTOLATHE + materials = list(MAT_PLASTIC=1000) + build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big + category = list("initial","Dinnerware") + //////////// ///Medical// //////////// diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index c3e5f6ce0e..a71cc8750f 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -35,7 +35,11 @@ /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8, /obj/item/reagent_containers/food/drinks/ice = 10, /obj/item/reagent_containers/food/drinks/flask = 3, - /obj/item/reagent_containers/food/drinks/beer = 6) + /obj/item/reagent_containers/food/drinks/beer = 6, + /obj/item/reagent_containers/food/drinks/flask/paper_cup/small = 20, + /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium = 20, + /obj/item/reagent_containers/food/drinks/flask/paper_cup/big = 20, + /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big = 15) contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12, /obj/item/reagent_containers/food/drinks/bottle/fernet = 5) premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4,