Fixes Some Bugs and Oversights in Engineering (#14802)

code/game/machinery/spaceheater.dm

@@ -2,7 +2,7 @@
 	name = "portable air conditioning unit"
 	desc = "A portable air conditioning unit. It can heat or cool a room to your liking."
 	icon = 'icons/obj/atmos.dmi'
-	icon_state = "sheater0"
+	icon_state = "sheater-off"
 	anchored = FALSE
 	density = TRUE
 	use_power = POWER_USE_OFF

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -69,6 +69,13 @@
 	new /obj/item/taperoll/engineering(src)
 	new /obj/item/clothing/accessory/storage/overalls/engineer(src)
 	new /obj/item/device/radio/eng/off(src)
+	new /obj/item/storage/belt/utility(src)
+	new /obj/item/device/gps/engineering(src)
+	new /obj/item/pipewrench(src)
+
+	// Painters
+	new /obj/item/device/floor_painter(src)
+	new /obj/item/device/pipe_painter(src)
 
 // Atmospherics Technician
 /obj/structure/closet/secure_closet/atmos_personal
@@ -93,6 +100,15 @@
 	new /obj/item/reagent_containers/extinguisher_refill(src)
 	new /obj/item/rfd/piping(src)
 	new /obj/item/device/radio/eng/off(src)
+	new /obj/item/storage/belt/utility(src)
+	new /obj/item/device/gps/engineering(src)
+	new /obj/item/pipewrench(src)
+	new /obj/item/crowbar/rescue_axe(src)
+	new /obj/item/device/flashlight/heavy(src)
+
+	// Painters
+	new /obj/item/device/floor_painter(src)
+	new /obj/item/device/pipe_painter(src)
 
 // Electrical Supplies
 /obj/structure/closet/secure_closet/engineering_electrical

html/changelogs/engineering_bugfixes.yml

@@ -0,0 +1,9 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - maptweak: "Maps in portable air conditioning units in engineering."
+  - bugfix: "Moves items mapped on top of engineering and atmos tech lockers from map to code."
+  - bugfix: "Gives engineers and atmos technicians floor- and pipe painters in their lockers."
+  - bugfix: "Fixes the portable air conditioning unit missing its sprite when mapping."

maps/sccv_horizon/sccv_horizon-2_deck_2.dmm

@@ -425,7 +425,7 @@
 /area/medical/reception)
 "akn" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/powered/pump/filled,
+/obj/machinery/space_heater,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/lobby)
 "aky" = (
@@ -472,7 +472,7 @@
 "amk" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/powered/pump/filled,
+/obj/machinery/portable_atmospherics/powered/scrubber,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/lobby)
 "amt" = (
@@ -490,10 +490,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/hallway)
 "amE" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/shieldgen,
-/turf/simulated/floor/tiled/dark/full,
-/area/engineering/lobby)
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/obj/effect/floor_decal/industrial/outline/firefighting_closet,
+/obj/structure/closet/firecloset,
+/turf/simulated/floor/tiled,
+/area/hallway/engineering)
 "amF" = (
 /obj/machinery/alarm{
 	dir = 8;
@@ -905,8 +906,7 @@
 	dir = 1
 	},
 /obj/structure/closet/walllocker/firecloset/medical{
-	pixel_x = -32;
-	pixel_y = 31
+	pixel_x = -32
 	},
 /turf/simulated/floor/tiled,
 /area/medical/first_responder)
@@ -7862,8 +7862,8 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room)
 "ego" = (
-/obj/machinery/shieldgen,
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/powered/pump/filled,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/lobby)
 "egq" = (
@@ -10770,11 +10770,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
-"fKB" = (
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/powered/scrubber,
-/turf/simulated/floor/tiled/dark/full,
-/area/engineering/lobby)
 "fKG" = (
 /obj/structure/closet/crate,
 /obj/random/loot,
@@ -16532,11 +16527,6 @@
 /area/maintenance/wing/starboard)
 "iHQ" = (
 /obj/structure/closet/secure_closet/atmos_personal,
-/obj/item/storage/belt/utility,
-/obj/item/device/gps/engineering,
-/obj/item/pipewrench,
-/obj/item/crowbar/rescue_axe/red,
-/obj/item/device/pipe_painter,
 /obj/effect/floor_decal/corner/yellow{
 	dir = 1
 	},
@@ -16544,7 +16534,6 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
 	},
-/obj/item/device/flashlight/heavy,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
@@ -17694,10 +17683,7 @@
 /obj/machinery/alarm{
 	pixel_y = 28
 	},
-/obj/item/storage/belt/utility,
-/obj/item/device/gps/engineering,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/pipewrench,
 /turf/simulated/floor/tiled,
 /area/engineering/locker_room)
 "jlQ" = (
@@ -28887,6 +28873,11 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/locker_room)
+"piC" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/space_heater,
+/turf/simulated/floor/tiled/dark/full,
+/area/hallway/engineering)
 "piE" = (
 /obj/machinery/cryopod/living_quarters{
 	pixel_y = 8
@@ -32087,11 +32078,6 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/item/storage/belt/utility,
-/obj/item/device/gps/engineering,
-/obj/item/pipewrench,
-/obj/item/crowbar/rescue_axe/red,
-/obj/item/device/pipe_painter,
 /obj/machinery/alarm{
 	pixel_y = 28
 	},
@@ -32101,7 +32087,6 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
 	},
-/obj/item/device/flashlight/heavy,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
@@ -32740,9 +32725,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/medical/pharmacy)
 "rjk" = (
-/obj/machinery/shieldgen,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/light,
+/obj/machinery/portable_atmospherics/powered/scrubber,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/lobby)
 "rju" = (
@@ -42996,10 +42981,7 @@
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 6
 	},
-/obj/item/storage/belt/utility,
-/obj/item/device/gps/engineering,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/pipewrench,
 /turf/simulated/floor/tiled,
 /area/engineering/locker_room)
 "wrK" = (
@@ -63999,9 +63981,9 @@ eZI
 idZ
 mKJ
 mqq
-mqq
-mzS
 mzS
+piC
+amE
 nkT
 rAw
 nTS
@@ -65624,7 +65606,7 @@ eMT
 fKi
 nbJ
 isH
-fKB
+akn
 oUt
 xWa
 auU
@@ -66028,7 +66010,7 @@ eMT
 fKi
 nbJ
 isH
-akn
+ego
 oUt
 auj
 axS
@@ -66635,7 +66617,7 @@ elz
 qFf
 uMn
 guQ
-amE
+akn
 ayF
 wTb
 pyc