removes most species restrictions from suits (#7146)

Author: silicons

code/__DEFINES/inventory/bodytypes.dm

@@ -68,12 +68,8 @@
 //! keep this number (count) up to date
 #define BODYTYPES_TOTAL 21
 
-//? automatically typelist bodytypes if it's a list
-#define CONSTRUCT_BODYTYPES(LIST) LIST = fetch_bodytypes_struct(LIST)
-//? check bodytype lists matching
-#define COMPARE_BODYTYPES(L1, L2) L1.compare(L2)
-//? check bodytype list membership
-#define CHECK_BODYTYPE(L, BT) L.contains(BT)
+/// Constructs a bodytype struct from a variable.
+#define CONSTRUCT_BODYTYPES(BODYTYPES) BODYTYPES = fetch_bodytypes_struct(BODYTYPES)
 
 // todo: what are we going to do with these?
 //? we should probably standardize bodytypes as entirely different sprites, and also

code/game/objects/items-inventory-old.dm

@@ -222,6 +222,14 @@
 /obj/item/proc/can_equip(mob/M, slot, mob/user, flags)
 	if(!equip_check_beltlink(M, slot, user, flags))
 		return FALSE
+	if(ishuman(M) && !(flags & INV_OP_FORCE))
+		// todo: put on the mob side maybe?
+		var/mob/living/carbon/human/casted_bodytype_check = M
+		var/their_bodytype = casted_bodytype_check.species.get_effective_bodytype(casted_bodytype_check, src, slot)
+		if(!worn_bodytypes?.contains(their_bodytype) && !worn_bodytypes_fallback?.contains(their_bodytype))
+			if(!(flags & INV_OP_SILENT))
+				to_chat(user || M, SPAN_WARNING("[src] doesn't fit on you."))
+			return FALSE
 	return TRUE
 
 /**

code/game/objects/items-inventory-rendering.dm

@@ -320,7 +320,7 @@
 	var/list/additional = render_additional(M, icon_used, state_used, layer_used, dim_x, dim_y, align_y, bodytype, inhands, slot_meta)
 	// todo: signal with (args, add)
 	// todo: args' indices should be defines
-	var/no_render = inhands? (worn_render_flags & WORN_RENDER_INHAND_NO_RENDER) : ((worn_render_flags & WORN_RENDER_SLOT_NO_RENDER) || CHECK_BODYTYPE(worn_bodytypes_invisible, bodytype))
+	var/no_render = inhands? (worn_render_flags & WORN_RENDER_INHAND_NO_RENDER) : ((worn_render_flags & WORN_RENDER_SLOT_NO_RENDER) || worn_bodytypes_invisible?.contains(bodytype))
 	var/mutable_appearance/MA
 	// worn_state_guard makes us not render if we'd render the same as in-inventory icon.
 	if(no_render)		// don't bother
@@ -423,7 +423,7 @@
 	//* inventory slot defaults
 	else if(inhands? (worn_render_flags & WORN_RENDER_INHAND_ALLOW_DEFAULT) : (worn_render_flags & WORN_RENDER_SLOT_ALLOW_DEFAULT))
 		var/list/resolved = slot_meta.resolve_default_assets(bodytype, data[WORN_DATA_STATE], M, src, inhand_default_type)
-		if(!resolved && (bodytype != BODYTYPE_DEFAULT) && CHECK_BODYTYPE(worn_bodytypes_fallback, bodytype))
+		if(!resolved && (bodytype != BODYTYPE_DEFAULT) && worn_bodytypes_fallback?.contains(bodytype))
 			// attempt 2 - use fallback if available
 			if(!(slot_meta.handle_worn_fallback(bodytype, data)))
 				// attempt 3 - convert to default if specified to convert
@@ -436,7 +436,7 @@
 	//* Now, the actual intended render system.
 	if(!data[WORN_DATA_ICON])
 		// grab icon based on priority
-		if(!inhands && !CHECK_BODYTYPE(worn_bodytypes, bodytype) && CHECK_BODYTYPE(worn_bodytypes_fallback, bodytype) && slot_meta.handle_worn_fallback(bodytype, data))
+		if(!inhands && !worn_bodytypes?.contains(bodytype) && worn_bodytypes_fallback?.contains(bodytype) && slot_meta.handle_worn_fallback(bodytype, data))
 			// special: if bodytypes isn't in, and species has fallback
 			// .. well don't do anything as handle_sprite_fallback will write to the data list.
 		else if(inhands && inhand_icon)
@@ -494,7 +494,7 @@
 	// PRIVATE_PROC(TRUE)
 	if(inhands)
 		return "[base_worn_state(inhands, slot_key, bodytype)][(worn_render_flags & WORN_RENDER_INHAND_ONE_FOR_ALL)? "_all" : "_[slot_key]"]"
-	return "[base_worn_state(inhands, slot_key, bodytype)][(worn_render_flags & WORN_RENDER_SLOT_ONE_FOR_ALL)? "_all" : "_[slot_key]"][((bodytype != BODYTYPE_DEFAULT) && CHECK_BODYTYPE(worn_bodytypes, bodytype))? "_[bodytype_to_string(bodytype)]" : ""]"
+	return "[base_worn_state(inhands, slot_key, bodytype)][(worn_render_flags & WORN_RENDER_SLOT_ONE_FOR_ALL)? "_all" : "_[slot_key]"][((bodytype != BODYTYPE_DEFAULT) && worn_bodytypes?.contains(bodytype))? "_[bodytype_to_string(bodytype)]" : ""]"
 
 /obj/item/proc/base_worn_state(inhands, slot_key, bodytype)
 	if(inhands)

code/modules/clothing/clothing.dm

@@ -188,15 +188,26 @@
 	if(!species_restricted)
 		return //this item doesn't use the species_restricted system
 
-	//Set species_restricted list
-	switch(target_species)
-		if(SPECIES_HUMAN, SPECIES_SKRELL)	//humanoid bodytypes
-			species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN, SPECIES_HUMAN_SPACER, SPECIES_HUMAN_GRAV, SPECIES_HUMAN_VATBORN) //skrell/humans can wear each other's suits
-		if (SPECIES_UNATHI)
-			//For the sake of gameplay, unathi is unathi
-			species_restricted = list(SPECIES_UNATHI, SPECIES_UNATHI_DIGI)
-		else
-			species_restricted = list(target_species)
+	// * temporary *//
+	// this entire proc is pending decommissioning. the new worn_bodytypes system is the
+	// successor, and contains proper non-strict restriction support via fallbacks system
+
+	// for now, we only bother mechnically restricting if it's a very different race; otherwise, we
+	// swap icons if they exist, but do not actually restrict it, so you can actually have
+	// humans wearing lizard suits in the interrim
+
+	// we should also investigate being able to intentionally mis-cycle a suit to something you're not
+	// so you can disguise as a lizard by using a lizard suit as a human or something
+
+	var/static/list/actually_different_species = list(
+		SPECIES_VOX,
+		SPECIES_TESHARI,
+	)
+
+	if(target_species in actually_different_species)
+		species_restricted = list(target_species)
+	else
+		species_restricted = list("exclude") + actually_different_species
 
 	//Set icon
 	LAZYINITLIST(sprite_sheets)

code/modules/clothing/spacesuits/alien.dm

@@ -4,7 +4,6 @@
 	desc = "Smoothly contoured and polished to a shine. Still looks like a fishbowl."
 	armor_type = /datum/armor/skrell/space/light
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)
 
 /obj/item/clothing/head/helmet/space/skrell/white
 	icon_state = "skrell_helmet_white"
@@ -19,7 +18,6 @@
 	allowed = list(/obj/item/flashlight,/obj/item/tank,/obj/item/storage/bag/ore,/obj/item/t_scanner,/obj/item/pickaxe, /obj/item/rcd)
 	heat_protection_cover = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = list(SPECIES_SKRELL,SPECIES_HUMAN)
 
 /obj/item/clothing/suit/space/skrell/white
 	icon_state = "skrell_suit_white"

code/modules/clothing/spacesuits/void/void.dm

@@ -16,7 +16,6 @@
 //	inv_hide_flags = HIDEEARS|BLOCKHAIR
 
 	//Species-specific stuff.
-	species_restricted = list(SPECIES_HUMAN, SPECIES_PROMETHEAN, SPECIES_ALRAUNE, SPECIES_PHORONOID)
 	sprite_sheets_refit = list(
 		SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/helmet.dmi',
 		SPECIES_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/head.dmi',
@@ -49,7 +48,6 @@
 	min_pressure_protection = 0 * ONE_ATMOSPHERE
 	max_pressure_protection = 10 * ONE_ATMOSPHERE
 
-	species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN, SPECIES_PHORONOID) //phoronoids are more humanoid than skrell!!
 	sprite_sheets_refit = list(
 		SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/suits.dmi',
 		SPECIES_UNATHI_DIGI = 'icons/mob/clothing/species/unathidigi/suits.dmi',

code/modules/clothing/spacesuits/void/void_vr.dm

@@ -49,29 +49,6 @@
 /obj/item/clothing/suit/space/void/explorer
 	desc = "A classy red voidsuit for the needs of any semi-retro-futuristic spaceperson! This one is rather loose fitting."
 	helmet_type = /obj/item/clothing/head/helmet/space/void/explorer
-	species_restricted = list(
-		SPECIES_AKULA,
-		SPECIES_ALRAUNE,
-		SPECIES_APIDAEN,
-		SPECIES_AURIL,
-		SPECIES_DREMACHIR,
-		SPECIES_HUMAN,
-		SPECIES_NEVREAN,
-		SPECIES_RAPALA,
-		SPECIES_SERGAL,
-		SPECIES_SKRELL,
-		SPECIES_TAJ,
-		SPECIES_TESHARI,
-		SPECIES_UNATHI,
-		SPECIES_UNATHI_DIGI,
-		SPECIES_VASILISSAN,
-		SPECIES_VOX,
-		SPECIES_VULPKANIN,
-		SPECIES_XENOCHIMERA,
-		SPECIES_XENOHYBRID,
-		SPECIES_ZORREN_FLAT,
-		SPECIES_ZORREN_HIGH,
-	)
 
 /obj/item/clothing/suit/space/void/explorer/Initialize(mapload)
 	. = ..()
@@ -80,29 +57,6 @@
 
 /obj/item/clothing/head/helmet/space/void/explorer
 	desc = "A helmet that matches a red voidsuit! So classy."
-	species_restricted = list(
-		SPECIES_AKULA,
-		SPECIES_ALRAUNE,
-		SPECIES_APIDAEN,
-		SPECIES_AURIL,
-		SPECIES_DREMACHIR,
-		SPECIES_HUMAN,
-		SPECIES_NEVREAN,
-		SPECIES_RAPALA,
-		SPECIES_SERGAL,
-		SPECIES_SKRELL,
-		SPECIES_TAJ,
-		SPECIES_TESHARI,
-		SPECIES_UNATHI,
-		SPECIES_UNATHI_DIGI,
-		SPECIES_VASILISSAN,
-		SPECIES_VOX,
-		SPECIES_VULPKANIN,
-		SPECIES_XENOCHIMERA,
-		SPECIES_XENOHYBRID,
-		SPECIES_ZORREN_FLAT,
-		SPECIES_ZORREN_HIGH,
-	)
 
 /obj/item/clothing/head/helmet/space/void/explorer/Initialize(mapload)
 	. = ..()

code/modules/clothing/spacesuits/void/xeno/plasman.dm

@@ -23,7 +23,6 @@
 		|ACCESSORY_SLOT_ARMBAND\
 		|ACCESSORY_SLOT_TIE\
 		|ACCESSORY_SLOT_OVER) // snowflake decorating i guess
-	species_restricted = list(SPECIES_HUMAN, SPECIES_PHORONOID) //if phoronoids can fit in human suits then...
 	starts_with_helmet = TRUE
 	helmet_type = /obj/item/clothing/head/helmet/space/void/plasman
 
@@ -45,7 +44,6 @@
 	light_overlay = "plasmaman_overlay"
 	weight = ITEM_WEIGHT_PHORONOID_HELMET
 	encumbrance = ITEM_ENCUMBRANCE_PHORONOID_HELMET
-	species_restricted = list(SPECIES_HUMAN, SPECIES_PHORONOID)
 	var/analyzing = FALSE
 
 /obj/item/clothing/head/helmet/space/void/plasman/examine()

code/modules/clothing/spacesuits/void/zaddat.dm

@@ -8,8 +8,6 @@
 	armor_type = /datum/armor/zaddat
 	siemens_coefficient = 1
 
-	species_restricted = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN) //on request from maintainer
-
 /obj/item/clothing/suit/space/void/zaddat
 	name = "\improper Hegemony Shroud"
 	desc = "A Hegemony environment suit, still favored by the Spacer Zaddat because of its durability and ease of manufacture."
@@ -20,8 +18,6 @@
 	helmet = new/obj/item/clothing/head/helmet/space/void/zaddat //shrouds come with helmets built-in
 	var/has_been_customized = FALSE
 
-	species_restricted = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN)
-
 	breach_threshold = 12
 
 /obj/item/clothing/suit/space/void/zaddat/verb/custom_suit()

code/modules/clothing/suits/aliens/tajara.dm

@@ -28,7 +28,6 @@
 	body_cover_flags = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	allowed = list(/obj/item/gun,/obj/item/material/sword)
 	inv_hide_flags = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
-	species_restricted = list(SPECIES_TAJ)
 	armor_type = /datum/armor/general/medieval
 	weight = ITEM_WEIGHT_TAJARAN_SWORDSMAN_ARMOR
 	encumbrance = ITEM_ENCUMBRANCE_TAJARAN_SWORDSMAN_ARMOR
@@ -166,7 +165,6 @@
 	icon_override = 'icons/mob/clothing/species/tajaran/coats.dmi'
 	icon_state = "tajscrubs"
 	hoodtype = /obj/item/clothing/head/hood/tajaran/surgery
-	species_restricted = list(SPECIES_TAJ)
 
 //Cloaks
 /obj/item/clothing/suit/storage/hooded/tajaran/cloak
@@ -244,7 +242,6 @@
 	icon_state = "tajscrubs_hood"
 	body_cover_flags = HEAD
 	inv_hide_flags = HIDEEARS|BLOCKHAIR
-	species_restricted = list(SPECIES_TAJ)
 
 /obj/item/clothing/head/hood/tajaran/cloak/amohda
 	name = "Amohdan cloak hood"