[SPRITES] Syndicate suit storage units (ParadiseSS13#27405)

* Mapping changes and code fixes * Some minor sprite improvements * Remove unused variables * Updatepath renamed --------- Co-authored-by: Adrer <[email protected]>
Latentish · Nov 27, 2024 · 878477d · 878477d
1 parent 324f145
commit 878477d
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 32 deletions.
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -45311,7 +45311,7 @@
 	name = "west bump";
 	pixel_x = -28
 	},
-/obj/machinery/suit_storage_unit/ce/secure,
+/obj/machinery/suit_storage_unit/industrial/ce/secure,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "yellow"
@@ -50724,7 +50724,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "dsK" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "dsL" = (

diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
@@ -16121,7 +16121,7 @@
 /area/station/engineering/atmos)
 "bPz" = (
 /obj/machinery/light,
-/obj/machinery/suit_storage_unit/ce/secure,
+/obj/machinery/suit_storage_unit/industrial/ce/secure,
 /obj/machinery/computer/guestpass{
 	pixel_x = -28;
 	pixel_y = null
@@ -16705,21 +16705,21 @@
 	},
 /area/station/engineering/smes)
 "bRK" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "darkyellow"
 	},
 /area/station/engineering/smes)
 "bRL" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/machinery/light,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellow"
 	},
 /area/station/engineering/smes)
 "bRM" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkyellow"
@@ -70773,7 +70773,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellow";
 	dir = 1
@@ -84635,7 +84635,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkyellow";
 	dir = 1

diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
@@ -35019,7 +35019,7 @@
 /area/station/hallway/primary/port/west)
 "bWI" = (
 /obj/machinery/alarm/directional/east,
-/obj/machinery/suit_storage_unit/ce/secure,
+/obj/machinery/suit_storage_unit/industrial/ce/secure,
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
 	},
@@ -43838,7 +43838,7 @@
 	},
 /area/station/supply/expedition)
 "cuY" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/machinery/ai_status_display{
 	pixel_y = 32
 	},
@@ -43851,7 +43851,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/item/radio/intercom{
 	name = "north bump";
 	pixel_y = 28
@@ -43860,7 +43860,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "cva" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
@@ -45472,7 +45472,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/delivery/hollow,
@@ -48872,7 +48872,7 @@
 /turf/simulated/floor/plasteel,
 /area/station/engineering/equipmentstorage)
 "cIP" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/effect/turf_decal/delivery/hollow,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/equipmentstorage)

diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
@@ -29417,7 +29417,7 @@
 	},
 /area/station/science/toxins/mixing)
 "fwd" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating,
 /area/station/engineering/secure_storage)
@@ -61248,7 +61248,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/fpmaint)
 "lsu" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "yellowcorner"
@@ -87592,7 +87592,7 @@
 	},
 /area/station/hallway/secondary/entry)
 "qla" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "yellow"
@@ -104579,7 +104579,7 @@
 /turf/simulated/floor/engine,
 /area/station/engineering/atmos/asteroid_filtering)
 "tod" = (
-/obj/machinery/suit_storage_unit/ce/secure,
+/obj/machinery/suit_storage_unit/industrial/ce/secure,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "yellow"
@@ -107458,7 +107458,7 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/aft2)
 "tRV" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "yellow"
@@ -121797,7 +121797,7 @@
 /turf/space,
 /area/space)
 "wyR" = (
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /obj/item/toy/figure/crew/engineer{
 	pixel_y = 17;
 	pixel_x = -9

diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
@@ -954,7 +954,7 @@
 /area/station/maintenance/fore)
 "ajS" = (
 /obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "akg" = (
@@ -1100,7 +1100,7 @@
 	c_tag = "Engineering - Storage"
 	},
 /obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "akR" = (
@@ -6056,7 +6056,7 @@
 /obj/machinery/computer/security/telescreen/entertainment{
 	pixel_y = -29
 	},
-/obj/machinery/suit_storage_unit/ce/secure,
+/obj/machinery/suit_storage_unit/industrial/ce/secure,
 /turf/simulated/floor/plasteel{
 	icon_state = "darkgrey"
 	},
@@ -6491,7 +6491,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/delivery/hollow,
-/obj/machinery/suit_storage_unit/engine/secure,
+/obj/machinery/suit_storage_unit/industrial/engine/secure,
 /turf/simulated/floor/plasteel,
 /area/station/engineering/hardsuitstorage)
 "aIA" = (

diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
@@ -84,30 +84,26 @@
 /obj/machinery/suit_storage_unit/blueshield/secure
 	secure = TRUE
 
-/obj/machinery/suit_storage_unit/engine
+/obj/machinery/suit_storage_unit/industrial/engine
 	name = "engineering suit storage unit"
-	icon_state = "industrial"
-	base_icon_state = "industrial"
 	mask_type = /obj/item/clothing/mask/breath
 	boots_type = /obj/item/clothing/shoes/magboots
 	suit_type = /obj/item/mod/control/pre_equipped/engineering
 	req_access = list(ACCESS_ENGINE_EQUIP)
 	board_type = /obj/item/circuitboard/suit_storage_unit/industrial
 
-/obj/machinery/suit_storage_unit/engine/secure
+/obj/machinery/suit_storage_unit/industrial/engine/secure
 	secure = TRUE
 
-/obj/machinery/suit_storage_unit/ce
+/obj/machinery/suit_storage_unit/industrial/ce
 	name = "chief engineer's suit storage unit"
-	icon_state = "industrial"
-	base_icon_state = "industrial"
 	mask_type = /obj/item/clothing/mask/gas
 	boots_type = /obj/item/clothing/shoes/magboots/advance
 	suit_type = /obj/item/mod/control/pre_equipped/advanced
 	req_access = list(ACCESS_CE)
 	board_type = /obj/item/circuitboard/suit_storage_unit/industrial
 
-/obj/machinery/suit_storage_unit/ce/secure
+/obj/machinery/suit_storage_unit/industrial/ce/secure
 	secure = TRUE
 
 /obj/machinery/suit_storage_unit/rd
@@ -193,6 +189,7 @@
 	mask_type = /obj/item/clothing/mask/gas/explorer
 	suit_type = /obj/item/mod/control/pre_equipped/standard/explorer
 	req_access = list(ACCESS_EXPEDITION)
+
 /obj/machinery/suit_storage_unit/cmo
 	name = "chief medical officer's suit storage unit"
 	mask_type = /obj/item/clothing/mask/breath
@@ -230,6 +227,8 @@
 
 /obj/machinery/suit_storage_unit/syndicate
 	name = "syndicate suit storage unit"
+	icon_state = "syndicate"
+	base_icon_state = "syndicate"
 	mask_type = /obj/item/clothing/mask/gas/syndicate
 	suit_type = /obj/item/mod/control/pre_equipped/nuclear
 	req_access = list(ACCESS_SYNDICATE)
@@ -306,6 +305,7 @@
 
 	if(state_open)
 		. += "[base_icon_state]_open"
+		. += "[base_icon_state]_lights_open"
 		if(suit)
 			. += "[base_icon_state]_suit"
 		if(helmet)

diff --git a/icons/obj/machines/suit_storage.dmi b/icons/obj/machines/suit_storage.dmi
diff --git a/tools/UpdatePaths/Scripts/27405_ssu_subtypes.txt b/tools/UpdatePaths/Scripts/27405_ssu_subtypes.txt
@@ -0,0 +1,2 @@
+/obj/machinery/suit_storage_unit/engine/@SUBTYPES : /obj/machinery/suit_storage_unit/industrial/engine/@SUBTYPES{@OLD}
+/obj/machinery/suit_storage_unit/ce/@SUBTYPES : /obj/machinery/suit_storage_unit/industrial/ce/@SUBTYPES{@OLD}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/obj/machinery/suit_storage_unit/engine/@SUBTYPES : /obj/machinery/suit_storage_unit/industrial/engine/@SUBTYPES{@OLD}
		/obj/machinery/suit_storage_unit/ce/@SUBTYPES : /obj/machinery/suit_storage_unit/industrial/ce/@SUBTYPES{@OLD}