diff --git a/html/changelogs/furrycactus - medical supplies.yml b/html/changelogs/furrycactus - medical supplies.yml new file mode 100644 index 00000000000..47f6ccbb2d9 --- /dev/null +++ b/html/changelogs/furrycactus - medical supplies.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: "Re-added specialised medical kits to the medical storage room. Toxin, Burn, and an extra Oxygen Deprivation one specifically." + - maptweak: "Re-added more bloodpacks to medical. Two more O- ones in the ICU and Surgery, and a fridge of assorted bags in storage. Match blood types to patients or calculate compatible blood types, go nuts." diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index a2db0f78abc..bb8e342a90c 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -30895,6 +30895,8 @@ icon_state = "2-4" }, /obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/white, /area/medical/icu) "bcb" = ( @@ -32577,12 +32579,6 @@ pixel_x = -32; pixel_y = 0 }, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/reagent_containers/glass/bottle/inaprovaline, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/storage/pill_bottle/tramadol, /obj/effect/floor_decal/corner/pink{ icon_state = "corner_white"; dir = 9 @@ -32597,6 +32593,14 @@ icon_state = "tube1"; dir = 8 }, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag, +/obj/item/reagent_containers/glass/bottle/inaprovaline, +/obj/item/stack/medical/bruise_pack, +/obj/item/stack/medical/bruise_pack, +/obj/item/storage/pill_bottle/tramadol, /turf/simulated/floor/tiled/white, /area/medical/icu) "bfb" = ( @@ -38666,11 +38670,11 @@ dir = 8 }, /obj/machinery/firealarm/north, -/obj/item/storage/firstaid/adv{ +/obj/item/storage/firstaid/o2{ pixel_x = 5; pixel_y = 5 }, -/obj/item/storage/firstaid/adv, +/obj/item/storage/firstaid/o2, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "boI" = ( @@ -38690,8 +38694,14 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/storage/box/syringes, -/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 0; + pixel_y = 0 + }, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "boJ" = ( @@ -38708,16 +38718,11 @@ pixel_x = 0; pixel_y = 32 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)"; +/obj/item/storage/firstaid/fire{ pixel_x = 5; pixel_y = 5 }, -/obj/item/storage/firstaid/regular{ - empty = 1; - name = "First-Aid (empty)" - }, +/obj/item/storage/firstaid/fire, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "boK" = ( @@ -38734,7 +38739,11 @@ dir = 8; icon_state = "camera" }, -/obj/item/storage/box/sharps, +/obj/item/storage/firstaid/adv{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/storage/firstaid/adv, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "boL" = ( @@ -39571,6 +39580,7 @@ pixel_x = 32; pixel_y = 0 }, +/obj/item/storage/box/sharps, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "bqb" = ( @@ -40253,6 +40263,7 @@ req_one_access = list(24,11,55) }, /obj/item/bodybag/cryobag, +/obj/item/storage/box/syringes, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "bri" = ( @@ -41799,7 +41810,6 @@ dir = 4 }, /obj/effect/floor_decal/corner/grey, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btv" = ( @@ -41821,7 +41831,6 @@ icon_state = "corner_white"; dir = 10 }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "btw" = ( @@ -45847,7 +45856,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/white, /area/medical/custodial_closet) "bAt" = ( @@ -46711,6 +46719,8 @@ }, /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /turf/simulated/floor/tiled/freezer{ name = "cold storage tiles"; temperature = 278 @@ -65046,6 +65056,19 @@ /turf/simulated/floor/plating, /area/maintenance/substation/supply) "ifx" = ( +/obj/structure/closet/crate/freezer{ + name = "Assorted Blood Packs" + }, +/obj/item/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/BMinus, +/obj/item/reagent_containers/blood/BMinus, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/AMinus, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "ikb" = (