Merge branch 'SPLURT-Station:master' into mulebot-fix

code/game/objects/structures/crates_lockers/closets/genpop.dm

@@ -5,7 +5,7 @@
 	var/default_name = "prisoner closet"
 	req_access = list(ACCESS_BRIG)
 	var/obj/item/card/id/prisoner/registered_id = null
-	icon_state = "prisoner"
+	icon_state = "secure"
 	locked = FALSE
 	anchored = TRUE
 	opened = TRUE
@@ -46,7 +46,7 @@
 	var/sentence_length = input(user, "Please input the length of their sentence in minutes (0 for perma).", "Sentence Length", registered_id.sentence) as num|null
 	if(sentence_length == null | !user.Adjacent(src))
 		return FALSE
-	var/crimes = sanitize(input(user, "Please input their crimes.", "Crimes", registered_id.crime) as text|null) 
+	var/crimes = sanitize(input(user, "Please input their crimes.", "Crimes", registered_id.crime) as text|null)
 	if(crimes == null | !user.Adjacent(src))
 		return FALSE
 
@@ -107,7 +107,7 @@
 			locked = TRUE
 			update_icon()
 			registered_id.forceMove(src.loc)
-			new /obj/item/clothing/under/rank/prisoner(src.loc)
+			//new /obj/item/clothing/under/rank/prisoner(src.loc)
 		else
 			qdel(registered_id)
 			registered_id = null

code/modules/surgery/organs/tongue.dm

@@ -38,6 +38,7 @@
 		/datum/language/modular_sand/technorussian, //Skyrat change - russian stereotype language
 		/datum/language/modular_sand/sergal, //Sandstorm change
 		/datum/language/modular_splurt/avian, //SPLURT change - peep peep!
+		/datum/language/modular_splurt/nyanese, //SPLURT change - meow meow!
 	))
 	healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
 	decay_factor = STANDARD_ORGAN_DECAY/2

code/modules/vending/cola.dm

@@ -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!~"

html/changelogs/archive/2024-12.yml

@@ -1,4 +1,3 @@
-
 2024-12-04:
   SandPoot:
   - rscadd: Higher staff can now set titles for you on the manifest using the security
@@ -44,3 +43,23 @@
   - bugfix: Misc things, like removing the bombs
   - rscadd: Medical patient rooms, for "fun"
   - rscadd: A work-around fix for medical having issues monitoring crew
+2024-12-12:
+  JWosak:
+  - rscadd: Aux Engine
+  - rscadd: Junk collector shuttle (non movable)
+  - tweak: Genpop closets now uses secure closet sprite due to lack of prisoner one
+  - tweak: Genpop no longer creates new copy of prisoner uniform
+  - bugfix: Floor tiles are now fixed (not sprites codewise just location and orientations
+      of tiles on map file)
+  SpaceCat404:
+  - rscadd: Old Glory sunflower seeds, a junk food available in snack machines.
+  - rscadd: Nyanese (feline) language.
+  - rscadd: TSC gasmask, available in sci wardrobe vendors. Slightly better bio and
+      acid protection at the cost of rad protection.
+  - rscadd: carbonated cum soda (cola vending machines)
+  - rscadd: femcum soda (cola vending machines)
+  - rscadd: can of blood (For fledglings & NT CEOs)(cola vending machines)
+  - rscadd: discreet can of blood (cola vending machines)
+  - rscadd: cum rum to booze-o-mat
+  - rscadd: femcum whiskey to booze-o-mat
+  - rscadd: bloodwine to booze-o-mat

modular_sand/code/modules/language/language.dm

@@ -62,7 +62,7 @@
 	ask_verb = "queries"
 	exclaim_verb = "declares"
 	whisper_verb = "hushes"
-	key = "v"
+	key = "5"  //SPLURT EDIT, langs must have unique tags. Initialized languages come first. V was taken by voltaic.
 	space_chance = 30
 	flags = TONGUELESS_SPEECH
 	syllables = list(

modular_splurt/code/game/objects/items/trash.dm

@@ -0,0 +1,6 @@
+//Added by Jack Rost! (and lucky now :3)
+
+/obj/item/trash/sfseeds
+	name = "\improper Old Glory sunflower seeds"
+	icon_state = "sfseeds"
+	icon = 'modular_splurt/icons/obj/janitor.dmi'

modular_splurt/code/modules/clothing/masks/gasmask.dm

@@ -43,3 +43,17 @@
 	clothing_flags = NONE
 	gas_transfer_coefficient = 0
 	permeability_coefficient = 0
+
+//Dr. K's Mask
+/obj/item/clothing/mask/gas/tscmask
+	name = "TSC mask"
+	desc = "An old mask from a lost time. Does not guarantee protection against transfurmation."
+	icon = 'modular_splurt/icons/obj/clothing/masks.dmi'
+	mob_overlay_icon = 'modular_splurt/icons/mob/clothing/mask.dmi'
+	anthro_mob_worn_overlay = 'modular_splurt/icons/mob/clothing/mask_muzzle.dmi'
+	icon_state = "tscmask"
+	item_state = "tscmask"
+	gas_transfer_coefficient = 0.2
+	permeability_coefficient = 0.2
+	flags_inv = HIDEFACE | HIDEFACIALHAIR | HIDESNOUT | HIDEEYES
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 20, "rad" = 10, "fire" = 10, "acid" = 20)

modular_splurt/code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -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

@@ -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/food_and_drinks/food/snacks_vend.dm

@@ -192,3 +192,15 @@
 		icon_state = "bean_bagopen"
 	else
 		icon_state = "bean_bag"
+
+/obj/item/reagent_containers/food/snacks/sfseeds
+	name = "\improper Old Glory sunflower seeds"
+	icon_state = "sfseeds"
+	icon = 'modular_splurt/icons/obj/food/food.dmi'
+	desc = "Sunflower seeds grown in the land of the free."
+	trash = /obj/item/trash/sfseeds
+	list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sodiumchloride = 3)
+	junkiness = 20
+	filling_color = "##BCAAA4"
+	tastes = list("americana" = 1)
+	foodtype = JUNKFOOD

modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm

@@ -11,7 +11,8 @@
 		"Senator",
 		"Consul",
 		"Cap-Slut",
-		"Condom"
+		"Condom",
+		"Catpain"
 	)
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()

modular_splurt/code/modules/language/language.dm

@@ -19,3 +19,33 @@
 	flags = TONGUELESS_SPEECH
 	icon_state = "birb"
 	restricted = FALSE
+
+/datum/language/modular_splurt/nyanese
+	name = "Nyanese"
+	desc = "The intergalatic language of felines, often used to annoy gods."
+	speech_verb = "meows"
+	ask_verb = "mrrps"
+	exclaim_verb = "mrowls"
+	key = "3"
+	flags = TONGUELESS_SPEECH
+	space_chance = 100
+	syllables = list(
+		"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Mrrp", "Hiss", "Prrr", "Myaa", "Mrow", "Nyah", "Rrrt", "Purr", "Yow",
+"Murrr", "Meow",  "Nyaa", "Meow",  "Mii", "Meeoo", "Meow",  "Rrraow", "Chrr", "Mrrrr", "Myaow", "Mrawr", "Mrowl",
+"Meeeow", "Nyrrrr", "Rrrrrooo", "Meow",  "Hrrrrt", "Meeew","Meow",  "Mieow", "Raaow", "Meerp", "Meow",  "Ryaa", "Meow",  "Hrrrawr",
+"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow",
+"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow",
+"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow"
+
+	)
+	icon_state = "feline"
+	default_priority = 75
+	//SKYRAT CHANGE - language restriction
+	restricted = FALSE
+
+//    							-----LUCKY KITTY MEOW MEOW LEARNING TIME-----
+// CODER! To save you the hassle, the key variable of a language must have be completly unique and not shared with any other languages.
+// To save you the trouble I have gone through all the languages in SPLURT Code. The remaining keys are 5, 7 and 8.
+// Please remove the keys from this comment when you use them! - Lucky (12/10/24)
+
+// Hypothetically, we could get around this by dynamically assigning keys to the languages a person speaks, but that's beyond me

modular_splurt/code/modules/language/language_holder.dm

@@ -1,4 +1,4 @@
 /datum/language_holder/synthetic/New()
 	. = ..()
-	understood_languages += list(/datum/language/schechi = list(LANGUAGE_ATOM), /datum/language/modular_splurt/avian = list(LANGUAGE_ATOM))
-	spoken_languages += list(/datum/language/schechi = list(LANGUAGE_ATOM), /datum/language/modular_splurt/avian = list(LANGUAGE_ATOM))
+	understood_languages += list(/datum/language/schechi = list(LANGUAGE_ATOM), /datum/language/modular_splurt/avian = list(LANGUAGE_ATOM), /datum/language/modular_splurt/nyanese = list(LANGUAGE_ATOM))
+	spoken_languages += list(/datum/language/schechi = list(LANGUAGE_ATOM), /datum/language/modular_splurt/avian = list(LANGUAGE_ATOM), /datum/language/modular_splurt/nyanese = list(LANGUAGE_ATOM))

modular_splurt/code/modules/mob/living/emotes.dm

@@ -1627,3 +1627,12 @@ To add randomization to your emote, copy and paste this line of code:
 	emote_cooldown = 4 SECONDS
 	vary = FALSE
 	volume = 30
+
+/datum/emote/sound/human/malaysia
+	key = "malaysia"
+	key_third_person = "admits to blowing up Malaysia!"
+	message = "admits to blowing up Malaysia!"
+	message_mime = "silently explains they blew up Malaysia!"
+	emote_type = EMOTE_AUDIBLE
+	sound = 'modular_splurt/sound/voice/malaysia.ogg'
+	emote_cooldown = 2 SECONDS

modular_splurt/code/modules/vending/boozeomat.dm

@@ -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

@@ -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/code/modules/vending/snack.dm

@@ -1,6 +1,7 @@
 /obj/machinery/vending/snack/Initialize(mapload)
 	var/list/extra_products = list(
-		/obj/item/storage/fancy/jellybean_bowl = 5
+		/obj/item/storage/fancy/jellybean_bowl = 5,
+		/obj/item/reagent_containers/food/snacks/sfseeds = 5
 	)
 	LAZYADD(products, extra_products)
 	. = ..()

modular_splurt/code/modules/vending/wardrobes.dm

@@ -156,3 +156,10 @@
 	)
 	LAZYADD(products, extra_premium)
 	. = ..()
+
+/obj/machinery/vending/wardrobe/science_wardrobe/Initialize(mapload)
+	var/list/extra_products = list(
+		/obj/item/clothing/mask/gas/tscmask = 3
+	)
+	LAZYADD(products, extra_products)
+	. = ..()

tgstation.dme

@@ -4646,6 +4646,7 @@
 #include "modular_splurt\code\game\objects\items\RCD.dm"
 #include "modular_splurt\code\game\objects\items\RTL.dm"
 #include "modular_splurt\code\game\objects\items\toys.dm"
+#include "modular_splurt\code\game\objects\items\trash.dm"
 #include "modular_splurt\code\game\objects\items\weaponry.dm"
 #include "modular_splurt\code\game\objects\items\carvingstones\carvingstones.dm"
 #include "modular_splurt\code\game\objects\items\circuitboards\computer_circuitboards.dm"
@@ -4911,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"
@@ -5180,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"