diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 61d3a1a0f02..09a5a40769b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -26,6 +26,7 @@ new /obj/item/tank/anesthetic(src) new /obj/item/tank/anesthetic(src) new /obj/item/tank/anesthetic(src) + new /obj/item/tank/oxygen(src) new /obj/item/clothing/mask/breath/medical(src) new /obj/item/clothing/mask/breath/medical(src) new /obj/item/clothing/mask/breath/medical(src) @@ -203,4 +204,4 @@ new /obj/item/toy/plushie/therapy(src) new /obj/item/toy/plushie/slime(src) new /obj/item/toy/plushie/bee(src) - new /obj/item/device/flashlight/pen(src) \ No newline at end of file + new /obj/item/device/flashlight/pen(src) diff --git a/html/changelogs/maybelle.yml b/html/changelogs/maybelle.yml new file mode 100644 index 00000000000..3785ca7466e --- /dev/null +++ b/html/changelogs/maybelle.yml @@ -0,0 +1,41 @@ +################################ +# 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: OolongCow + +# 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: + - tweak: "Anesthetic closets now spawn with an oxygen tank on their list of contained objects instead of messily having them placed inside by mapping" diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 0e96b503863..893a68e7b3b 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -23201,7 +23201,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/tank/oxygen, /obj/machinery/camera/network/medbay{ c_tag = "Medical - Operating Room 2"; dir = 8 @@ -28766,7 +28765,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/tank/oxygen, /turf/simulated/floor/tiled/white, /area/medical/ors) "nWZ" = (