From 3762f16c031c9bfb2a7280cf9a979774a2a104d5 Mon Sep 17 00:00:00 2001 From: OolongCow <61329630+OolongCow@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:40:48 -0600 Subject: [PATCH] walllockers yeah --- .../crates_lockers/closets/walllocker.dm | 3 + html/changelogs/example copy.yml | 59 ++++++ maps/sccv_horizon/sccv_horizon.dmm | 176 +++++++----------- 3 files changed, 131 insertions(+), 107 deletions(-) create mode 100644 html/changelogs/example copy.yml diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index b6eb16d7d35..0cb3145b016 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -87,6 +87,9 @@ desc = "It's wall-mounted storage unit for first aid supplies." icon_state = "medical_wall" +/obj/structure/closet/walllocker/medical/fill() + new /obj/item/storage/firstaid/regular + /obj/structure/closet/walllocker/medical/secure desc = "It's a secure wall-mounted storage unit for first aid supplies." icon_door = "medical_wall_secure" diff --git a/html/changelogs/example copy.yml b/html/changelogs/example copy.yml new file mode 100644 index 00000000000..bc7783136c7 --- /dev/null +++ b/html/changelogs/example copy.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "First aid wall lockers now consistently contain a basic first aid kit." + - rscadd: "Several out-of-the-way or dangerous locations have received basic (white) first aid kits." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index b6c72b14ad7..c23c0d1d580 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -3253,8 +3253,16 @@ icon_state = "0-2" }, /obj/machinery/power/apc/north, +/obj/item/towel/random{ + pixel_x = 2; + pixel_y = 8 + }, +/obj/item/towel/random{ + pixel_x = 2; + pixel_y = 12 + }, /obj/item/clothing/gloves/fingerless{ - pixel_x = 2 + pixel_y = -6 }, /turf/simulated/floor/tiled, /area/horizon/crew_quarters/fitness/gym) @@ -13867,12 +13875,6 @@ "bUA" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, /obj/effect/floor_decal/industrial/outline/medical, -/obj/item/storage/firstaid/large, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/dylovene, -/obj/item/reagent_containers/hypospray/autoinjector/dylovene, -/obj/item/storage/firstaid/o2, /obj/structure/closet/walllocker/medical{ pixel_y = 30 }, @@ -15602,7 +15604,6 @@ pixel_y = 32 }, /obj/effect/floor_decal/industrial/outline/medical, -/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/engineering/lobby) "chw" = ( @@ -16106,7 +16107,6 @@ /turf/simulated/floor/reinforced/airless, /area/engineering/engine_room/rust) "clE" = ( -/obj/structure/table/rack, /obj/effect/floor_decal/corner/dark_blue/full{ dir = 1 }, @@ -16114,7 +16114,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/storage/firstaid/regular, +/obj/structure/closet/walllocker/medical{ + pixel_y = 30 + }, /turf/simulated/floor/tiled/dark, /area/horizon/longbow) "clF" = ( @@ -26062,6 +26064,9 @@ pixel_y = -2; pixel_x = 7 }, +/obj/structure/closet/walllocker/medical{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/kitchen) "dJu" = ( @@ -29301,6 +29306,9 @@ /obj/structure/disposalpipe/trunk{ dir = 1 }, +/obj/structure/closet/walllocker/medical{ + pixel_y = -32 + }, /turf/simulated/floor/carpet/rubber, /area/engineering/engine_monitoring/rust) "eiB" = ( @@ -29750,12 +29758,6 @@ /obj/structure/closet/walllocker/medical{ pixel_x = -32 }, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /obj/effect/floor_decal/industrial/outline/medical, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/port) @@ -34260,13 +34262,8 @@ name = "adjusted light fixture" }, /obj/structure/table/steel, -/obj/item/towel/random{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/towel/random{ - pixel_x = 2; - pixel_y = 7 +/obj/structure/closet/walllocker/medical{ + pixel_y = 30 }, /turf/simulated/floor/carpet/rubber, /area/horizon/crew_quarters/fitness/gym) @@ -37959,6 +37956,10 @@ dir = 6 }, /obj/machinery/firealarm/east, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/radio/off, +/obj/item/device/radio/off, /turf/simulated/floor/tiled/dark, /area/storage/eva) "fwJ" = ( @@ -41834,8 +41835,7 @@ dir = 10 }, /obj/structure/closet/walllocker/medical{ - pixel_y = -32; - name = "Blood Locker" + pixel_y = -32 }, /obj/item/reagent_containers/blood/OMinus, /obj/item/reagent_containers/blood/OMinus, @@ -49825,6 +49825,18 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/plating, /area/maintenance/research_port) +"hiK" = ( +/obj/effect/floor_decal/corner/dark_blue{ + dir = 5 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/walllocker/medical{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/dark, +/area/horizon/grauwolf) "hiM" = ( /obj/effect/floor_decal/corner/lime{ dir = 10 @@ -52744,12 +52756,6 @@ /turf/simulated/floor/tiled/white, /area/medical/ward) "hFx" = ( -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /obj/structure/closet/walllocker/medical{ pixel_x = -32 }, @@ -74865,6 +74871,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, +/obj/structure/closet/walllocker/medical{ + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/operations/storage) "kOM" = ( @@ -78115,12 +78124,6 @@ pixel_x = 32 }, /obj/effect/floor_decal/industrial/outline/medical, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "lpu" = ( @@ -79020,7 +79023,6 @@ /obj/structure/table/standard, /obj/item/storage/firstaid/fire, /obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/crew_compartment) "lvM" = ( @@ -79902,12 +79904,6 @@ /obj/structure/closet/walllocker/medical{ pixel_y = -32 }, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, /obj/effect/floor_decal/industrial/outline/medical, /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -92665,7 +92661,6 @@ dir = 8 }, /obj/structure/table/reinforced/steel, -/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled/dark, /area/rnd/xenoarch_atrium) "nxf" = ( @@ -100626,13 +100621,7 @@ /obj/structure/closet/walllocker/medical{ pixel_y = 32 }, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /obj/effect/floor_decal/industrial/outline/medical, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, /turf/simulated/floor/tiled, /area/horizon/security/hallway) "oHD" = ( @@ -100868,12 +100857,6 @@ pixel_y = 32 }, /obj/effect/floor_decal/industrial/outline/medical, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, /turf/simulated/floor/tiled, /area/storage/primary) "oJu" = ( @@ -107523,12 +107506,6 @@ /turf/simulated/floor/shuttle/black, /area/shuttle/distress) "pGN" = ( -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/splint, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/reagent_containers/hypospray/autoinjector/survival, /obj/structure/closet/walllocker/medical{ pixel_x = -28 }, @@ -111248,10 +111225,6 @@ /area/horizon/stairwell/central) "qjB" = ( /obj/structure/table/steel, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, /obj/effect/floor_decal/corner/dark_blue{ dir = 6 }, @@ -111259,6 +111232,9 @@ c_tag = "First Deck - EVA Storage 1"; dir = 8 }, +/obj/structure/closet/walllocker/medical{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/dark, /area/storage/eva) "qjE" = ( @@ -122978,11 +122954,22 @@ dir = 1 }, /obj/structure/closet/walllocker/medical{ - name = "Blood Locker"; pixel_y = 32 }, /turf/simulated/floor/tiled/white, /area/shuttle/intrepid/crew_compartment) +"rUb" = ( +/obj/effect/floor_decal/corner_wide/purple{ + dir = 5 + }, +/obj/effect/floor_decal/corner_wide/purple{ + dir = 8 + }, +/obj/structure/closet/walllocker/medical{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/xenoarch_atrium) "rUd" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 @@ -128988,11 +128975,6 @@ /turf/space/dynamic, /area/horizon/exterior) "sPq" = ( -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/splint, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, /obj/structure/closet/walllocker/medical{ pixel_x = -28 }, @@ -130357,6 +130339,9 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/alarm/east, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, +/obj/item/melee/baton/loaded, /turf/simulated/floor/tiled, /area/bridge/supply) "tag" = ( @@ -131871,15 +131856,9 @@ /obj/structure/closet/walllocker/medical{ pixel_y = 32 }, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /turf/simulated/floor/tiled, /area/security/checkpoint2) "tnV" = ( @@ -143429,7 +143408,9 @@ dir = 6 }, /obj/structure/table/standard, -/obj/item/storage/firstaid/regular, +/obj/structure/closet/walllocker/medical{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/dark, /area/teleporter) "uVY" = ( @@ -145817,13 +145798,8 @@ /obj/effect/floor_decal/corner/dark_blue/full{ dir = 1 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 34 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 24 +/obj/structure/closet/walllocker/medical{ + pixel_y = 30 }, /turf/simulated/floor/tiled/dark, /area/horizon/security/firing_range) @@ -151808,8 +151784,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/firealarm/north, /obj/structure/platform, +/obj/machinery/firealarm/north, /turf/simulated/floor/tiled, /area/hallway/engineering) "wiv" = ( @@ -151927,10 +151903,6 @@ /turf/simulated/floor, /area/maintenance/security_port) "wjk" = ( -/obj/item/storage/firstaid/o2{ - pixel_y = 4 - }, -/obj/item/storage/firstaid/regular, /obj/structure/closet/walllocker/medical{ pixel_x = -32 }, @@ -152897,12 +152869,6 @@ /turf/simulated/floor/tiled, /area/hangar/intrepid/interstitial) "wqe" = ( -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, /obj/structure/closet/walllocker/medical{ pixel_x = -32 }, @@ -155750,12 +155716,6 @@ /turf/simulated/floor/tiled/full, /area/horizon/hallway/deck_two/fore) "wJz" = ( -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/ointment, -/obj/item/stack/medical/bruise_pack, -/obj/item/stack/medical/bruise_pack, /obj/effect/floor_decal/industrial/outline/medical, /obj/structure/closet/walllocker/medical{ pixel_y = 32 @@ -164140,7 +164100,6 @@ /obj/structure/closet/walllocker/medical{ pixel_y = -32 }, -/obj/item/storage/firstaid/regular, /turf/simulated/floor/tiled, /area/operations/office) "xQW" = ( @@ -166914,6 +166873,9 @@ /obj/effect/floor_decal/corner/grey/full{ dir = 4 }, +/obj/structure/closet/walllocker/medical{ + pixel_y = -32 + }, /turf/simulated/floor/lino, /area/horizon/bar) "ylb" = ( @@ -210643,7 +210605,7 @@ oJe oJe oJe oJe -qWB +rUb lbr xtK iXt @@ -249988,7 +249950,7 @@ wyA wyA wyA wyA -imm +hiK uEF xSA mMq