CarbonatedCumUpdateFix1

SPLURT-Station · Dec 10, 2024 · 68b44b7 · 68b44b7
1 parent c29c78e
commit 68b44b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm
@@ -12,13 +12,7 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,
 					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10,
-					/obj/item/reagent_containers/glass/beaker/waterbottle = 10,
-					//SPLURT ADDITIONS - MODULARIZATION IMPOSSIBLE?
-					/obj/item/reagent_containers/glass/beaker/waterbottle/large = 5,
-					/obj/item/reagent_containers/food/drinks/soda_cans/carbonatedcum = 5,
-					/obj/item/reagent_containers/food/drinks/soda_cans/carbonatedfemcum = 5,
-					/obj/item/reagent_containers/food/drinks/soda_cans/blood = 5,
-					/obj/item/reagent_containers/food/drinks/soda_cans/blooddiscrete = 5
+					/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,

diff --git a/modular_splurt/code/modules/vending/cola.dm b/modular_splurt/code/modules/vending/cola.dm
@@ -1,4 +1,4 @@
-/* /obj/machinery/vending/cola/Initialize(mapload)
+/obj/machinery/vending/cola/Initialize(mapload)
 	var/list/extra_products = list(
 			/obj/item/reagent_containers/glass/beaker/waterbottle/large = 5,
 			/obj/item/reagent_containers/food/drinks/soda_cans/carbonatedcum = 5,
@@ -8,4 +8,3 @@
 	)
 	LAZYADD(products, extra_products)
 	. = ..()
-Doesn't work, why bother?
diff --git a/tgstation.dme b/tgstation.dme
@@ -5181,6 +5181,7 @@
 #include "modular_splurt\code\modules\vending\boozeomat.dm"
 #include "modular_splurt\code\modules\vending\cigarette.dm"
 #include "modular_splurt\code\modules\vending\clothesmate.dm"
+#include "modular_splurt\code\modules\vending\cola.dm"
 #include "modular_splurt\code\modules\vending\engineering.dm"
 #include "modular_splurt\code\modules\vending\games.dm"
 #include "modular_splurt\code\modules\vending\kinkmate.dm"