cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-26 06:07:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1228 from SpaceCat404/carbonated-cum

Browse Source 
Carbonated Cum Update
This commit is contained in:
Mosley
2024-12-12 14:39:10 -05:00
committed by GitHub
parent cdc9e8b93f 68b44b7e12
commit bf596ff476
7 changed files with 75 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vending/cola.dm
+3 -2
View File
@@ -1,4 +1,3 @@
/obj/machinery/vending/cola
name = "\improper Robust Softdrinks"
desc = "A softdrink vendor provided by Robust Industries, LLC."
@@ -13,7 +12,8 @@
/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)
/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/glass/beaker/waterbottle/wataur = 2)
@@ -105,6 +105,7 @@
product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp."
light_mask = "shamblers-light-mask"
light_color = COLOR_MOSTLY_PURE_PINK
/obj/machinery/vending/cola/buzz_fuzz
name = "\improper Buzz Fuzz Vendor"
desc = "~A hive of Flavour!~"
modular_splurt/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+25
View File
@@ -19,3 +19,28 @@
volume = 100
list_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 100)
// New Splurt bottles for the barman.
/obj/item/reagent_containers/food/drinks/bottle/cum_rum
name = "NT Femboy Navy Cum Rum"
desc = "Can't have female mates in the Navy! Sourced from NT femboy cum farms."
icon = 'modular_splurt/icons/obj/drinks.dmi'
icon_state = "cum_rum"
volume = 100
list_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 40, /datum/reagent/consumable/semen = 60)
/obj/item/reagent_containers/food/drinks/bottle/femcum_whiskey
name = "2440's Special Femcum whiskey"
desc = "For the womanizer detective."
icon = 'modular_splurt/icons/obj/drinks.dmi'
icon_state = "femcum_whiskey"
volume = 100
list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 40, /datum/reagent/consumable/semen/femcum = 60)
/obj/item/reagent_containers/food/drinks/bottle/bloodwine
name = "Stoker's Special reserve Bloodwine"
desc = "Horribly sweet, wonderfuly wicked and aged to perfection."
icon = 'modular_splurt/icons/obj/drinks.dmi'
icon_state = "bloodwine"
volume = 100
list_reagents = list(/datum/reagent/consumable/ethanol/wine = 40, /datum/reagent/blood = 60)
modular_splurt/code/modules/food_and_drinks/drinks/drinks/drinks.dm
+31
View File
@@ -0,0 +1,31 @@
/obj/item/reagent_containers/food/drinks/soda_cans/carbonatedcum
name = "Mosley's Special Carbonated Cum"
desc = "A pink can with the image of a Mal0 on the front. Very seductive eyes."
icon = 'modular_splurt/icons/obj/drinks.dmi'
icon_state = "carbonatedcum"
list_reagents = list(/datum/reagent/consumable/semen = 30)
foodtype = SUGAR | BREAKFAST // This is intentional, Meow :3 - Lucky
/obj/item/reagent_containers/food/drinks/soda_cans/carbonatedfemcum
name = "Mosley's Special Carbonated Femcum"
desc = "A purple can with the image of a Mal0 on the front. Very seductive eyes."
icon = 'modular_splurt/icons/obj/drinks.dmi'
icon_state = "carbonatedfemcum"
list_reagents = list(/datum/reagent/consumable/semen/femcum = 30)
foodtype = SUGAR
/obj/item/reagent_containers/food/drinks/soda_cans/blood
name = "Stoker's Reserve"
desc = "A cola bottle made to look like a night out on the town, bears a large V."
icon = 'modular_splurt/icons/obj/drinks.dmi'
icon_state = "blood"
list_reagents = list(/datum/reagent/blood = 30)
foodtype = MEAT
/obj/item/reagent_containers/food/drinks/soda_cans/blooddiscrete
name = "Space Cola V" // Stoker's Reserve discrete
desc = "Looks like cola, smells like iron."
icon = 'icons/obj/drinks.dmi'
icon_state = "cola"
list_reagents = list(/datum/reagent/blood = 30)
foodtype = MEAT
modular_splurt/code/modules/vending/boozeomat.dm
+4 -1
View File
@@ -2,7 +2,10 @@
var/list/extra_products = list(
/obj/item/reagent_containers/food/drinks/bottle/bitters = 6,
/obj/item/reagent_containers/food/drinks/bottle/curacao = 3,
/obj/item/reagent_containers/food/drinks/bottle/navy_rum = 3
/obj/item/reagent_containers/food/drinks/bottle/navy_rum = 3,
/obj/item/reagent_containers/food/drinks/bottle/bloodwine = 3,
/obj/item/reagent_containers/food/drinks/bottle/femcum_whiskey = 4,
/obj/item/reagent_containers/food/drinks/bottle/cum_rum = 4
)
LAZYADD(products, extra_products)
. = ..()
modular_splurt/code/modules/vending/cola.dm
+10 -6
View File
@@ -1,6 +1,10 @@
/obj/machinery/vending/cola/Initialize()
var/list/extra_products = list(
/obj/item/reagent_containers/glass/beaker/waterbottle/large = 5
)
LAZYADD(products, extra_products)
. = ..()
/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,
/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
)
LAZYADD(products, extra_products)
. = ..()
modular_splurt/icons/obj/drinks.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 19 KiB

tgstation.dme
+2
View File
@@ -4912,6 +4912,7 @@
#include "modular_splurt\code\modules\events\crystalline_reentry.dm"
#include "modular_splurt\code\modules\events\vent_clog.dm"
#include "modular_splurt\code\modules\food_and_drinks\drinks\drinks\bottle.dm"
#include "modular_splurt\code\modules\food_and_drinks\drinks\drinks\drinks.dm"
#include "modular_splurt\code\modules\food_and_drinks\drinks\drinks\sizeitems.dm"
#include "modular_splurt\code\modules\food_and_drinks\food\snacks.dm"
#include "modular_splurt\code\modules\food_and_drinks\food\snacks_burgers.dm"
@@ -5181,6 +5182,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"