From ab52d16f29335affed9936b702125e2381fc3d98 Mon Sep 17 00:00:00 2001
From: SomeGuyEatingPie <seandavidjohnson132@gmail.com>
Date: Tue, 15 Feb 2022 17:38:47 +0000
Subject: [PATCH] Copied changes to easily merge

---
 GainStation13/icons/obj/paper_cups.dmi        | Bin 0 -> 736 bytes
 .../drinks/drinks/drinkingglass.dm            |  53 ++++++++++++++++++
 ...utolathe_designs_medical_and_dinnerware.dm |  42 ++++++++++++++
 code/modules/vending/boozeomat.dm             |   9 ++-
 4 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 GainStation13/icons/obj/paper_cups.dmi

diff --git a/GainStation13/icons/obj/paper_cups.dmi b/GainStation13/icons/obj/paper_cups.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..a0ca5c7758d35a8f4a40d865f308eb8343338210
GIT binary patch
literal 736
zcmV<60w4W}P)<h;3K|Lk000e1NJLTq003YB002M)0{{R37aDIp0000aP)t-sz`(#W
z%>Of)|G>b&-QC@mmX`nj{{YPY0RR7H0L<#@>cGIjt0XtM00001bW%=J06^y0W&i*H
ziF#C6bVOxyV{&P5bZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F
z0CJ3txHvOXGt)ClAe`co#FA7XQ>i#NF(*ffi!&v&s2IpM<l;;#O3Y1#u;Hq5Q&Tca
za|tR-%1kGyCbgoZC^4QGmBpn6sYUSw)hjEw`niDp4gfUoN=IfLNUi_?0o6%FK~zYI
z?Ug}J!!Qs<4VCvuaDm>S!i5D(>H}0lX$xCan+w#5574+A03}@`HaR7BLYnbJu89B%
z3I6We^E?wv`6lGA=p?p){pnd`p;s`*E${;Nm*<QPXfa}Z%sHEYB{ud>7&+hVPdUH6
z;Cu$^-2wykwVwdM$pfrBfWr~6CxkMqdFSt(zv{My^8yr5VFmoc`L(|-d>|DH0!r=_
z1eDB`2c#xTfnVueT5P**rDa-32$)hE2oz<u--JD(<z5#6xX+5cc?o+$wQb>zs7(&P
zDb+IfI>=1Hk*xPGK|Tp^38cP9=p)x02e2pPp{m{n9AH<HWIhPM!X2^i33rSFu>=0~
zI}}Uro}%g9Q!Kr)MlQ}l5;EsmxSma2oX^?{7o}qqrvCZ7iF5u@Fm3(p2v7?EINy6C
zaWoRncVCM~7w6aQU)-d-pYI50;=BVyFW<iiEN%V^We$L>y_De&N*kO1Z9LP`dRdqv
z2+-2y{~^AqZv1l?&@TVG1DB28hUy8;?Ry}y1F({Iraaq(0paq$`^H6H`*je&`H!yo
z2Y~)V{$+qxLR9ks0LuU2K;`PIV}So)P<B&QuWY~*lDPjT`Fy=4tcKKor``d)9OhZ?
S{pE-N0000<MNUMnLSTZt_Ek6l

literal 0
HcmV?d00001

diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 95b3e8db..2bb1d438 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -135,3 +135,56 @@
 		reagents.clear_reagents()
 		return
 
+//gs13 Big Glup Cups
+
+/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 d698e11b..12171586 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
@@ -87,6 +87,48 @@
 	build_path = /obj/item/reagent_containers/food/drinks/shaker
 	category = list("initial","Dinnerware")
 
+
+//gs13 paper 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 3242e1d0..a6872ab4 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -30,9 +30,14 @@
 					/obj/item/reagent_containers/food/drinks/ice = 10,
 					/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12,
 					/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)
+					  /obj/item/reagent_containers/food/drinks/bottle/fernet = 5,
+					  /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big = 10)
 	premium = list(/obj/item/reagent_containers/glass/bottle/ethanol = 4,
 				   /obj/item/reagent_containers/food/drinks/bottle/champagne = 5,
 				   /obj/item/reagent_containers/food/drinks/bottle/trappist = 5)