SYNC: Map changes for lighting

code/modules/power/lighting.dm

@@ -164,9 +164,9 @@
 	active_power_usage = 20 // VOREStation Edit - Keep lights at 20 power
 	power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
 	var/on = 0					// 1 if on, 0 if off
-	var/brightness_range = 8	// luminosity when on, also used in power calculation
+	var/brightness_range = 10	// luminosity when on, also used in power calculation //VOREStation Edit - 8->10
 	var/brightness_power = 0.8
-	var/brightness_color = LIGHT_COLOR_INCANDESCENT_TUBE
+	var/brightness_color = LIGHT_COLOR_FLUORESCENT_TUBE //VOREStation Edit - Our tubes are whiter
 	var/status = LIGHT_OK		// LIGHT_OK, _EMPTY, _BURNED or _BROKEN
 	var/flickering = 0
 	var/light_type = /obj/item/weapon/light/tube		// the type of light item
@@ -185,7 +185,7 @@
 	icon_state = "bulb1"
 	base_state = "bulb"
 	fitting = "bulb"
-	brightness_range = 4
+	brightness_range = 5 //VOREStation Edit - 4->5
 	brightness_color = LIGHT_COLOR_INCANDESCENT_BULB
 	desc = "A small lighting fixture."
 	light_type = /obj/item/weapon/light/bulb
@@ -196,7 +196,7 @@
 	icon_state = "flamp1"
 	base_state = "flamp"
 	fitting = "bulb"
-	brightness_range = 5
+	brightness_range = 8 //VOREStation Edit - 4->8
 	plane = OBJ_PLANE
 	layer = OBJ_LAYER
 	brightness_color = LIGHT_COLOR_INCANDESCENT_BULB

maps/tether/tether-01-surface1.dmm

@@ -2199,6 +2199,9 @@
 /obj/effect/floor_decal/corner/brown/border{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/mining_main/lobby)
 "aeT" = (
@@ -3428,6 +3431,9 @@
 /obj/effect/floor_decal/corner/lightgrey/bordercorner2{
 	dir = 5
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
 "ahX" = (
@@ -3598,6 +3604,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/atrium_one)
 "ail" = (
@@ -7733,6 +7742,10 @@
 	dir = 8
 	},
 /obj/machinery/vending/fitness,
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 4
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/hallway/lower/first_west)
 "atL" = (
@@ -9053,6 +9066,11 @@
 /obj/effect/floor_decal/corner/lightgrey{
 	dir = 6
 	},
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube1";
+	pixel_y = 0
+	},
 /turf/simulated/floor/tiled/monotile,
 /area/crew_quarters/locker/laundry_arrival)
 "awE" = (
@@ -27309,6 +27327,27 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden_one)
+"cWl" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 5
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 6
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/atrium_one)
 "dbc" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
@@ -27495,6 +27534,25 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lower/public_garden_maintenence)
+"gek" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 10
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/atrium_one)
 "gri" = (
 /obj/effect/floor_decal/techfloor{
 	dir = 10
@@ -28094,6 +28152,18 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/tether/surfacebase/public_garden_one)
+"svt" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/brown/border{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/mining_main/lobby)
 "sCz" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
@@ -28164,6 +28234,20 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/first_west)
+"tec" = (
+/obj/machinery/portable_atmospherics/hydroponics,
+/obj/machinery/atmospherics/portables_connector,
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/danger{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/rnd/xenobiology/xenoflora/lab_atmos)
 "thL" = (
 /obj/structure/sign/poster,
 /turf/simulated/wall,
@@ -36282,7 +36366,7 @@ akV
 arG
 aVu
 atf
-atR
+tec
 auz
 avw
 beA
@@ -39824,7 +39908,7 @@ aFS
 anl
 aId
 alQ
-alQ
+cWl
 aLI
 apG
 aqp
@@ -41082,7 +41166,7 @@ afE
 adx
 aea
 abL
-aeL
+svt
 afj
 anL
 apW
@@ -42095,7 +42179,7 @@ amv
 akF
 ann
 aIe
-akF
+gek
 aov
 aoD
 apI

maps/tether/tether-03-surface3.dmm

@@ -1646,6 +1646,9 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/carpet/blue,
 /area/tether/surfacebase/security/breakroom)
 "dq" = (
@@ -4642,9 +4645,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/effect/floor_decal/steeldecal/steel_decals7,
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 4
@@ -5850,10 +5850,6 @@
 	pixel_x = 32;
 	pixel_y = 0
 	},
-/obj/machinery/light{
-	icon_state = "tube1";
-	dir = 4
-	},
 /obj/effect/floor_decal/borderfloor{
 	dir = 4
 	},
@@ -5945,6 +5941,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 8
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/atrium_three)
 "kn" = (
@@ -14630,6 +14627,10 @@
 /obj/effect/floor_decal/steeldecal/steel_decals7{
 	dir = 9
 	},
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/lower/third_south)
 "zP" = (
@@ -19202,6 +19203,7 @@
 /area/crew_quarters/bar)
 "Ha" = (
 /obj/machinery/vending/boozeomat,
+/obj/machinery/light,
 /turf/simulated/floor/lino,
 /area/crew_quarters/bar)
 "Hb" = (
@@ -21576,6 +21578,24 @@
 /obj/structure/window/reinforced,
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden_three)
+"Of" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 10
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/atrium_three)
 "Oi" = (
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
@@ -21764,6 +21784,18 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/public_garden_three)
+"QN" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/hallway/lower/third_south)
 "QW" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 10
@@ -21953,6 +21985,18 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
+"Ts" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lime/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/atrium_three)
 "Tt" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -21981,6 +22025,22 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/barrestroom)
+"TL" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/atrium_three)
 "TP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -22147,6 +22207,33 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/public_garden_three)
+"WE" = (
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/lower/third_south)
 "WF" = (
 /obj/structure/table/bench/wooden,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -29365,7 +29452,7 @@ fK
 gx
 hg
 bh
-ir
+TL
 jz
 kn
 kT
@@ -33685,7 +33772,7 @@ yG
 JJ
 JQ
 Gl
-wf
+QN
 ts
 ac
 ac
@@ -34819,9 +34906,9 @@ ac
 ac
 ac
 ts
-JS
+WE
 yG
-wd
+wf
 ts
 ac
 ac
@@ -35213,7 +35300,7 @@ lY
 uI
 vk
 jR
-wp
+Ts
 wP
 xo
 xY
@@ -37033,7 +37120,7 @@ gr
 hc
 hR
 in
-hc
+Of
 kd
 kM
 lr
@@ -37234,7 +37321,7 @@ IY
 IY
 JM
 IY
-IY
+KI
 IR
 Kv
 KA

maps/tether/tether-05-station1.dmm

@@ -9530,16 +9530,13 @@
 /area/hallway/station/docks)
 "aBa" = (
 /obj/structure/closet/emcloset,
-/obj/machinery/light{
-	dir = 1
-	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "aBb" = (
 /obj/structure/closet/emcloset,
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/status_display{
-	pixel_y = 30
+/obj/machinery/light{
+	dir = 1
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
@@ -18654,6 +18651,9 @@
 	icon_state = "2-8"
 	},
 /obj/item/device/megaphone,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "bza" = (
@@ -21492,6 +21492,25 @@
 /obj/structure/closet/secure_closet/pilot,
 /turf/simulated/floor/tiled,
 /area/tether/station/explorer_prep)
+"eAf" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/blue/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 6
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 5
+	},
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/bridge_hallway)
 "eUx" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
@@ -21658,6 +21677,26 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/explorer_meeting)
+"lxQ" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 8
+	},
+/obj/effect/floor_decal/corner/blue/border{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 6
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/bridge_hallway)
 "lHz" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -21844,6 +21883,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/tether/station/explorer_meeting)
+"oEH" = (
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 4
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/hallway/station/docks)
 "oVP" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{
 	dir = 1;
@@ -28683,7 +28729,7 @@ bYj
 awu
 bsl
 btu
-aBZ
+oEH
 awu
 aaa
 aaa
@@ -29535,7 +29581,7 @@ bQa
 aws
 aAV
 btu
-aBZ
+oEH
 awu
 aaa
 aaa
@@ -32793,7 +32839,7 @@ acp
 bej
 bfW
 axe
-axF
+lxQ
 aye
 ayS
 axF
@@ -32808,7 +32854,7 @@ azY
 bBz
 aEV
 aFB
-aFB
+eAf
 ccx
 aGK
 bLL

maps/tether/tether-06-station2.dmm

@@ -4477,6 +4477,9 @@
 	},
 /obj/structure/disposalpipe/trunk,
 /obj/machinery/disposal,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/engineering/foyer_mezzenine)
 "hR" = (
@@ -9426,6 +9429,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals9{
 	dir = 8
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/starboard)
 "pS" = (
@@ -17895,6 +17901,23 @@
 	},
 /turf/simulated/floor/airless,
 /area/maintenance/station/sec_lower)
+"Nq" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/hallway/station/port)
 "Nt" = (
 /obj/structure/girder,
 /turf/simulated/floor/airless,
@@ -18475,6 +18498,25 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/maintenance/station/sec_lower)
+"WG" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/effect/floor_decal/borderfloor{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lightgrey/border{
+	dir = 1
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 4
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/station/starboard)
 "WI" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -26680,7 +26722,7 @@ oi
 pK
 qs
 ri
-rV
+Nq
 sw
 sw
 sw
@@ -30932,7 +30974,7 @@ kv
 lo
 lT
 kb
-nh
+WG
 nP
 ot
 oW

maps/tether/tether-07-station3.dmm

@@ -593,9 +593,9 @@
 /area/maintenance/station/sec_upper)
 "bb" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/light/small{
+/obj/machinery/light{
 	dir = 4;
-	pixel_y = 0
+	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/station/sec_upper)
@@ -672,6 +672,9 @@
 	icon_state = "bordercolor";
 	dir = 4
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/armory/green)
 "bj" = (
@@ -756,11 +759,6 @@
 /obj/item/weapon/cell/device/weapon{
 	pixel_x = 3
 	},
-/obj/machinery/light{
-	dir = 8;
-	icon_state = "tube1";
-	pixel_y = 0
-	},
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 8
 	},
@@ -1666,6 +1664,7 @@
 /area/security/armory/blue)
 "cS" = (
 /obj/structure/table/rack/shelf/steel,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
 /area/security/armory/green)
 "cT" = (
@@ -1702,6 +1701,9 @@
 /area/security/armory/green)
 "cY" = (
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/armory/green)
 "cZ" = (
@@ -4629,6 +4631,9 @@
 /obj/item/target,
 /obj/item/target,
 /obj/item/target,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/range)
 "im" = (
@@ -5201,14 +5206,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/security/range)
-"ja" = (
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1";
-	pixel_x = 0
-	},
-/turf/simulated/floor/tiled/dark,
-/area/security/range)
 "jb" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -5699,6 +5696,10 @@
 	},
 /obj/structure/table/standard,
 /obj/item/device/megaphone,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
 /turf/simulated/floor/tiled,
 /area/security/briefing_room)
 "jO" = (
@@ -14604,6 +14605,9 @@
 	pixel_y = 24;
 	req_access = list()
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "yg" = (
@@ -14889,6 +14893,9 @@
 /obj/effect/floor_decal/corner_steel_grid{
 	dir = 6
 	},
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/teleporter/departing)
 "yM" = (
@@ -15480,9 +15487,6 @@
 /obj/effect/floor_decal/corner/paleblue/bordercorner2{
 	dir = 10
 	},
-/obj/machinery/light{
-	dir = 8
-	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "zS" = (
@@ -16909,6 +16913,9 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 6
 	},
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/chemistry)
 "Cj" = (
@@ -17464,6 +17471,7 @@
 	pixel_x = 5;
 	pixel_y = -32
 	},
+/obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "Dd" = (
@@ -22473,10 +22481,6 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 4
 	},
-/obj/machinery/light{
-	icon_state = "tube1";
-	dir = 4
-	},
 /obj/machinery/vending/medical,
 /obj/machinery/status_display{
 	pixel_x = 32
@@ -22764,6 +22768,10 @@
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 8
 	},
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/ward)
 "KN" = (
@@ -22958,6 +22966,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/station/ai)
+"Nm" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "QMLoad"
+	},
+/obj/machinery/light,
+/turf/simulated/floor,
+/area/quartermaster/storage)
 "Nn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/cyan{
 	dir = 9;
@@ -23089,6 +23105,21 @@
 /obj/random/maintenance/clean,
 /turf/simulated/floor,
 /area/maintenance/station/ai)
+"PN" = (
+/obj/structure/bed/padded,
+/obj/item/weapon/bedsheet/medical,
+/obj/effect/floor_decal/borderfloorwhite{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/paleblue/border{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/tiled/white,
+/area/medical/ward)
 "PS" = (
 /obj/machinery/atmospherics/portables_connector,
 /turf/simulated/floor/plating,
@@ -23142,6 +23173,20 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/station/ai)
+"Qw" = (
+/obj/effect/floor_decal/borderfloor{
+	dir = 4
+	},
+/obj/effect/floor_decal/corner/red/border{
+	dir = 4
+	},
+/obj/structure/table/standard,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/turf/simulated/floor/tiled,
+/area/security/briefing_room)
 "QC" = (
 /obj/structure/table/steel,
 /obj/random/maintenance,
@@ -23363,6 +23408,22 @@
 /obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor,
 /area/maintenance/station/ai)
+"UG" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark,
+/area/security/range)
+"UK" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "packageSort1"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/quartermaster/delivery)
 "UO" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -23445,6 +23506,12 @@
 /obj/random/maintenance/engineering,
 /turf/simulated/floor,
 /area/maintenance/station/ai)
+"WD" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/red/border,
+/obj/machinery/light,
+/turf/simulated/floor/tiled,
+/area/security/lobby)
 "WV" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -28635,7 +28702,7 @@ ab
 gC
 gC
 gC
-ik
+UG
 ik
 ik
 ik
@@ -28919,7 +28986,7 @@ ab
 gC
 gC
 gC
-ik
+UG
 ik
 ik
 ik
@@ -29205,7 +29272,7 @@ gC
 gC
 il
 ik
-ja
+ik
 ik
 ik
 kM
@@ -31064,7 +31131,7 @@ pp
 qb
 qI
 rq
-sf
+WD
 pd
 tM
 uH
@@ -31767,7 +31834,7 @@ ks
 kU
 lG
 ml
-ml
+Qw
 nX
 iK
 pu
@@ -32084,7 +32151,7 @@ EJ
 Ic
 Ix
 IY
-Jv
+PN
 Jv
 Kn
 Jv
@@ -35176,7 +35243,7 @@ lp
 lQ
 mE
 mE
-oj
+UK
 oj
 pF
 qm
@@ -37751,7 +37818,7 @@ Aq
 AV
 BN
 BN
-BN
+Nm
 ul
 ab
 ab