diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index d15e85f692e..5924731d5cd 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -788,3 +788,5 @@ new /obj/item/storage/box/midynhr_water(src) new /obj/item/storage/box/fancy/yoke/grape_juice(src) new /obj/item/storage/box/fancy/yoke/beetle_milk(src) + new /obj/item/reagent_containers/toothpaste(src) + new /obj/item/reagent_containers/food/drinks/flask/vacuumflask/mouthwash(src) diff --git a/html/changelogs/hazelmouse-minorminorfix.yml b/html/changelogs/hazelmouse-minorminorfix.yml new file mode 100644 index 00000000000..3de5c70b120 --- /dev/null +++ b/html/changelogs/hazelmouse-minorminorfix.yml @@ -0,0 +1,61 @@ +################################ +# 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: hazelmouse + +# 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: + - bugfix: "Added missing firedoors to bar maintenance." + - bugfix: "Removed a stacked flag on the bar wall." + - rscadd: "Slightly reorganised the contents of the bar and bar maintenance." + - rscadd: "Added mouthwash and toothpaste to the exotic drinks crate." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index da8828e8d08..9dda63e6740 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -2317,6 +2317,7 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/horizon/service/bar) "anW" = ( @@ -4594,7 +4595,6 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/item/device/radio/intercom/west, /obj/structure/platform{ dir = 4 }, @@ -4602,6 +4602,9 @@ id = "bar"; pixel_x = -32 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "aFp" = ( @@ -5239,19 +5242,6 @@ }, /turf/simulated/floor/tiled/full, /area/horizon/security/brig) -"aJJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/railing/mapped{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/service/starboard) "aJL" = ( /obj/machinery/door/airlock/glass_command{ dir = 1; @@ -5783,6 +5773,12 @@ /obj/effect/floor_decal/spline/plain{ dir = 1 }, +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "aNz" = ( @@ -10228,7 +10224,7 @@ pixel_y = -9 }, /turf/simulated/floor/plating, -/area/horizon/service/bar) +/area/horizon/maintenance/deck_2/service/starboard) "btg" = ( /obj/item/storage/secure/safe{ pixel_y = -20 @@ -12946,13 +12942,6 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/engineering/atmos/propulsion/starboard) -"bPb" = ( -/obj/structure/grille/diagonal{ - dir = 8 - }, -/obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/tiled/dark, -/area/horizon/service/bar) "bPi" = ( /obj/effect/floor_decal/carpet{ dir = 4 @@ -14005,9 +13994,6 @@ /turf/simulated/floor/plating, /area/horizon/hallway/primary/deck_3/starboard/docks) "bWP" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 - }, /obj/structure/sink/kitchen{ dir = 8; name = "sink"; @@ -14019,7 +14005,7 @@ pixel_x = 10 }, /obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 + dir = 5 }, /turf/simulated/floor/wood, /area/horizon/service/bar) @@ -16517,7 +16503,10 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/turf/simulated/floor/carpet/green, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "cqO" = ( /obj/effect/floor_decal/corner/yellow/full{ @@ -21753,6 +21742,9 @@ /obj/structure/platform{ dir = 4 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "dbC" = ( @@ -23770,9 +23762,10 @@ /obj/machinery/light/floor{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/firefighting_closet, -/obj/structure/closet/firecloset/full, -/turf/simulated/floor/tiled/dark, +/obj/machinery/computer/ship/navigation/terminal{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "doU" = ( /obj/effect/decal/cleanable/dirt, @@ -26884,10 +26877,6 @@ /turf/unsimulated/floor, /area/antag/mercenary) "dIZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "dJd" = ( @@ -28566,7 +28555,7 @@ name = "Bar Viewing Shutters" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/plating, /area/horizon/service/bar) "dWy" = ( /obj/effect/floor_decal/corner/mauve{ @@ -29111,11 +29100,8 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/closet/emcloset/communal{ - name = "emergency closet" - }, -/obj/effect/floor_decal/industrial/outline/emergency_closet, -/turf/simulated/floor/tiled/dark, +/obj/machinery/computer/arcade, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "eat" = ( /obj/structure/table/stone/marble, @@ -30973,7 +30959,7 @@ name = "Bar Viewing Shutters" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/plating, /area/horizon/service/bar) "enu" = ( /obj/structure/tank_wall{ @@ -31353,12 +31339,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/horizon/holodeck/source_boxingcourt) "eqx" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/rod_railing/bar{ dir = 10 }, @@ -31366,7 +31347,7 @@ dir = 1 }, /obj/machinery/vending/zora, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "eqy" = ( /obj/structure/bed/stool/chair/office/dark{ @@ -33890,18 +33871,16 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/status_display{ - pixel_x = -32 - }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "eKS" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 }, -/obj/machinery/computer/arcade, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/structure/table/wood/gamblingtable, +/obj/item/material/ashtray, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "eKW" = ( /obj/effect/floor_decal/corner/white/diagonal, @@ -37047,16 +37026,12 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/aft) "fjc" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/stone/marble, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "bar_shutter"; - name = "Bar Shutter" +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 }, -/obj/item/material/ashtray/bronze, -/turf/simulated/floor/lino, -/area/horizon/service/bar) +/turf/simulated/floor/plating, +/area/horizon/maintenance/deck_2/service/starboard) "fjf" = ( /obj/structure/table/reinforced/steel, /obj/machinery/button/remote/blast_door{ @@ -37317,6 +37292,10 @@ /obj/structure/platform{ dir = 4 }, +/obj/item/device/radio/intercom/west, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "fkY" = ( @@ -39375,8 +39354,8 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 1 }, -/obj/effect/floor_decal/spline/fancy/wood/corner, -/turf/simulated/floor/carpet/green, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "fAw" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -46770,7 +46749,12 @@ dir = 8 }, /obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/wood, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "bar_viewing_shutters"; + name = "Bar Viewing Shutters" + }, +/turf/simulated/floor/plating, /area/horizon/service/bar) "gCQ" = ( /obj/structure/cable/green{ @@ -48867,7 +48851,7 @@ /obj/item/clothing/head/jester_hat, /obj/item/clothing/suit/jester_costume, /obj/machinery/light, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "gRQ" = ( /obj/structure/window/reinforced/crescent{ @@ -49194,15 +49178,9 @@ dir = 8 }, /obj/structure/closet/crate/drinks, -/obj/structure/engineer_maintenance/pipe{ - dir = 8 - }, /obj/effect/floor_decal/corner/grey/full{ dir = 8 }, -/obj/structure/engineer_maintenance/electric{ - dir = 1 - }, /obj/effect/floor_decal/industrial/outline/service, /turf/simulated/floor/lino, /area/horizon/service/bar) @@ -51576,13 +51554,16 @@ /area/horizon/rnd/xenobiology) "hlC" = ( /obj/structure/table/stone/marble, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar_shutter"; name = "Bar Shutter" }, /obj/machinery/power/outlet, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, /turf/simulated/floor/lino, /area/horizon/service/bar) "hlD" = ( @@ -52374,8 +52355,8 @@ /area/horizon/maintenance/deck_2/wing/port/far) "hqv" = ( /obj/effect/floor_decal/spline/plain, -/obj/machinery/media/jukebox/audioconsole/wall{ - pixel_y = -32 +/obj/structure/bed/stool/bar/padded/red{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) @@ -53560,17 +53541,14 @@ /turf/simulated/floor, /area/horizon/maintenance/deck_3/aft/port/far) "hys" = ( -/obj/machinery/vending/cigarette, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/machinery/vending/cigarette, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "hyF" = ( @@ -54582,8 +54560,10 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/engineering/hallway/fore) "hFS" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "hFU" = ( @@ -54933,16 +54913,12 @@ /turf/simulated/floor/tiled/white, /area/horizon/rnd/xenobiology) "hHX" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/rod_railing/bar, /obj/structure/platform/bar{ dir = 1 }, /obj/structure/flora/pottedplant/fortune_flower, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "hHY" = ( /obj/structure/platform{ @@ -55005,9 +54981,6 @@ /obj/machinery/atm{ pixel_y = -6 }, -/obj/structure/sign/flag/scc{ - pixel_y = -32 - }, /obj/structure/sign/flag/idris{ pixel_y = -32 }, @@ -56498,6 +56471,9 @@ /obj/structure/closet/walllocker/medical/firstaid{ pixel_x = -32 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "hSZ" = ( @@ -57930,7 +57906,8 @@ dir = 1; req_one_access = list(12) }, -/turf/simulated/floor, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_3/crewlounge) "ifJ" = ( /obj/structure/cable/green{ @@ -59330,7 +59307,6 @@ /turf/simulated/wall/r_wall, /area/horizon/engineering/atmos) "ipz" = ( -/obj/machinery/door/firedoor, /obj/structure/table/stone/marble, /obj/machinery/power/outlet, /obj/machinery/door/blast/shutters{ @@ -59342,6 +59318,7 @@ desc = "A small empty jar that is mostly used for giving a tip."; name = "tip jar" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/lino, /area/horizon/service/bar) "ipB" = ( @@ -60530,17 +60507,6 @@ icon_state = "wood" }, /area/centcom/legion/hangar5) -"ixZ" = ( -/obj/machinery/door/firedoor, -/obj/structure/table/stone/marble, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "bar_shutter"; - name = "Bar Shutter" - }, -/obj/machinery/power/outlet, -/turf/simulated/floor/lino, -/area/horizon/service/bar) "iyb" = ( /obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{ dir = 4 @@ -60620,7 +60586,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 8; + dir = 1; icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark/full, @@ -61367,7 +61333,16 @@ /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 }, -/turf/simulated/floor/carpet/green, +/obj/machinery/button/switch/windowtint{ + dir = 1; + id = "Bar_Private_Lounge"; + pixel_y = 27; + pixel_x = -5 + }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "iDV" = ( /obj/effect/decal/cleanable/dirt, @@ -64061,6 +64036,10 @@ /obj/structure/weapon_rack/double{ pixel_y = -29 }, +/obj/structure/engineer_maintenance/pipe{ + dir = 4 + }, +/obj/structure/engineer_maintenance/electric, /turf/simulated/floor/lino, /area/horizon/service/bar) "iYR" = ( @@ -64829,7 +64808,7 @@ /obj/machinery/media/jukebox{ anchored = 1 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "jep" = ( /obj/effect/floor_decal/industrial/hatch/yellow, @@ -70889,7 +70868,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/horizon/service/bar) "jWZ" = ( @@ -72857,9 +72835,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/disposalpipe/junction{ + dir = 4 }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) @@ -73307,10 +73284,6 @@ /obj/structure/cable/green{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -73319,6 +73292,10 @@ dir = 4; pixel_x = 16 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "koP" = ( @@ -74192,13 +74169,11 @@ "kvj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/emergency, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/structure/sign/double/barsign{ pixel_y = -32 }, -/turf/simulated/floor/plating, +/obj/structure/lattice/catwalk, +/turf/simulated/open, /area/horizon/maintenance/deck_2/service/starboard) "kvn" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -77560,7 +77535,7 @@ }, /obj/structure/lattice/catwalk, /turf/simulated/open, -/area/horizon/service/bar) +/area/horizon/maintenance/deck_2/service/starboard) "kSV" = ( /turf/simulated/floor/exoplanet/water/shallow{ icon_state = "pool" @@ -79002,7 +78977,11 @@ name = "Lounge" }, /obj/structure/curtain/open/bar, -/turf/simulated/floor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, +/turf/simulated/floor/tiled/dark/full, /area/horizon/crew/lounge) "ldf" = ( /obj/structure/disposalpipe/segment{ @@ -79498,16 +79477,16 @@ /area/horizon/rnd/xenoarch/isolation_a) "lgw" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/door/firedoor/multi_tile, /obj/machinery/door/blast/shutters{ id = "bar_maint"; name = "Bar Shutter" }, /obj/structure/curtain/open/bar, -/obj/machinery/door/firedoor, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/stairwell/starboard/deck_2) "lgy" = ( /obj/machinery/door/firedoor{ @@ -84603,9 +84582,6 @@ /obj/machinery/door/airlock/glass_service{ name = "Lounge" }, -/obj/effect/floor_decal/spline/fancy/wood/cee{ - dir = 1 - }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "lQc" = ( @@ -85470,6 +85446,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/west, /obj/structure/cable/green, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "lYp" = ( @@ -89057,19 +89034,16 @@ /turf/unsimulated/floor, /area/centcom/legion/hangar5) "mCq" = ( -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/machinery/power/apc/critical/west, /obj/structure/cable/green{ d2 = 4; icon_state = "0-4" }, +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, /obj/effect/floor_decal/industrial/warning, -/obj/structure/railing/mapped{ - pixel_y = -5 - }, -/obj/structure/bed/stool/bar/padded/red{ - dir = 4 - }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "mCr" = ( @@ -90479,11 +90453,6 @@ /turf/simulated/floor/wood, /area/horizon/command/bridge/minibar) "mMx" = ( -/obj/machinery/button/switch/windowtint{ - dir = 1; - id = "Bar_Private_Lounge"; - pixel_y = 24 - }, /obj/structure/bed/stool/chair/sofa/left/green{ pixel_y = 5 }, @@ -94301,7 +94270,12 @@ dir = 1 }, /obj/structure/window/shuttle/scc_space_ship, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/blast/shutters/open{ + dir = 2; + id = "bar_viewing_shutters"; + name = "Bar Viewing Shutters" + }, +/turf/simulated/floor/plating, /area/horizon/service/bar) "npR" = ( /obj/effect/floor_decal/corner/dark_blue/diagonal, @@ -95848,6 +95822,9 @@ pixel_x = -64; pixel_y = -33 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "nBE" = ( @@ -96018,6 +95995,7 @@ "nCK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm/west, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "nCL" = ( @@ -97137,15 +97115,6 @@ icon_state = "dark_preview" }, /area/centcom/specops) -"nJD" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/media/jukebox/audioconsole/wall{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/horizon/service/bar) "nJK" = ( /obj/structure/table/rack, /obj/item/clothing/shoes/magboots, @@ -103518,10 +103487,10 @@ /obj/structure/platform{ dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, /obj/structure/engineer_maintenance/pipe/wall, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "oEb" = ( @@ -104557,13 +104526,9 @@ dir = 1 }, /obj/item/device/quikpay, -/obj/item/paper{ - info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; - name = "Shotgun permit" - }, /obj/item/book/manual/barman_recipes{ - pixel_x = 2; - pixel_y = -9 + pixel_x = 4; + pixel_y = 5 }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar/backroom) @@ -108052,7 +108017,7 @@ /obj/structure/lattice/catwalk/indoor/grate/dark, /obj/random/junk, /turf/simulated/floor/plating, -/area/horizon/service/bar) +/area/horizon/maintenance/deck_2/service/starboard) "pnv" = ( /obj/item/gun/energy/rifle/laser, /obj/item/gun/energy/rifle/laser, @@ -108297,9 +108262,7 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/sign/emergency/meetingpoint{ - pixel_x = -32 - }, +/obj/structure/closet/walllocker/emerglocker/west, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "pqm" = ( @@ -108906,14 +108869,11 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/armoury) "pve" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/railing/mapped{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "pvo" = ( @@ -111142,7 +111102,10 @@ "pLH" = ( /obj/machinery/computer/slot_machine, /obj/effect/floor_decal/spline/fancy/wood/corner, -/turf/simulated/floor/carpet/green, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "pLN" = ( /obj/machinery/door/airlock/glass_security{ @@ -115652,7 +115615,6 @@ /area/centcom/holding) "qvH" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning, /obj/structure/sign/poster/pinup/bay_47{ pixel_x = -32 }, @@ -117723,7 +117685,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor, +/turf/simulated/floor/tiled/full, /area/horizon/hallway/primary/deck_3/starboard) "qKl" = ( /obj/structure/cable/green, @@ -118184,10 +118146,7 @@ /obj/structure/railing/mapped{ icon_state = "railing0-0" }, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/maintenance/deck_2/service/starboard) "qNo" = ( /obj/structure/lattice, @@ -118425,6 +118384,9 @@ c_tag = "Service - Deck 2 - Bar Starboard"; dir = 1 }, +/obj/machinery/media/jukebox/audioconsole/wall{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "qPX" = ( @@ -120808,7 +120770,7 @@ name = "Bar Viewing Shutters" }, /obj/machinery/door/firedoor, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/plating, /area/horizon/service/bar) "rjl" = ( /obj/effect/floor_decal/industrial/warning{ @@ -121443,9 +121405,6 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/service/hydroponics) "rmV" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -127174,11 +127133,14 @@ name = "Bar - Preparations"; req_access = list(25) }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/curtain/open/bar, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "sdN" = ( @@ -128464,13 +128426,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ id = "bar_maint"; name = "Bar Shutter" }, /obj/structure/curtain/open/bar, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/dark/full, /area/horizon/stairwell/starboard/deck_2) "slW" = ( /obj/machinery/button/remote/blast_door{ @@ -128678,9 +128639,10 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/machinery/vending/battlemonsters, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, +/obj/structure/bed/stool/bar/padded/red{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "snq" = ( /obj/effect/floor_decal/corner/brown, @@ -132528,7 +132490,8 @@ /obj/machinery/door/airlock/maintenance{ name = "Deck 2 Stairwell Maintenance" }, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark/full, /area/horizon/stairwell/starboard/deck_2) "sNE" = ( /obj/effect/floor_decal/industrial/warning, @@ -134117,6 +134080,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "sZZ" = ( @@ -136554,7 +136518,6 @@ /obj/structure/platform_deco/ledge/dark{ dir = 6 }, -/obj/structure/lattice/catwalk/indoor/grate/dark, /obj/structure/rod_railing/bar{ dir = 6 }, @@ -136562,11 +136525,8 @@ dir = 1 }, /obj/machinery/vending/overloaders, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/plating, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "trQ" = ( /obj/machinery/light/small{ @@ -138561,9 +138521,6 @@ /obj/structure/ladder{ pixel_y = 8 }, -/obj/machinery/status_display{ - pixel_x = -32 - }, /turf/simulated/open, /area/horizon/maintenance/deck_2/service/starboard) "tFR" = ( @@ -138852,13 +138809,16 @@ /area/horizon/engineering/atmos/propulsion) "tHo" = ( /obj/structure/table/stone/marble, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar_shutter"; name = "Bar Shutter" }, /obj/item/material/ashtray/bronze, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, /turf/simulated/floor/lino, /area/horizon/service/bar) "tHp" = ( @@ -139337,7 +139297,6 @@ /area/horizon/maintenance/deck_2/wing/starboard/near) "tLl" = ( /obj/structure/table/stone/marble, -/obj/machinery/door/firedoor, /obj/machinery/door/blast/shutters{ dir = 2; id = "bar_shutter"; @@ -139348,6 +139307,7 @@ name = "tip jar" }, /obj/machinery/power/outlet, +/obj/machinery/door/firedoor, /turf/simulated/floor/lino, /area/horizon/service/bar) "tLr" = ( @@ -142359,7 +142319,10 @@ name = "Bar - Preparations"; req_access = list(25) }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + req_one_access = list(24,11,67,73); + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/horizon/service/bar) "uja" = ( @@ -147115,6 +147078,7 @@ /area/horizon/shuttle/intrepid/buffet) "uRK" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "uRR" = ( @@ -148838,20 +148802,16 @@ pixel_y = 32 }, /obj/structure/table/stone/marble, -/obj/random/pottedplant_small{ - pixel_x = -8; - pixel_y = -1 - }, /obj/item/reagent_containers/glass/bottle/syrup/chocolate{ - pixel_x = -12; + pixel_x = -10; pixel_y = 16 }, /obj/item/reagent_containers/glass/bottle/syrup/caramel{ - pixel_x = -3; + pixel_x = -1; pixel_y = 16 }, /obj/item/reagent_containers/glass/bottle/syrup/pumpkin{ - pixel_x = 7; + pixel_x = 8; pixel_y = 16 }, /obj/item/reagent_containers/glass/bottle/syrup/vanilla{ @@ -148861,6 +148821,10 @@ /obj/effect/floor_decal/corner/grey{ dir = 5 }, +/obj/random/pottedplant_small{ + pixel_x = -8; + pixel_y = -1 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/service/bar) "vdl" = ( @@ -150528,6 +150492,7 @@ /obj/machinery/light/small/emergency{ dir = 4 }, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor, /area/horizon/maintenance/deck_3/crewlounge) "voH" = ( @@ -151310,22 +151275,14 @@ /turf/simulated/floor/carpet/rubber, /area/horizon/tcommsat/chamber) "vuL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/closet/walllocker/firecloset{ + pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/lattice/catwalk/indoor/grate/dark, -/turf/simulated/floor/plating, -/area/horizon/maintenance/deck_2/service/starboard) +/turf/simulated/floor/tiled/dark, +/area/horizon/service/bar) "vuM" = ( /obj/structure/sign/vacuum{ pixel_y = -32 @@ -151969,16 +151926,6 @@ }, /turf/simulated/floor, /area/horizon/hallway/primary/deck_3/central) -"vzH" = ( -/obj/structure/grille/diagonal{ - dir = 1 - }, -/obj/structure/window/shuttle/scc_space_ship, -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/turf/simulated/floor/wood, -/area/horizon/service/bar) "vzJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -153610,14 +153557,12 @@ /turf/simulated/floor/tiled/full, /area/horizon/service/kitchen/freezer) "vLq" = ( -/obj/effect/floor_decal/industrial/warning, /obj/effect/decal/cleanable/dirt, -/obj/structure/railing/mapped{ - pixel_y = -5 - }, -/obj/structure/bed/stool/bar/padded/red{ - dir = 8 +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "vLt" = ( @@ -153969,6 +153914,9 @@ /obj/machinery/light/floor{ dir = 8 }, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/service/dining_hall) "vOw" = ( @@ -160594,13 +160542,11 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/railing/mapped{ - pixel_y = -5 +/obj/structure/railing/mapped, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/obj/structure/table/wood/gamblingtable, -/obj/item/material/ashtray, -/obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "wHe" = ( @@ -164930,6 +164876,9 @@ "xnI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_2/service/starboard) "xnL" = ( @@ -165755,7 +165704,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/horizon/service/bar) "xtJ" = ( @@ -167066,12 +167014,10 @@ "xDv" = ( /obj/structure/casino/roulette_chart, /obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8 + dir = 4 }, -/obj/effect/floor_decal/spline/fancy/wood/corner{ - dir = 8 - }, -/turf/simulated/floor/carpet/green, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood/mahogany, /area/horizon/service/bar) "xDw" = ( /obj/structure/cable{ @@ -169899,6 +169845,7 @@ pixel_y = 10 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/lattice/catwalk/indoor/grate/dark, /turf/simulated/floor/plating, /area/horizon/maintenance/deck_1/hangar/starboard) "xYO" = ( @@ -266389,7 +266336,7 @@ lzp bhL nXt qvH -vuL +gGT mCq tFQ ezA @@ -266397,8 +266344,8 @@ snp fqk pJy aGn -nJD hUO +vuL fqk evI ppV @@ -266409,7 +266356,7 @@ doP ezA cqM pLH -vzH +npQ dWh tGt hoE @@ -266644,7 +266591,7 @@ why gMj nyl sNB -aJJ +pve pve rmV wGZ @@ -266911,9 +266858,9 @@ aNt iyD hHX ipz -fjc -ixZ -fjc +tHo +hlC +tHo hlC tHo tLl @@ -267159,7 +267106,7 @@ pmh vcO lgw uRK -uRK +fjc gGT xnI pns @@ -267952,7 +267899,7 @@ tnA xAz vxb gRO -bPb +gCJ ens uYQ eSV