From 08afddcf5e02b11d00684b03f3f39b0cd91b039c Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Mon, 13 Mar 2023 23:10:32 +0000 Subject: [PATCH 1/3] organ boxes --- code/game/objects/random/mapping.dm | 28 ++++++++++++++----- code/game/objects/random/misc_vr.dm | 19 +++++++++++++ .../_closets_appearance_definitions.dm | 13 +++++++++ .../structures/crates_lockers/crates.dm | 8 ++++++ 4 files changed, 61 insertions(+), 7 deletions(-) diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index 63faacd0f3a..b8ff810fe24 100644 --- a/code/game/objects/random/mapping.dm +++ b/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, diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index 3f2644348d3..c086837f25b 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/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/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, + ) diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index 262190ee203..b967465ac92 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/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 diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 288652c31f5..56f5a3f38dc 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -308,6 +308,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 From bf0ffdfc45d28283f688afc34baece0d3b72cea2 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:00:42 +0000 Subject: [PATCH 2/3] Update talon_v2.dm --- maps/offmap_vr/talon/talon_v2.dm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index d4eee52aa26..94af2560590 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -903,7 +903,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, @@ -912,7 +912,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, @@ -929,7 +936,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, @@ -938,7 +945,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, From 2e617f094ef41613deeb7657bc2ce43e4152c5b1 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu, 16 Mar 2023 15:09:58 +0000 Subject: [PATCH 3/3] Update misc_vr.dm --- code/game/objects/random/misc_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index c086837f25b..c6c2ec106bf 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -224,7 +224,7 @@ icon_state = "heart" spawn_nothing_percentage = 10 -/obj/random/organ/item_to_spawn() +/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,