diff --git a/html/changelogs/greenjoe12345 - commfixes.yml b/html/changelogs/greenjoe12345 - commfixes.yml new file mode 100644 index 00000000000..94bd89b9865 --- /dev/null +++ b/html/changelogs/greenjoe12345 - commfixes.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: greenjoe12345 + +# 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: + - bugfix: "Fixes some wiring issues with the commissary and tool storage." diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index cf9a8ce7b51..47f922d49d5 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -10553,6 +10553,9 @@ "eZk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/storage/primary) "eZo" = ( @@ -12705,14 +12708,14 @@ /turf/simulated/floor/tiled, /area/operations/office) "fVs" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/dark_green{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/horizon/commissary) "fVz" = ( @@ -15230,6 +15233,9 @@ /obj/effect/floor_decal/corner/red/diagonal, /obj/machinery/portable_atmospherics/powered/pump/filled, /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light/small/emergency{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/storage/primary) "gYj" = ( @@ -15572,6 +15578,9 @@ "hid" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/operations/lobby) "hik" = ( @@ -17808,9 +17817,6 @@ "ijL" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/corner/red/diagonal, -/obj/machinery/light/small/emergency{ - dir = 8 - }, /obj/structure/extinguisher_cabinet/west, /turf/simulated/floor/tiled, /area/storage/primary) @@ -19278,6 +19284,9 @@ /obj/effect/landmark/start{ name = "Assistant" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/storage/primary) "iUg" = ( @@ -21432,6 +21441,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/operations/lobby) "jRO" = ( @@ -30488,6 +30500,9 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/storage/primary) "oiX" = ( @@ -32820,15 +32835,17 @@ /turf/simulated/floor/plating, /area/maintenance/wing/starboard) "pqE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "0-4" + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 5 - }, -/obj/structure/table/rack/retail_shelf, /turf/simulated/floor/tiled, -/area/horizon/commissary) +/area/operations/lobby) "pqH" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -33704,16 +33721,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/checkpoint2) -"pOl" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/dark_green{ - dir = 5 - }, -/obj/structure/table/rack/retail_shelf, -/turf/simulated/floor/tiled, -/area/horizon/commissary) "pOV" = ( /obj/machinery/light, /obj/effect/floor_decal/spline/plain, @@ -36633,6 +36640,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/red/diagonal, +/obj/machinery/light/small/emergency, /turf/simulated/floor/tiled, /area/storage/primary) "riG" = ( @@ -38425,6 +38433,9 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/power/apc/east, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/storage/primary) "rZU" = ( @@ -38612,6 +38623,9 @@ name = "Emergency Supplies Closet"; req_one_access = list(26,29,31,48,67) }, +/obj/effect/map_effect/door_helper/unres{ + dir = 4 + }, /turf/simulated/floor/tiled/full, /area/storage/primary) "sen" = ( @@ -44058,6 +44072,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/storage/primary) "uIa" = ( @@ -47212,9 +47229,6 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "weh" = ( -/obj/machinery/light/small/emergency{ - dir = 1 - }, /obj/effect/floor_decal/corner/red/diagonal, /obj/structure/closet/walllocker/firecloset{ pixel_y = 32 @@ -47941,6 +47955,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/operations/lobby) "wsW" = ( @@ -50139,6 +50156,9 @@ dir = 1 }, /obj/machinery/power/apc/east, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/horizon/commissary) "xrh" = ( @@ -61884,7 +61904,7 @@ tyq tyq tyq xwo -jNd +pqE gfI tSL aRu @@ -62086,7 +62106,7 @@ efJ mkt tyq uft -jNd +pqE gfI cOU rCR @@ -64109,7 +64129,7 @@ ohc uci pfB qYn -pqE +vQQ eCD eCD jSP @@ -64311,7 +64331,7 @@ het dJE ldT qYn -pOl +vQQ pxh oIo yfL