From 2e9c2857ff5fe39ae289e13e686e1f815e3232ed Mon Sep 17 00:00:00 2001 From: Joshie <41561534+furrycactus@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:15:37 +1000 Subject: [PATCH] Swaps out Medbay Dermaline pills for Kelotane pills, adds basic Dexalin pill bottles. (#18851) - "Replaces the Dermaline pill bottles in Medbay's Medication Closets with Kelotane pill bottles. This brings it into line with the existing Bicaridine pill bottles." - "Adds two pill bottles of basic Dexalin to the Medbay Stabilization Kits." Medbay has had Dermaline and Bicaridine pills in the Medication Closets since back on the Aurora, before the addition of Butazoline. With Butazoline existing now, it seems reasonable to downgrade the roundstart Dermaline pills to Kelotane. Additionally, regular Dexalin somehow feels more scarce than Dexalin Plus, so I've added a pill bottle preset for regular Dexalin and put them in the Stabilization Kits. --- .../items/weapons/storage/pill_bottle.dm | 5 +++ .../furrycactus - medbay dermaline swap.yml | 42 +++++++++++++++++++ maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 18 ++++---- 3 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/furrycactus - medbay dermaline swap.yml diff --git a/code/game/objects/items/weapons/storage/pill_bottle.dm b/code/game/objects/items/weapons/storage/pill_bottle.dm index 328ad0604b9..fb1ce121d53 100644 --- a/code/game/objects/items/weapons/storage/pill_bottle.dm +++ b/code/game/objects/items/weapons/storage/pill_bottle.dm @@ -45,6 +45,11 @@ desc = "Contains pills used to treat minor injuries and bleeding." starts_with = list(/obj/item/reagent_containers/pill/bicaridine = 7) +/obj/item/storage/pill_bottle/dexalin + name = "bottle of 15u Dexalin pills" + desc = "Contains pills used to treat minor cases of oxygen deprivation." + starts_with = list(/obj/item/reagent_containers/pill/dexalin = 7) + /obj/item/storage/pill_bottle/dexalin_plus name = "bottle of 15u Dexalin Plus pills" desc = "Contains pills used to treat extreme cases of oxygen deprivation." diff --git a/html/changelogs/furrycactus - medbay dermaline swap.yml b/html/changelogs/furrycactus - medbay dermaline swap.yml new file mode 100644 index 00000000000..3b54819e8bb --- /dev/null +++ b/html/changelogs/furrycactus - medbay dermaline swap.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Furrycactus + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - maptweak: "Replaces the Dermaline pill bottles in Medbay with Kelotane pill bottles. This brings it into line with the existing Bicaridine pill bottles." + - maptweak: "Adds two pill bottles of basic Dexalin to the Medbay Stabilization Kits." diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index b72e33df725..c139c14fd0a 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -1603,6 +1603,7 @@ /obj/item/stack/medical/bruise_pack, /obj/item/storage/pill_bottle/mortaphenyl, /obj/effect/floor_decal/corner/white/diagonal, +/obj/item/storage/pill_bottle/dexalin, /turf/simulated/floor/tiled, /area/medical/first_responder) "aIH" = ( @@ -10963,21 +10964,21 @@ pixel_x = 31 }, /obj/item/reagent_containers/glass/bottle/antitoxin, -/obj/item/storage/pill_bottle/dermaline, /obj/item/storage/pill_bottle/mortaphenyl, /obj/item/storage/pill_bottle/dylovene, /obj/item/storage/pill_bottle/dylovene, /obj/item/storage/pill_bottle/bicaridine, -/obj/item/reagent_containers/syringe/antibiotic, -/obj/item/reagent_containers/syringe/antibiotic, /obj/effect/floor_decal/corner/white/diagonal, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, -/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/item/storage/pill_bottle/kelotane, +/obj/item/reagent_containers/syringe/antibiotic, +/obj/item/reagent_containers/syringe/antibiotic, +/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, +/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, +/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, +/obj/item/reagent_containers/hypospray/autoinjector/coagzolug, /turf/simulated/floor/tiled, /area/medical/first_responder) "fdF" = ( @@ -20407,8 +20408,8 @@ /obj/item/storage/pill_bottle/mortaphenyl, /obj/item/storage/pill_bottle/dylovene, /obj/item/storage/pill_bottle/dylovene, -/obj/item/storage/pill_bottle/dermaline, /obj/item/storage/pill_bottle/bicaridine, +/obj/item/storage/pill_bottle/kelotane, /obj/item/reagent_containers/syringe/antiparasitic, /obj/item/reagent_containers/syringe/antiparasitic, /obj/item/reagent_containers/glass/bottle/antitoxin, @@ -28479,6 +28480,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, +/obj/item/storage/pill_bottle/dexalin, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) "nbh" = (