Merge pull request #5963 from CHOMPStation2/upstream-merge-14678

[MIRROR] Frozen Organ Crates

code/game/objects/random/mapping.dm

@@ -837,7 +837,14 @@
 				/obj/random/firstaid,
 				/obj/random/unidentified_medicine/fresh_medicine,
 				/obj/random/unidentified_medicine/fresh_medicine,
-				/obj/structure/closet/crate/veymed //VM FAKS
+				/obj/structure/closet/crate/freezer/veymed //VM FAKS
+			),
+			prob(5);list(
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/structure/closet/crate/freezer/veymed //VM ORGANSES
 			),
 			prob(10);list(
 				/obj/random/tech_supply/nofail,
@@ -854,7 +861,7 @@
 				/obj/random/medical/pillbottle,
 				/obj/random/medical/lite,
 				/obj/random/medical/lite,
-				/obj/structure/closet/crate/zenghu //ZENGHU GRABBAG
+				/obj/structure/closet/crate/freezer/zenghu //ZENGHU GRABBAG
 			),
 			prob(10);list(
 				/obj/random/medical/pillbottle,
@@ -863,7 +870,7 @@
 				/obj/random/medical/pillbottle,
 				/obj/random/unidentified_medicine/fresh_medicine,
 				/obj/random/unidentified_medicine/fresh_medicine,
-				/obj/structure/closet/crate/zenghu //ZENGHU PILLS
+				/obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS
 			),
 			prob(10);list(
 				/obj/item/device/toner,
@@ -1099,7 +1106,7 @@
 				/obj/random/medical,
 				/obj/random/medical/lite,
 				/obj/random/medical/lite,
-				/obj/structure/closet/crate/veymed //VM GRABBAG
+				/obj/structure/closet/crate/freezer/veymed //VM GRABBAG
 			),
 			prob(10);list(
 				/obj/random/firstaid,
@@ -1108,7 +1115,14 @@
 				/obj/random/firstaid,
 				/obj/random/unidentified_medicine/fresh_medicine,
 				/obj/random/unidentified_medicine/fresh_medicine,
-				/obj/structure/closet/crate/veymed //VM FAKS
+				/obj/structure/closet/crate/freezer/veymed //VM FAKS
+			),
+			prob(5);list(
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/structure/closet/crate/freezer/veymed //VM ORGANSES
 			),
 			prob(10);list(
 				/obj/random/tech_supply/nofail,
@@ -1125,7 +1139,7 @@
 				/obj/random/medical/pillbottle,
 				/obj/random/medical/lite,
 				/obj/random/medical/lite,
-				/obj/structure/closet/crate/zenghu //ZENGHU GRABBAG
+				/obj/structure/closet/crate/freezer/zenghu //ZENGHU GRABBAG
 			),
 			prob(10);list(
 				/obj/random/medical/pillbottle,
@@ -1134,7 +1148,7 @@
 				/obj/random/medical/pillbottle,
 				/obj/random/unidentified_medicine/fresh_medicine,
 				/obj/random/unidentified_medicine/fresh_medicine,
-				/obj/structure/closet/crate/zenghu //ZENGHU PILLS
+				/obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS
 			),
 			prob(10);list(
 				/obj/item/device/toner,

code/game/objects/random/misc_vr.dm

@@ -216,3 +216,22 @@
 				prob(5);/obj/item/instrument/glockenspiel,
 				prob(1);/obj/item/instrument/musicalmoth
 				)
+
+/obj/random/internal_organ
+	name = "random organ"
+	desc = "A random internal organ. Juicy fresh! Or... maybe not."
+	icon = 'icons/obj/surgery.dmi'
+	icon_state = "heart"
+	spawn_nothing_percentage = 10
+
+/obj/random/internal_organ/item_to_spawn()
+	return pick(prob(5);/obj/item/organ/internal/appendix,
+				prob(5);/obj/item/organ/internal/eyes,
+				prob(5);/obj/item/organ/internal/heart,
+				prob(5);/obj/item/organ/internal/kidneys,
+				prob(5);/obj/item/organ/internal/liver,
+				prob(5);/obj/item/organ/internal/spleen,
+				prob(5);/obj/item/organ/internal/lungs,
+				prob(5);/obj/item/organ/internal/stomach,
+				prob(5);/obj/item/organ/internal/voicebox,
+				)

code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm

@@ -809,6 +809,19 @@
 		"nano" = COLOR_OFF_WHITE
 	)
 
+/decl/closet_appearance/crate/freezer/veymed
+	color = COLOR_BABY_BLUE
+	extra_decals = list(
+		"lid_stripes" = COLOR_RED,
+		"crate_cross" = COLOR_GREEN
+	)
+
+/decl/closet_appearance/crate/freezer/zenghu
+	color = COLOR_BABY_BLUE
+	extra_decals = list(
+		"zenghu" = COLOR_OFF_WHITE
+	)
+
 // Corporate Branding
 
 /decl/closet_appearance/crate/aether

code/game/objects/structures/crates_lockers/crates.dm

@@ -314,6 +314,14 @@
 	desc = "A freezer stamped with the logo of NanoTrasen."
 	closet_appearance = /decl/closet_appearance/crate/freezer/nanotrasen
 
+/obj/structure/closet/crate/freezer/veymed
+	desc = "A freezer stamped with the logo of Vey-Medical."
+	closet_appearance = /decl/closet_appearance/crate/freezer/veymed
+
+/obj/structure/closet/crate/freezer/zenghu
+	desc = "A freezer stamped with the logo of Zeng-Hu Pharmaceuticals."
+	closet_appearance = /decl/closet_appearance/crate/freezer/zenghu
+
 /obj/structure/closet/crate/freezer/return_air()
 	var/datum/gas_mixture/gas = (..())
 	if(!gas)	return null

maps/offmap_vr/talon/talon_v2.dm

@@ -910,7 +910,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 				/obj/random/medical,
 				/obj/random/medical/lite,
 				/obj/random/medical/lite,
-				/obj/structure/closet/crate/veymed //VM GRABBAG
+				/obj/structure/closet/crate/freezer/veymed //VM GRABBAG
 			),
 			prob(10);list(
 				/obj/random/firstaid,
@@ -919,7 +919,14 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 				/obj/random/firstaid,
 				/obj/random/unidentified_medicine/fresh_medicine,
 				/obj/random/unidentified_medicine/fresh_medicine,
-				/obj/structure/closet/crate/veymed //VM FAKS
+				/obj/structure/closet/crate/freezer/veymed //VM FAKS
+			),
+			prob(5);list(
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/random/internal_organ,
+				/obj/structure/closet/crate/freezer/veymed //VM ORGANSES
 			),
 			prob(10);list(
 				/obj/random/tech_supply/nofail,
@@ -936,7 +943,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 				/obj/random/medical/pillbottle,
 				/obj/random/medical/lite,
 				/obj/random/medical/lite,
-				/obj/structure/closet/crate/zenghu //ZENGHU GRABBAG
+				/obj/structure/closet/crate/freezer/zenghu //ZENGHU GRABBAG
 			),
 			prob(10);list(
 				/obj/random/medical/pillbottle,
@@ -945,7 +952,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
 				/obj/random/medical/pillbottle,
 				/obj/random/unidentified_medicine/fresh_medicine,
 				/obj/random/unidentified_medicine/fresh_medicine,
-				/obj/structure/closet/crate/zenghu //ZENGHU PILLS
+				/obj/structure/closet/crate/freezer/zenghu //ZENGHU PILLS
 			),
 			prob(10);list(
 				/obj/item/device/toner,