Merge branch 'master' into tg-effects-part2-poc

cmss13-devs · Dec 1, 2023 · 8086ac4 · 8086ac4
2 parents c456cca + da9f6e7
commit 8086ac4
Show file tree

Hide file tree

Showing 34 changed files with 4,830 additions and 4,062 deletions.
diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
@@ -30,6 +30,11 @@
 		text = replacetext(text, char, repl_chars[char])
 	return text
 
+///Helper for only alphanumeric characters plus common punctuation, spaces, underscore and hyphen _ -.
+/proc/replace_non_alphanumeric_plus(text)
+	var/regex/alphanumeric = regex(@{"[^a-z0-9 ,.?!\-_&]"}, "gi")
+	return alphanumeric.Replace(text, "")
+
 /proc/readd_quotes(text)
 	var/list/repl_chars = list("&#34;" = "\"", "&#39;" = "'")
 	for(var/char in repl_chars)

diff --git a/code/datums/ASRS.dm b/code/datums/ASRS.dm
@@ -132,3 +132,8 @@
 	buyable = 0
 	group = "ASRS"
 	cost = ASRS_VERY_LOW_WEIGHT
+
+/datum/supply_packs/ingredient/asrs
+	buyable = 0
+	group = "ASRS"
+	cost = ASRS_LOW_WEIGHT
diff --git a/code/datums/supply_packs/food.dm b/code/datums/supply_packs/food.dm
@@ -1,144 +1,47 @@
 //Food.Regrouping all the ASRS crate related to food here.
-
-//All the ingredients that you can grown.
-
-/datum/supply_packs/potato
-	name = "Potatoes(x20)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Potato crate"
-	group = "Food"
-
-/datum/supply_packs/tomato
-	name = "tomato (x20)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Tomato crate"
-	group = "Food"
-
-/datum/supply_packs/wheat
-	name = "wheat (x20)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-		/obj/item/reagent_container/food/snacks/grown/wheat,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Wheat crate"
-	group = "Food"
-
-//All the meats
-
-/datum/supply_packs/meat
-	name = "meat(x5)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-		/obj/item/reagent_container/food/snacks/meat,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper meat crate"
-	group = "Food"
-
-/datum/supply_packs/carp_fillet
-	name = "carp fillet (x5)"
-	contains = list(
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-		/obj/item/reagent_container/food/snacks/carpmeat,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper carp filet crate"
-	group = "Food"
-
-//all the condiment type items
-
-/datum/supply_packs/condiment
-	name = "crate of condiments"
+// crate of random ingredient that you can buy in vendor in kitchen
+/datum/supply_packs/ingredient
+	name = "surplus boxes of ingredients(x6 boxes)"
+	randomised_num_contained = 6
 	contains = list(
-		/obj/item/reagent_container/food/condiment/enzyme,
-		/obj/item/reagent_container/food/condiment/sugar,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/peppermill,
+		/obj/item/storage/fancy/egg_box,
+		/obj/item/storage/box/fish,
+		/obj/item/storage/box/meat,
+		/obj/item/storage/box/milk,
+		/obj/item/storage/box/soymilk,
+		/obj/item/storage/box/enzyme,
+		/obj/item/storage/box/flour,
+		/obj/item/storage/box/sugar,
+		/obj/item/storage/box/apple,
+		/obj/item/storage/box/banana,
+		/obj/item/storage/box/chanterelle,
+		/obj/item/storage/box/cherries,
+		/obj/item/storage/box/chili,
+		/obj/item/storage/box/cabbage,
+		/obj/item/storage/box/carrot,
+		/obj/item/storage/box/corn,
+		/obj/item/storage/box/eggplant,
+		/obj/item/storage/box/lemon,
+		/obj/item/storage/box/lime,
+		/obj/item/storage/box/orange,
+		/obj/item/storage/box/potato,
+		/obj/item/storage/box/tomato,
+		/obj/item/storage/box/whitebeet,
 		/obj/item/reagent_container/food/condiment/hotsauce/cholula,
 		/obj/item/reagent_container/food/condiment/hotsauce/franks,
 		/obj/item/reagent_container/food/condiment/hotsauce/sriracha,
 		/obj/item/reagent_container/food/condiment/hotsauce/tabasco,
+		/obj/item/reagent_container/food/drinks/bottle/whiskey,
+		/obj/item/reagent_container/food/drinks/bottle/tequila,
+		/obj/item/reagent_container/food/drinks/bottle/rum,
+		/obj/item/reagent_container/food/drinks/bottle/wine,
 	)
 	cost = 10
 	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper crate of condiment"
+	containername = "\improper surplus of ingredients crate"
 	group = "Food"
 
-	//all the finish snacks.
+//all the finish snacks.
 
 /datum/supply_packs/donuts
 	name = "box of donuts (x5)"
@@ -165,47 +68,6 @@
 	containername = "\improper USCM MRE crate(x2)"
 	group = "Food"
 
-/datum/supply_packs/funfood
-	name = "special ingredients crate (x6)"
-	randomised_num_contained = 6
-	contains = list(
-		/obj/item/reagent_container/food/condiment/enzyme,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/saltshaker,
-		/obj/item/reagent_container/food/condiment/peppermill,
-		/obj/item/reagent_container/food/condiment/peppermill,
-		/obj/item/reagent_container/food/condiment/peppermill,
-		/obj/item/reagent_container/food/condiment/sugar,
-		/obj/item/reagent_container/food/condiment/sugar,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/grown/potato,
-		/obj/item/reagent_container/food/snacks/mint,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/tomato,
-		/obj/item/reagent_container/food/snacks/grown/carrot,
-		/obj/item/reagent_container/food/snacks/grown/carrot,
-		/obj/item/reagent_container/food/snacks/grown/lemon,
-		/obj/item/reagent_container/food/snacks/grown/lemon,
-		/obj/item/reagent_container/food/snacks/grown/orange,
-		/obj/item/reagent_container/food/snacks/grown/orange,
-		/obj/item/reagent_container/food/snacks/grown/lime,
-		/obj/item/reagent_container/food/snacks/grown/lime,
-		/obj/item/reagent_container/food/drinks/bottle/whiskey,
-		/obj/item/reagent_container/food/drinks/bottle/tequila,
-		/obj/item/reagent_container/food/drinks/bottle/rum,
-		/obj/item/reagent_container/food/drinks/bottle/wine,
-		/obj/item/reagent_container/food/drinks/bottle/wine,
-		/obj/item/reagent_container/food/drinks/bottle/wine,
-	)
-	cost = 10
-	containertype = /obj/structure/closet/crate/freezer
-	containername = "\improper Special ingredients crate"
-	group = "Food"
-
 /datum/supply_packs/pizzas
 	name = "pizza ready-to-eat (x3)"
 	contains = list(

diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm
@@ -67,6 +67,10 @@
 	name = "Kutjevo - Power Station River"
 	icon_state = "lz_river"
 
+/area/kutjevo/exterior/spring
+	name = "Kutjevo - Southern Spring"
+	icon_state = "lz_river"
+
 /area/kutjevo/exterior/scrubland
 	name = "Kutjevo - Scrubland"
 	icon_state = "scrubland"

diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
@@ -262,7 +262,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
 	if(istype(CO_surv_job))
 		CO_surv_job.set_spawn_positions(GLOB.players_preassigned)
 
-	if(SSnightmare.get_scenario_value("predator_round"))
+	if(SSnightmare.get_scenario_value("predator_round") && !Check_WO())
 		SSticker.mode.flags_round_type |= MODE_PREDATOR
 		// Set predators starting amount based on marines assigned
 		var/datum/job/PJ = temp_roles_for_mode[JOB_PREDATOR]

diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm
@@ -447,3 +447,69 @@
 		/obj/item/tool/pen/fountain = 30,
 	)
 	product_type = VENDOR_PRODUCT_TYPE_RECREATIONAL
+
+//vendor of ingredients for kitchen
+/obj/structure/machinery/vending/ingredients
+	name = "\improper Galley Auxiliary Storage Requisition System"
+	desc = "A vending machine meant to be use for cooks."
+	product_ads = "If your out of ingredients i am here for you;all my organic produce are fresh;don't let my potatoes go stale time for you to cook some fries"
+	icon_state = "snack"
+	hacking_safety = TRUE
+	products = list(
+		/obj/item/storage/fancy/egg_box = 12,
+		/obj/item/storage/box/fish = 12,
+		/obj/item/storage/box/meat = 12,
+		/obj/item/storage/box/milk = 12,
+		/obj/item/storage/box/soymilk = 12,
+		/obj/item/storage/box/enzyme = 12,
+		/obj/item/storage/box/flour = 12,
+		/obj/item/storage/box/sugar = 12,
+		/obj/item/storage/box/saltshaker = 12,
+		/obj/item/storage/box/peppermill = 12,
+		/obj/item/storage/box/mint = 12,
+		/obj/item/storage/box/apple = 12,
+		/obj/item/storage/box/banana = 12,
+		/obj/item/storage/box/chanterelle = 12,
+		/obj/item/storage/box/cherries = 12,
+		/obj/item/storage/box/chili = 12,
+		/obj/item/storage/box/cabbage = 12,
+		/obj/item/storage/box/carrot = 12,
+		/obj/item/storage/box/corn = 12,
+		/obj/item/storage/box/eggplant = 12,
+		/obj/item/storage/box/lemon = 12,
+		/obj/item/storage/box/lime = 12,
+		/obj/item/storage/box/orange = 12,
+		/obj/item/storage/box/potato = 12,
+		/obj/item/storage/box/tomato = 12,
+		/obj/item/storage/box/whitebeet = 12,
+	)
+
+	prices = list(
+		/obj/item/storage/fancy/egg_box = 1,
+		/obj/item/storage/box/fish = 1,
+		/obj/item/storage/box/meat = 1,
+		/obj/item/storage/box/milk =1,
+		/obj/item/storage/box/soymilk = 1,
+		/obj/item/storage/box/enzyme = 1,
+		/obj/item/storage/box/flour = 1,
+		/obj/item/storage/box/sugar = 1,
+		/obj/item/storage/box/saltshaker = 1,
+		/obj/item/storage/box/peppermill = 1,
+		/obj/item/storage/box/mint = 1,
+		/obj/item/storage/box/apple = 1,
+		/obj/item/storage/box/banana = 2,
+		/obj/item/storage/box/chanterelle = 2,
+		/obj/item/storage/box/cherries = 2,
+		/obj/item/storage/box/chili = 2,
+		/obj/item/storage/box/cabbage = 2,
+		/obj/item/storage/box/carrot = 2,
+		/obj/item/storage/box/corn = 2,
+		/obj/item/storage/box/eggplant = 2,
+		/obj/item/storage/box/lemon = 2,
+		/obj/item/storage/box/lime = 2,
+		/obj/item/storage/box/orange = 2,
+		/obj/item/storage/box/potato = 2,
+		/obj/item/storage/box/tomato = 2,
+		/obj/item/storage/box/whitebeet = 2,
+	)
+	product_type = VENDOR_PRODUCT_TYPE_FOOD
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm
@@ -71,8 +71,10 @@
 	listed_products = list(
 		list("STANDARD EQUIPMENT", -1, null, null, null),
 		list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR),
+		list("Marine Brown Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine/brown, VENDOR_ITEM_REGULAR),
 		list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR),
 		list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR),
+		list("Marine Brown Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/brown, VENDOR_ITEM_REGULAR),
 		list("Marine Black Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR),
 		list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR),
 		list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR),