rebase post fix

ss220club · Feb 20, 2024 · a0d92d8 · a0d92d8
1 parent 4fc4580
commit a0d92d8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 80 deletions.
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -161,7 +161,7 @@
 /obj/item/clothing/shoes/magboots/rig/eva
 	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC,SPECIES_RESOMI)
 	sprite_sheets = list(
-		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_feet_unathi.dmi'
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_feet_unathi.dmi',
 		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_feet_resomi.dmi'
 	)
 
@@ -208,6 +208,10 @@
 	max_pressure_protection = FIRESUIT_MAX_PRESSURE
 	min_pressure_protection = 0
 
+	sprite_sheets = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_rig_back_resomi.dmi'
+	)
+
 /obj/item/rig/ce/equipped
 
 	initial_modules = list(
@@ -225,15 +229,17 @@
 /obj/item/clothing/head/helmet/space/rig/ce
 	light_overlay = "helmet_light_alt"
 	camera = /obj/machinery/camera/network/helmet
-	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC)
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC,SPECIES_RESOMI)
 	sprite_sheets = list(
 		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_head_unathi.dmi',
-		SPECIES_SKRELL = 'icons/mob/species/skrell/onmob_head_skrell.dmi'
+		SPECIES_SKRELL = 'icons/mob/species/skrell/onmob_head_skrell.dmi',
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_head_resomi.dmi'
 	)
 /obj/item/clothing/suit/space/rig/ce
-	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC)
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC,SPECIES_RESOMI)
 	sprite_sheets = list(
-		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_suit_unathi.dmi'
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_suit_unathi.dmi',
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi'
 	)
 	allowed = list(
 		/obj/item/gun,
@@ -250,12 +256,16 @@
 		/obj/item/rpd
 	)
 /obj/item/clothing/shoes/magboots/rig/ce
-	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC)
+	species_restricted = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_IPC,SPECIES_RESOMI)
 	sprite_sheets = list(
-		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_feet_unathi.dmi'
+		SPECIES_UNATHI = 'icons/mob/species/unathi/onmob_feet_unathi.dmi',
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_feet_resomi.dmi'
 	)
 /obj/item/clothing/gloves/rig/ce
 	siemens_coefficient = 0
+	sprite_sheets = list(
+		SPECIES_RESOMI = 'mods/resomi/icons/clothing/onmob_hands_resomi.dmi'
+	)
 
 /obj/item/rig/hazmat
 	name = "\improper AMI control module"

diff --git a/mods/resomi/code/clothing/clothing.dm b/mods/resomi/code/clothing/clothing.dm
@@ -4,66 +4,6 @@
 	sprite_sheets += list(SPECIES_RESOMI = 'mods/resomi/icons/clothing/misc.dmi')
 	. = ..()
 
-
-
-
-/singleton/item_modifier/space_suit/Initialize()
-	. = ..()
-	var/helmet_setup = type_setups[/obj/item/clothing/head/helmet/space]
-	LAZYSET((helmet_setup[SETUP_SPECIES_OBJ]),  SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi')
-	LAZYSET((helmet_setup[SETUP_SPECIES_ONMOB]),  SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_head_resomi.dmi')
-
-	var/suit_setup = type_setups[/obj/item/clothing/suit/space/void]
-	LAZYSET((suit_setup[SETUP_SPECIES_OBJ]),  SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi')
-	LAZYSET((suit_setup[SETUP_SPECIES_ONMOB]),  SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi')
-
-/obj/item/clothing/suit/space/void/Initialize()
-	. = ..()
-	LAZYDISTINCTADD(species_restricted, SPECIES_RESOMI)
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi')
-	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_suit_resomi.dmi')
-
-/obj/item/clothing/head/helmet/space/void/Initialize()
-	. = ..()
-	LAZYDISTINCTADD(species_restricted, SPECIES_RESOMI)
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_head_resomi.dmi')
-	LAZYSET(sprite_sheets_obj, SPECIES_RESOMI, 'packs/infinity/icons/obj/clothing/species/resomi/obj_head_resomi.dmi')
-
-
-//
-// EVA RIG
-//
-/obj/item/rig/eva/Initialize()
-	. = ..()
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_rig_back_resomi.dmi')
-
-/obj/item/clothing/head/helmet/space/rig/eva/Initialize()
-	. = ..()
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_head_resomi.dmi')
-	LAZYDISTINCTADD(species_restricted, SPECIES_RESOMI)
-
-
-/obj/item/clothing/suit/space/rig/eva/Initialize()
-	. = ..()
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_suit_resomi.dmi')
-	LAZYDISTINCTADD(species_restricted, SPECIES_RESOMI)
-
-/obj/item/clothing/shoes/magboots/rig/eva/Initialize()
-	. = ..()
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_feet_resomi.dmi')
-	LAZYDISTINCTADD(species_restricted, SPECIES_RESOMI)
-
-/obj/item/clothing/gloves/rig/eva/Initialize()
-	. = ..()
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_hands_resomi.dmi')
-	LAZYDISTINCTADD(species_restricted, SPECIES_RESOMI)
-
-
-/obj/item/rig/light/Initialize()
-	. = ..()
-	LAZYSET(sprite_sheets, SPECIES_RESOMI, 'mods/resomi/icons/clothing/onmob_rig_back_resomi.dmi')
-
-
 //
 // MEDICAL RIG
 //

diff --git a/mods/resomi/code/datum/gear.dm b/mods/resomi/code/datum/gear.dm
@@ -1,17 +1,13 @@
-/datum/gear/passport/resomi
+/datum/gear/document/passport/resomi
 	display_name = "(Resomi) registration document"
 	path = /obj/item/passport/xeno/resomi
-	sort_category = "Xenowear"
 	flags = 0
 	whitelisted = list(SPECIES_RESOMI)
-	custom_setup_proc = /obj/item/passport/proc/set_info
-	cost = 0
 
 
 /datum/gear/uniform/resomi
 	display_name = "(Resomi) uniform, colored"
 	path = /obj/item/clothing/under/resomi/white
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 	flags = GEAR_HAS_COLOR_SELECTION
 
@@ -72,7 +68,6 @@
 /datum/gear/tactical/security_uniforms/resomi
 	display_name = "(Resomi) uniform, Security"
 	path = /obj/item/clothing/under/resomi/red
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 /datum/gear/tactical/security_uniforms/resomi/New()
@@ -82,14 +77,12 @@
 /datum/gear/eyes/resomi
 	display_name = "(Resomi) sun lenses"
 	path = /obj/item/clothing/glasses/sunglasses/lenses
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 
 /datum/gear/eyes/security/resomi
 	display_name = "(Resomi) sun sechud lenses"
 	path = /obj/item/clothing/glasses/sunglasses/sechud/lenses
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 /datum/gear/eyes/security/resomi/New()
@@ -99,7 +92,6 @@
 /datum/gear/eyes/medical/resomi
 	display_name = "(Resomi) sun medhud lenses"
 	path = /obj/item/clothing/glasses/hud/health/lenses
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 /datum/gear/eyes/medical/resomi/New()
@@ -110,14 +102,12 @@
 	display_name = "(Resomi) small mantle"
 	path = /obj/item/clothing/accessory/scarf/resomi
 	flags = GEAR_HAS_COLOR_SELECTION
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 
 /datum/gear/shoes/resomi
 	display_name = "(Resomi) small workboots"
 	path = /obj/item/clothing/shoes/workboots/resomi
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 
@@ -136,7 +126,6 @@
 /datum/gear/suit/resomi
 	display_name = "(Resomi) cloaks, alt"
 	path = /obj/item/clothing/suit/storage/resomicloak_alt
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 	flags = GEAR_HAS_SUBTYPE_SELECTION
 
@@ -166,7 +155,6 @@
 /datum/gear/suit/resomi_coat
 	display_name = "(Resomi) coats selection"
 	path = /obj/item/clothing/suit/storage/toggle/resomicoat
-	sort_category = "Xenowear"
 	whitelisted = list(SPECIES_RESOMI)
 
 /datum/gear/suit/resomi_coat/New()