Backpack Icon Sorting (#20433)

* Initial

* forgor the obj

* Fixes, robo-bags, crusader items, obsolete files gone

* updates the exclamation points because consistency

* Kills Roboclothes module, moves roboclothes to actual subtypes

* Fix worn_icons CI fail

* okay so it WAS used in maps but it was used alongside normal sec packs?

* OOPS typo

_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon2.dmm

@@ -6357,9 +6357,7 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/storage/backpack/duffelbag/sec,
 /obj/item/storage/backpack/duffelbag/sec/redsec,
-/obj/item/storage/backpack/satchel/sec/peacekeeper,
 /obj/item/storage/backpack/satchel/sec/redsec,
-/obj/item/storage/backpack/security/peacekeeper,
 /obj/item/storage/backpack/security/redsec,
 /turf/open/floor/cult,
 /area/ruin/space/has_grav/port_tarkon)
@@ -6894,9 +6892,9 @@
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/shoes/winterboots,
 /obj/item/storage/backpack/duffelbag/science,
-/obj/item/storage/backpack/duffelbag/robo,
+/obj/item/storage/backpack/duffelbag/science/robo,
 /obj/item/storage/backpack/satchel/science,
-/obj/item/storage/backpack/satchel/tox/robo,
+/obj/item/storage/backpack/satchel/science/robo,
 /obj/item/storage/backpack/science,
 /obj/item/storage/backpack/science/robo,
 /turf/open/floor/iron,

_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon3.dmm

@@ -6117,9 +6117,7 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/storage/backpack/duffelbag/sec,
 /obj/item/storage/backpack/duffelbag/sec/redsec,
-/obj/item/storage/backpack/satchel/sec/peacekeeper,
 /obj/item/storage/backpack/satchel/sec/redsec,
-/obj/item/storage/backpack/security/peacekeeper,
 /obj/item/storage/backpack/security/redsec,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/port_tarkon)
@@ -6574,9 +6572,9 @@
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/shoes/winterboots,
 /obj/item/storage/backpack/duffelbag/science,
-/obj/item/storage/backpack/duffelbag/robo,
+/obj/item/storage/backpack/duffelbag/science/robo,
 /obj/item/storage/backpack/satchel/science,
-/obj/item/storage/backpack/satchel/tox/robo,
+/obj/item/storage/backpack/satchel/science/robo,
 /obj/item/storage/backpack/science,
 /obj/item/storage/backpack/science/robo,
 /turf/open/floor/iron,

_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon4.dmm

@@ -5373,9 +5373,7 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/storage/backpack/duffelbag/sec,
 /obj/item/storage/backpack/duffelbag/sec/redsec,
-/obj/item/storage/backpack/satchel/sec/peacekeeper,
 /obj/item/storage/backpack/satchel/sec/redsec,
-/obj/item/storage/backpack/security/peacekeeper,
 /obj/item/storage/backpack/security/redsec,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/port_tarkon)
@@ -5755,9 +5753,9 @@
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/shoes/winterboots,
 /obj/item/storage/backpack/duffelbag/science,
-/obj/item/storage/backpack/duffelbag/robo,
+/obj/item/storage/backpack/duffelbag/science/robo,
 /obj/item/storage/backpack/satchel/science,
-/obj/item/storage/backpack/satchel/tox/robo,
+/obj/item/storage/backpack/satchel/science/robo,
 /obj/item/storage/backpack/science,
 /obj/item/storage/backpack/science/robo,
 /turf/open/floor/iron,

_maps/RandomRuins/SpaceRuins/skyrat/port_tarkon/defcon5.dmm

@@ -5869,9 +5869,7 @@
 /obj/item/clothing/shoes/jackboots,
 /obj/item/storage/backpack/duffelbag/sec,
 /obj/item/storage/backpack/duffelbag/sec/redsec,
-/obj/item/storage/backpack/satchel/sec/peacekeeper,
 /obj/item/storage/backpack/satchel/sec/redsec,
-/obj/item/storage/backpack/security/peacekeeper,
 /obj/item/storage/backpack/security/redsec,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/port_tarkon)
@@ -6307,9 +6305,9 @@
 /obj/item/clothing/shoes/workboots/mining,
 /obj/item/clothing/shoes/winterboots,
 /obj/item/storage/backpack/duffelbag/science,
-/obj/item/storage/backpack/duffelbag/robo,
+/obj/item/storage/backpack/duffelbag/science/robo,
 /obj/item/storage/backpack/satchel/science,
-/obj/item/storage/backpack/satchel/tox/robo,
+/obj/item/storage/backpack/satchel/science/robo,
 /obj/item/storage/backpack/science,
 /obj/item/storage/backpack/science/robo,
 /turf/open/floor/iron,

_maps/RandomZLevels/blackmesa.dmm

@@ -5565,8 +5565,6 @@
 /obj/structure/closet/secure_closet/security,
 /obj/item/clothing/mask/gas/syndicate/ds,
 /obj/item/storage/medkit/emergency,
-/obj/item/storage/backpack/satchel/sec/peacekeeper,
-/obj/item/storage/backpack/security/peacekeeper,
 /obj/item/keycard/stockroom,
 /obj/effect/turf_decal/tile/blue/fourcorners,
 /turf/open/floor/iron/dark,

_maps/map_files/VoidRaptor/VoidRaptor.dmm

@@ -7978,7 +7978,7 @@
 /obj/effect/turf_decal/tile/dark_red/half/contrasted{
 	dir = 8
 	},
-/obj/item/storage/backpack/duffelbag/robo/surgery{
+/obj/item/storage/backpack/duffelbag/science/robo/surgery{
 	pixel_y = 7
 	},
 /obj/machinery/light/warm/directional/west,

code/modules/jobs/job_types/roboticist.dm

@@ -49,9 +49,9 @@
 	ears = /obj/item/radio/headset/headset_sci
 	l_pocket = /obj/item/modular_computer/pda/roboticist
 
-	backpack = /obj/item/storage/backpack/science/robo //SKYRAT CHANGE - Roboticist Bags (CHANGE)
-	satchel = /obj/item/storage/backpack/satchel/tox/robo //SKYRAT CHANGE - Roboticist Bags (CHANGE)
-	duffelbag = /obj/item/storage/backpack/duffelbag/robo //SKYRAT CHANGE - Roboticist Bags (ADDITION)
+	backpack = /obj/item/storage/backpack/science/robo //SKYRAT CHANGE - Roboticist Bags
+	satchel = /obj/item/storage/backpack/satchel/science/robo //SKYRAT CHANGE - Roboticist Bags
+	duffelbag = /obj/item/storage/backpack/duffelbag/science/robo //SKYRAT ADDITION - Roboticist Bags
 
 	pda_slot = ITEM_SLOT_LPOCKET
 	skillchips = list(/obj/item/skillchip/job/roboticist)

modular_skyrat/modules/blueshield/code/clothing.dm

@@ -97,25 +97,25 @@
 /obj/item/storage/backpack/blueshield
 	name = "blueshield backpack"
 	desc = "A robust backpack issued to Nanotrasen's finest."
-	icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	icon_state = "blueshieldpack"
+	icon_state = "backpack_blueshield"
 	inhand_icon_state = "securitypack"
 
 /obj/item/storage/backpack/satchel/blueshield
 	name = "blueshield satchel"
 	desc = "A robust satchel issued to Nanotrasen's finest."
-	icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	icon_state = "satchel-blueshield"
+	icon_state = "satchel_blueshield"
 	inhand_icon_state = "satchel-sec"
 
 /obj/item/storage/backpack/duffelbag/blueshield
 	name = "blueshield duffelbag"
 	desc = "A robust duffelbag issued to Nanotrasen's finest."
-	icon = 'modular_skyrat/modules/blueshield/icons/backpacks.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	icon_state = "duffel-blueshield"
+	icon_state = "duffel_blueshield"
 	inhand_icon_state = "duffel-sec"
 
 //blueshield armor

modular_skyrat/modules/customization/modules/clothing/storage/backpacks.dm

@@ -1,8 +1,29 @@
 /obj/item/storage/backpack/satchel/crusader	//Not very special, really just a satchel texture
-	icon = 'modular_skyrat/master_files/icons/obj/clothing/storage.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
 	name = "crusader bandolier"
 	desc = "A bandolier-satchel combination for holding all your dungeon loot."
 	icon_state = "crusader_bandolier"
 	inhand_icon_state = "explorerpack"
 	w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/backpack/science/robo
+	name = "robotics backpack"
+	desc = "A sleek, industrial-strength backpack issued to robotics personnel. Smells faintly of oil."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
+	icon_state = "backpack_robo"
+
+/obj/item/storage/backpack/satchel/science/robo
+	name = "robotics satchel"
+	desc = "A sleek, industrial-strength satchel issued to robotics personnel. Smells faintly of oil."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
+	icon_state = "satchel_robo"
+
+/obj/item/storage/backpack/duffelbag/science/robo
+	name = "robotics duffelbag"
+	desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. Smells faintly of oil."
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
+	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
+	icon_state = "duffel_robo"

modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm

@@ -47,37 +47,37 @@
 /obj/item/storage/backpack/security
 	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	icon_state = "backpack_black"
+	icon_state = "backpack_security_black"
 	uses_advanced_reskins = TRUE
 	unique_reskin = list(
 		"Black Variant" = list(
-			RESKIN_ICON_STATE = "backpack_black",
-			RESKIN_WORN_ICON_STATE = "backpack_black"
+			RESKIN_ICON_STATE = "backpack_security_black",
+			RESKIN_WORN_ICON_STATE = "backpack_security_black"
 		),
 		"White Variant" = list(
-			RESKIN_ICON_STATE = "backpack_white",
-			RESKIN_WORN_ICON_STATE = "backpack_white"
+			RESKIN_ICON_STATE = "backpack_security_white",
+			RESKIN_WORN_ICON_STATE = "backpack_security_white"
 		),
 	)
 
 /obj/item/storage/backpack/satchel/sec
 	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	icon_state = "security_satchel"
+	icon_state = "satchel_security"
 
 /obj/item/storage/backpack/duffelbag/sec
 	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	icon_state = "security_duffle_blue"
+	icon_state = "duffel_security_black"
 	uses_advanced_reskins = TRUE
 	unique_reskin = list(
-		"Blue Variant" = list(
-			RESKIN_ICON_STATE = "security_duffle_blue",
-			RESKIN_WORN_ICON_STATE = "security_duffle_blue"
+		"Black Variant" = list(
+			RESKIN_ICON_STATE = "duffel_security_black",
+			RESKIN_WORN_ICON_STATE = "duffel_security_black"
 		),
 		"White Variant" = list(
-			RESKIN_ICON_STATE = "security_duffle_white",
-			RESKIN_WORN_ICON_STATE = "security_duffle_white"
+			RESKIN_ICON_STATE = "duffel_security_white",
+			RESKIN_WORN_ICON_STATE = "duffel_security_white"
 		),
 	)
 

modular_skyrat/modules/hop_drip/code/head_of_personnel.dm

@@ -1,30 +1,30 @@
 /obj/item/storage/backpack/head_of_personnel
 	name = "head of personnel backpack"
 	desc = "A exclusive backpack issued to Nanotrasen's finest second."
-	icon = 'modular_skyrat/modules/hop_drip/icons/hop_packs.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	lefthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi'
-	icon_state = "hop_pack"
-	inhand_icon_state = "hop_pack"
+	lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi'
+	righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi'
+	icon_state = "backpack_hop"
+	inhand_icon_state = "backpack_hop"
 
 /obj/item/storage/backpack/satchel/head_of_personnel
 	name = "head of personnel satchel"
 	desc = "A exclusive satchel issued to Nanotrasen's finest second."
-	icon = 'modular_skyrat/modules/hop_drip/icons/hop_packs.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	lefthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi'
+	lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi'
+	righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi'
 	icon_state = "satchel_hop"
 	inhand_icon_state = "satchel_hop"
 
 /obj/item/storage/backpack/duffelbag/head_of_personnel
 	name = "head of personnel duffelbag"
 	desc = "A robust duffelbag issued to Nanotrasen's finest second."
-	icon = 'modular_skyrat/modules/hop_drip/icons/hop_packs.dmi'
+	icon = 'modular_skyrat/master_files/icons/obj/clothing/backpacks.dmi'
 	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	lefthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_lefthand.dmi'
-	righthand_file = 'modular_skyrat/modules/hop_drip/icons/backpack_righthand.dmi'
+	lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_lefthand.dmi'
+	righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/clothing/backpack_righthand.dmi'
 	icon_state = "duffel_hop"
 	inhand_icon_state = "duffel_hop"
 

modular_skyrat/modules/mapping/voidraptor/code/clothing.dm

@@ -1,8 +1,8 @@
-/obj/item/storage/backpack/duffelbag/robo/surgery
-	name = "robotics surgery duffelbag"
-	desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. This one seems to be designed for holding surgical tools."
+/obj/item/storage/backpack/duffelbag/science/robo/surgery
+	name = "robotics surgical duffelbag"
+	desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. This one has a tag implying it came stocked with surgical tools."
 
-/obj/item/storage/backpack/duffelbag/robo/surgery/PopulateContents()
+/obj/item/storage/backpack/duffelbag/science/robo/surgery/PopulateContents()
 	new /obj/item/scalpel(src)
 	new /obj/item/hemostat(src)
 	new /obj/item/retractor(src)

modular_skyrat/modules/modular_vending/code/wardrobes.dm

@@ -58,6 +58,9 @@
 		/obj/item/clothing/mask/breath = 2,
 		/obj/item/reagent_containers/cup/bottle/morphine = 2,
 		/obj/item/reagent_containers/syringe = 2,
+		/obj/item/storage/backpack/science/robo = 2,
+		/obj/item/storage/backpack/satchel/science/robo = 2,
+		/obj/item/storage/backpack/duffelbag/science/robo = 2,
 	)
 
 /obj/machinery/vending/wardrobe/science_wardrobe

modular_skyrat/modules/roboclothes/code/robotics_clothing.dm

@@ -1,20 +0,0 @@
-/obj/item/storage/backpack/science/robo
-	name = "robotics backpack"
-	desc = "A sleek, industrial-strength backpack issued to robotics personnel. Smells faintly of oil."
-	icon = 'modular_skyrat/modules/roboclothes/icons/robobag_item.dmi'
-	worn_icon = 'modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi'
-	icon_state = "robopack"
-
-/obj/item/storage/backpack/satchel/tox/robo
-	name = "robotics satchel"
-	desc = "A sleek, industrial-strength satchel issued to robotics personnel. Smells faintly of oil."
-	icon = 'modular_skyrat/modules/roboclothes/icons/robobag_item.dmi'
-	worn_icon = 'modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi'
-	icon_state = "satchel-robo"
-
-/obj/item/storage/backpack/duffelbag/robo
-	name = "robotics duffelbag"
-	desc = "A sleek, industrial-strength duffelbag issued to robotics personnel. Smells faintly of oil."
-	icon = 'modular_skyrat/modules/roboclothes/icons/robobag_item.dmi'
-	worn_icon = 'modular_skyrat/modules/roboclothes/icons/robobag_onmob.dmi'
-	icon_state = "duffel-robo"

modular_skyrat/modules/roboclothes/code/wardrobes.dm

@@ -1,5 +0,0 @@
-/obj/machinery/vending/wardrobe/robo_wardrobe/Initialize(mapload)
-	products[/obj/item/storage/backpack/science/robo] = 3
-	products[/obj/item/storage/backpack/satchel/tox/robo] = 3
-	products[/obj/item/storage/backpack/duffelbag/robo] = 3
-	. = ..()

modular_skyrat/modules/roboclothes/readme.md

@@ -1,29 +0,0 @@
-ttps://github.com/Skyrat-SS13/Skyrat-tg/pull
-
-## Title: ROBOTICS CLOTHING
-
-MODULE ID: ROBOCLOTHES
-
-### Description:
-
-Ports over old Robotics Backpacks as well as changes the current TG Robotics labcoat to be more COOL AND SICK (Read: Edgy).
-
-### TG Proc Changes:
-
-- Modified the Roboticist job file (code/modules/jobs/job_types/roboticist.dm) to include new robotics backpacks and such.
-
-### Defines:
-
-- N/A
-
-### Master file additions
-
-- N/A
-
-### Included files that are not contained in this module:
-
-- N/A
-
-### Credits:
-ShadeAware - Coding and Spritework.
-necromanceranne - Black-Colored Robotics Labcoats.

modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_backpack.dm

@@ -1,26 +0,0 @@
-/obj/item/storage/backpack/security/peacekeeper
-	name = "peacekeeper backpack"
-	desc = "A robust feeling backpack."
-	icon_state = "peacepack"
-	icon = 'modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	inhand_icon_state = "securitypack"
-
-/obj/item/storage/backpack/satchel/sec/peacekeeper
-	name = "peacekeeper satchel"
-	desc = "A robust feeling satchel."
-	icon_state = "peacekeepersatchel"
-	icon = 'modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	inhand_icon_state = "satchel-sec"
-
-/obj/item/storage/backpack/duffelbag/sec/peacekeeper
-	name = "peacekeeper duffelbag"
-	desc = "A robust feeling duffelbag."
-	icon_state = "peacekeeperduffle"
-	icon = 'modular_skyrat/modules/sec_haul/icons/peacekeeper/peacekeeper_items.dmi'
-	worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/back.dmi'
-	inhand_icon_state = "duffel-sec"
-
-
-

tgstation.dme

@@ -6764,8 +6764,6 @@
 #include "modular_skyrat\modules\records_on_examine\code\record_variables.dm"
 #include "modular_skyrat\modules\records_on_examine\code\records_procs.dm"
 #include "modular_skyrat\modules\records_on_examine\code\view_exploitables.dm"
-#include "modular_skyrat\modules\roboclothes\code\robotics_clothing.dm"
-#include "modular_skyrat\modules\roboclothes\code\wardrobes.dm"
 #include "modular_skyrat\modules\robohand\code\bodypart_autosurgeon.dm"
 #include "modular_skyrat\modules\robohand\code\robohand.dm"
 #include "modular_skyrat\modules\robohand\code\silverhand_bundle.dm"
@@ -6799,7 +6797,6 @@
 #include "modular_skyrat\modules\sec_haul\code\misc\packs.dm"
 #include "modular_skyrat\modules\sec_haul\code\misc\vending.dm"
 #include "modular_skyrat\modules\sec_haul\code\peacekeeper\armadyne_clothing.dm"
-#include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_backpack.dm"
 #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_clothing.dm"
 #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_hammer.dm"
 #include "modular_skyrat\modules\sec_haul\code\peacekeeper\peacekeeper_lockers.dm"