Merge pull request #1227 from SpaceCat404/master

Lucky's second first PR
SPLURT-Station · Dec 12, 2024 · c6bc867 · c6bc867
2 parents 2de8791 + eb8afd9
commit c6bc867
Show file tree

Hide file tree

Showing 20 changed files with 87 additions and 5 deletions.
diff --git a/code/modules/surgery/organs/tongue.dm b/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

diff --git a/modular_sand/code/modules/language/language.dm b/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(

diff --git a/modular_splurt/code/game/objects/items/trash.dm b/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'
diff --git a/modular_splurt/code/modules/clothing/masks/gasmask.dm b/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)
diff --git a/modular_splurt/code/modules/food_and_drinks/food/snacks_vend.dm b/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
diff --git a/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm b/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)
 	. = ..()

diff --git a/modular_splurt/code/modules/language/language.dm b/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
diff --git a/modular_splurt/code/modules/language/language_holder.dm b/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))
diff --git a/modular_splurt/code/modules/mob/living/emotes.dm b/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
diff --git a/modular_splurt/code/modules/vending/snack.dm b/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)
 	. = ..()
diff --git a/modular_splurt/code/modules/vending/wardrobes.dm b/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)
+	. = ..()
diff --git a/modular_splurt/icons/misc/language.dmi b/modular_splurt/icons/misc/language.dmi
diff --git a/modular_splurt/icons/mob/clothing/mask.dmi b/modular_splurt/icons/mob/clothing/mask.dmi
diff --git a/modular_splurt/icons/mob/clothing/mask_muzzle.dmi b/modular_splurt/icons/mob/clothing/mask_muzzle.dmi
diff --git a/modular_splurt/icons/mobs/clothing/centcom.dmi b/modular_splurt/icons/mobs/clothing/centcom.dmi
diff --git a/modular_splurt/icons/obj/clothing/masks.dmi b/modular_splurt/icons/obj/clothing/masks.dmi
diff --git a/modular_splurt/icons/obj/food/food.dmi b/modular_splurt/icons/obj/food/food.dmi
diff --git a/modular_splurt/icons/obj/janitor.dmi b/modular_splurt/icons/obj/janitor.dmi
diff --git a/modular_splurt/sound/voice/malaysia.ogg b/modular_splurt/sound/voice/malaysia.ogg
diff --git a/tgstation.dme b/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"