Belts and some select belt slot items no longer require a jumpsuit to wear (#23038)

* Why wear clothes when you can wear belts?

* Converted the ignore_under var into a flag

code/__DEFINES/flags.dm

@@ -81,6 +81,8 @@
 #define CRITICAL_ATOM_2			(1<<18)
 /// Use this flag for items that can block randomly
 #define RANDOM_BLOCKER_2		(1<<19)
+/// This flag allows for wearing of a belt item, even if you're not wearing a jumpsuit
+#define ALLOW_BELT_NO_JUMPSUIT_2	(1<<20)
 
 //Reagent flags
 #define REAGENT_NOREACT			1

code/game/objects/items/toys.dm

@@ -259,6 +259,7 @@
 	item_state = "katana"
 	flags = CONDUCT
 	slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
 	force = 5
 	throwforce = 5
 	w_class = WEIGHT_CLASS_NORMAL
@@ -441,6 +442,7 @@
 	item_state = "inflatable"
 	icon = 'icons/obj/clothing/belts.dmi'
 	slot_flags = SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
 
 /*
  * Fake meteor

code/game/objects/items/weapons/defib.dm

@@ -209,6 +209,7 @@
 	sprite_sheets = null //Because Vox had the belt defibrillator sprites in back.dm
 	w_class = WEIGHT_CLASS_NORMAL
 	slot_flags = SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
 	origin_tech = "biotech=5"
 
 /obj/item/defibrillator/compact/loaded/Initialize(mapload)

code/game/objects/items/weapons/storage/belt.dm

@@ -7,6 +7,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
 	slot_flags = SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 | BLOCKS_LIGHT_2
 	attack_verb = list("whipped", "lashed", "disciplined")
 	max_integrity = 300
 	equip_sound = 'sound/items/equip/toolbelt_equip.ogg'

code/game/objects/items/weapons/stunbaton.dm

@@ -294,6 +294,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	hitcost = 2000
 	slot_flags = SLOT_FLAG_BACK | SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
 	var/obj/item/assembly/igniter/sparkler = null
 
 /obj/item/melee/baton/cattleprod/Initialize(mapload)

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -104,6 +104,7 @@
 	icon_state = "plasmaman_tank_belt"
 	item_state = "plasmaman_tank_belt"
 	slot_flags = SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
 	force = 5
 	volume = 35
 	w_class = WEIGHT_CLASS_SMALL
@@ -131,6 +132,7 @@
 	icon_state = "emergency"
 	flags = CONDUCT
 	slot_flags = SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
 	w_class = WEIGHT_CLASS_SMALL
 	force = 4
 	distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE

code/game/objects/items/weapons/weaponry.dm

@@ -83,6 +83,7 @@
 	item_state = "katana"
 	flags = CONDUCT
 	slot_flags = SLOT_FLAG_BELT | SLOT_FLAG_BACK
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
 	force = 40
 	throwforce = 10
 	sharp = TRUE

code/modules/martial_arts/judo.dm

@@ -18,6 +18,7 @@
 	icon_state = "judobelt"
 	item_state = "judo"
 	slot_flags = SLOT_FLAG_BELT
+	flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
 	w_class = WEIGHT_CLASS_BULKY
 	var/datum/martial_art/judo/style
 

code/modules/mob/living/carbon/human/human_inventory.dm

@@ -87,7 +87,7 @@
 			unEquip(l_store, 1)
 		if(wear_id)
 			unEquip(wear_id)
-		if(belt)
+		if(belt && !(belt.flags_2 & ALLOW_BELT_NO_JUMPSUIT_2))
 			unEquip(belt)
 		w_uniform = null
 		update_inv_w_uniform()

code/modules/mob/living/carbon/human/human_update_icons.dm

@@ -614,7 +614,8 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
 		standing.alpha = w_uniform.alpha
 		standing.color = w_uniform.color
 		overlays_standing[UNIFORM_LAYER] = standing
-	else if(!dna.species.nojumpsuit)
+	//If anyone asks, /mob/living/carbon/human/unEquip in human_inventory.dm already handles unequip code
+	/* else if(!dna.species.nojumpsuit)
 		var/list/uniform_slots = list()
 		var/obj/item/organ/external/L = get_organ(BODY_ZONE_L_LEG)
 		if(!(L?.status & ORGAN_ROBOT))
@@ -639,7 +640,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
 					thing.forceMove(drop_location())											//
 					thing.dropped(src)															//
 					thing.layer = initial(thing.layer)
-					thing.plane = initial(thing.plane)
+					thing.plane = initial(thing.plane) */
 	apply_overlay(UNIFORM_LAYER)
 	update_hands_layer()
 

code/modules/mob/living/carbon/human/species/_species.dm

@@ -757,7 +757,7 @@
 				return FALSE
 			var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
 
-			if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT))
+			if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT) && !(I.flags_2 & ALLOW_BELT_NO_JUMPSUIT_2))
 				if(!disable_warning)
 					to_chat(H, "<span class='alert'>You need a jumpsuit before you can attach this [I.name].</span>")
 				return FALSE