lizard

yogstation13 · May 3, 2024 · 7e86641 · 7e86641
1 parent 9106593
commit 7e86641
Show file tree

Hide file tree

Showing 193 changed files with 2,463 additions and 2,500 deletions.
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -4942,7 +4942,7 @@
 "apN" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
 /obj/item/clothing/under/rank/curator/treasure_hunter,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/dress/skirt/black,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/accessory/armband/deputy,
@@ -16973,11 +16973,11 @@
 /turf/open/floor/plasteel,
 /area/centcom/control)
 "aOU" = (
-/obj/item/clothing/under/jabroni,
-/obj/item/clothing/under/geisha,
-/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/costume/jabroni,
+/obj/item/clothing/under/costume/geisha,
+/obj/item/clothing/under/costume/kilt,
 /obj/structure/closet,
-/obj/item/clothing/under/roman,
+/obj/item/clothing/under/costume/roman,
 /turf/open/floor/wood,
 /area/centcom/holding)
 "aOV" = (

diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
@@ -121,8 +121,7 @@
 #define YES_DIGIT		 	2
 
 //flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts
-#define NO_MUTANTRACE_VARIATION		0
-#define MUTANTRACE_VARIATION		1
+#define DIGITIGRADE_VARIATION (1<<0)
 
 #define NOT_DIGITIGRADE				0
 #define FULL_DIGITIGRADE			1

diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm
@@ -59,12 +59,12 @@ SUBSYSTEM_DEF(traumas)
 
 						"spiders"   = typecacheof(list(/obj/structure/spider)),
 
-					   "security"  = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden,
-											 	 /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/det,
+					   "security"  = typecacheof(list(/obj/item/clothing/under/rank/security/officer, /obj/item/clothing/under/rank/security/warden,
+											 	 /obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/security/detective,
 												 /obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/restraints/handcuffs,
 												 /obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),
 
-					  "clowns"    = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes,
+					  "clowns"    = typecacheof(list(/obj/item/clothing/under/rank/civilian/clown, /obj/item/clothing/shoes/clown_shoes,
 												 /obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
 												 /obj/item/pda/clown, /obj/item/grown/bananapeel, /obj/item/reagent_containers/food/snacks/cheesiehonkers,
 												 /obj/item/trash/cheesie)),
@@ -78,12 +78,13 @@ SUBSYSTEM_DEF(traumas)
 					  "skeletons" = typecacheof(list(/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
 												 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton,
 												 /obj/effect/decal/remains/human)),
-				   "conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_security,
-												 /obj/item/clothing/under/rank/chief_engineer, /obj/item/clothing/under/rank/chief_medical_officer,
-												 /obj/item/clothing/under/rank/head_of_personnel, /obj/item/clothing/under/rank/research_director,
-												 /obj/item/clothing/under/rank/head_of_security/grey, /obj/item/clothing/under/rank/head_of_security/alt,
-												 /obj/item/clothing/under/rank/research_director/alt, /obj/item/clothing/under/rank/research_director/turtleneck,
-												 /obj/item/clothing/under/captainparade, /obj/item/clothing/under/hosparademale, /obj/item/clothing/under/hosparadefem,
+				   "conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/command/captain, /obj/item/clothing/under/rank/security/head_of_security,
+												 /obj/item/clothing/under/rank/engineering/chief_engineer, /obj/item/clothing/under/rank/medical/chief_medical_officer,
+												 /obj/item/clothing/under/rank/command/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
+												 /obj/item/clothing/under/rank/security/head_of_security/grey, /obj/item/clothing/under/rank/security/head_of_security/alt,
+												 /obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
+												 /obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/hosparademale,
+												 /obj/item/clothing/under/rank/security/head_of_security/hosparadefem,
 												 /obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/abductor/baton,
 												 /obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
 												 /obj/item/abductor/gizmo, /obj/item/clothing/under/rank/centcom_officer,
@@ -94,18 +95,18 @@ SUBSYSTEM_DEF(traumas)
 						"robots"   = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule, /obj/machinery/recharge_station,
 						           /obj/item/aicard, /obj/structure/swarmer_beacon)),
 
-						"doctors"   = typecacheof(list(/obj/item/clothing/under/rank/medical, /obj/item/clothing/under/rank/chemist,
-						/obj/item/clothing/under/rank/nursesuit, /obj/item/clothing/under/rank/chief_medical_officer,
+						"doctors"   = typecacheof(list(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/chemist,
+						/obj/item/clothing/under/rank/medical/nursesuit, /obj/item/clothing/under/rank/medical/chief_medical_officer,
 						/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/autoinjector,
 						/obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer,
 						/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
 						/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes,
 						/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
 						/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
 
-						"authority"   = typecacheof(list(/obj/item/clothing/under/rank/captain,  /obj/item/clothing/under/rank/head_of_personnel,
-						/obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/research_director,
-						/obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/rank/chief_engineer,
+						"authority"   = typecacheof(list(/obj/item/clothing/under/rank/command/captain,  /obj/item/clothing/under/rank/command/head_of_personnel,
+						/obj/item/clothing/under/rank/security/head_of_security, /obj/item/clothing/under/rank/rnd/research_director,
+						/obj/item/clothing/under/rank/medical/chief_medical_officer, /obj/item/clothing/under/rank/engineering/chief_engineer,
 						/obj/item/clothing/under/rank/centcom_officer, /obj/item/clothing/under/rank/centcom_commander,
 						/obj/item/melee/classic_baton/telescopic, /obj/item/card/id/silver, /obj/item/card/id/gold,
 						/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
@@ -122,7 +123,7 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/clothing/suit/wizrobe, /obj/item/clothing/head/wizard, /obj/item/spellbook, /obj/item/staff,
 						/obj/item/clothing/head/wizard/armor, /obj/item/clothing/suit/space/hardsuit/wizard,
 						/obj/item/gun/magic/staff, /obj/item/gun/magic/wand,
-						/obj/item/nullrod, /obj/item/clothing/under/rank/chaplain)),
+						/obj/item/nullrod, /obj/item/clothing/under/rank/civilian/chaplain)),
 
 						"aliens"   = typecacheof(list(/obj/item/clothing/mask/facehugger, /obj/item/organ/body_egg/alien_embryo,
 						/obj/structure/alien, /obj/item/toy/toy_xeno,
@@ -136,11 +137,11 @@ SUBSYSTEM_DEF(traumas)
 
 						"birds" = typecacheof(list(/obj/item/clothing/mask/gas/plaguedoctor, /obj/item/reagent_containers/food/snacks/cracker,
 						/obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
-						/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask,
-						/obj/item/clothing/under/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
+						/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask,
+						/obj/item/clothing/under/costume/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
 						/obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)),
 
-					   "anime" = typecacheof(list(/obj/item/clothing/under/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
+					   "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
 					   /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
 					   /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/vibro_weapon, /obj/item/horrortentacle,
 					   /obj/item/nullrod/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe))

diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
@@ -18,7 +18,7 @@
 
 /datum/crafting_recipe/durathread_jumpsuit
 	name = "Durathread Jumpsuit"
-	result = /obj/item/clothing/under/durathread
+	result = /obj/item/clothing/under/rank/civilian/hydroponics/durathread
 	reqs = list(/obj/item/stack/sheet/cloth/durathread = 4)
 	time = 4 SECONDS
 	category = CAT_CLOTHING // Can be technically considered armor since it gives protection (similar-ish to security jumpsuit).
@@ -119,19 +119,19 @@
 
 /datum/crafting_recipe/mummy/body
 	name = "Mummification Bandages (Body)"
-	result = /obj/item/clothing/under/mummy
+	result = /obj/item/clothing/under/costume/mummy
 	reqs = list(/obj/item/stack/sheet/cloth = 5)
 
 /datum/crafting_recipe/chestwrap
 	name = "Loincloth and Chestwrap"
-	result = /obj/item/clothing/under/chestwrap
+	result = /obj/item/clothing/under/tribal/chestwrap
 	time = 3 SECONDS
 	reqs = list(/obj/item/stack/sheet/leather = 1)
 	category = CAT_CLOTHING
 
 /datum/crafting_recipe/raider_leather
 	name = "Scavenged Rags"
-	result = /obj/item/clothing/under/raider_leather
+	result = /obj/item/clothing/under/tribal/raider_leather
 	time = 3 SECONDS
 	reqs = list(/obj/item/stack/sheet/metal = 1,
 				/obj/item/stack/rods = 2, 
@@ -150,37 +150,37 @@
 
 /datum/crafting_recipe/ash_robe
 	name = "Tribal Robes"
-	result = /obj/item/clothing/under/ash_robe
+	result = /obj/item/clothing/under/tribal/ash_robe
 	time = 3 SECONDS
 	reqs = list(/obj/item/stack/sheet/cloth = 2)
 	category = CAT_CLOTHING
 	always_available = FALSE
 
 /datum/crafting_recipe/ash_robe/young
 	name = "Tribal Rags"
-	result = /obj/item/clothing/under/ash_robe/young
+	result = /obj/item/clothing/under/tribal/ash_robe/young
 
 /datum/crafting_recipe/ash_robe/hunter
 	name = "Hunter Tribal Rags"
-	result = /obj/item/clothing/under/ash_robe/hunter
+	result = /obj/item/clothing/under/tribal/ash_robe/hunter
 
 /datum/crafting_recipe/ash_robe/chief
 	name = "Chief Tribal Rags"
-	result = /obj/item/clothing/under/ash_robe/chief
+	result = /obj/item/clothing/under/tribal/ash_robe/chief
 
 /datum/crafting_recipe/ash_robe/shaman
 	name = "Shaman Tribal Rags"
-	result = /obj/item/clothing/under/ash_robe/shaman
+	result = /obj/item/clothing/under/tribal/ash_robe/shaman
 
 /datum/crafting_recipe/ash_robe/tunic
 	name = "Tribal Tunic"
-	result = /obj/item/clothing/under/ash_robe/tunic
+	result = /obj/item/clothing/under/tribal/ash_robe/tunic
 	reqs = list(/obj/item/stack/sheet/cloth = 2,
 				/obj/item/stack/sheet/leather = 1)
 
 /datum/crafting_recipe/ash_robe/dress
 	name = "Tribal Dress"
-	result = /obj/item/clothing/under/ash_robe/dress
+	result = /obj/item/clothing/under/tribal/ash_robe/dress
 	reqs = list(/obj/item/stack/sheet/cloth = 3)
 
 /datum/crafting_recipe/shamanash

diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
@@ -217,7 +217,7 @@ GLOBAL_VAR(changeling_team_objective_type)
 		new_flesh_item.lefthand_file = chosen_prof.lefthand_file_list[slot]
 		new_flesh_item.righthand_file = chosen_prof.righthand_file_list[slot]
 		new_flesh_item.item_state = chosen_prof.inhand_icon_state_list[slot]
-		new_flesh_item.mob_overlay_icon = chosen_prof.worn_icon_list[slot]
+		new_flesh_item.worn_icon = chosen_prof.worn_icon_list[slot]
 		new_flesh_item.worn_icon_state = chosen_prof.worn_icon_state_list[slot]
 
 		if(equip)

diff --git a/code/game/gamemodes/clown_ops/bananium_bomb.dm b/code/game/gamemodes/clown_ops/bananium_bomb.dm
@@ -53,7 +53,7 @@
 		H.Stun(10)
 		var/obj/item/clothing/C
 		if(!H.w_uniform || H.dropItemToGround(H.w_uniform))
-			C = new /obj/item/clothing/under/rank/clown(H)
+			C = new /obj/item/clothing/under/rank/civilian/clown(H)
 			ADD_TRAIT(C, TRAIT_NODROP, CLOWN_NUKE_TRAIT)
 			H.equip_to_slot_or_del(C, ITEM_SLOT_ICLOTHING)
 

diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
@@ -10,19 +10,19 @@ GLOBAL_LIST_INIT(dye_registry, list(
 		DYE_BLACK = /obj/item/clothing/under/color/black,
 		DYE_WHITE = /obj/item/clothing/under/color/white,
 		DYE_RAINBOW = /obj/item/clothing/under/color/rainbow,
-		DYE_MIME = /obj/item/clothing/under/rank/mime,
-		DYE_CLOWN = /obj/item/clothing/under/rank/clown,
-		DYE_LAW = /obj/item/clothing/under/lawyer/blacksuit,
-		DYE_CAPTAIN = /obj/item/clothing/under/rank/captain,
-		DYE_HOP = /obj/item/clothing/under/rank/head_of_personnel,
-		DYE_HOS = /obj/item/clothing/under/rank/head_of_security,
-		DYE_CE = /obj/item/clothing/under/rank/chief_engineer,
-		DYE_RD = /obj/item/clothing/under/rank/research_director,
-		DYE_CMO = /obj/item/clothing/under/rank/chief_medical_officer,
-		DYE_REDCOAT = /obj/item/clothing/under/redcoat,
+		DYE_MIME = /obj/item/clothing/under/rank/civilian/mime,
+		DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown,
+		DYE_LAW = /obj/item/clothing/under/rank/civilian/lawyer/blacksuit,
+		DYE_CAPTAIN = /obj/item/clothing/under/rank/command/captain,
+		DYE_HOP = /obj/item/clothing/under/rank/command/head_of_personnel,
+		DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security,
+		DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer,
+		DYE_RD = /obj/item/clothing/under/rank/rnd/research_director,
+		DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer,
+		DYE_REDCOAT = /obj/item/clothing/under/costume/redcoat,
 		DYE_SYNDI = /obj/item/clothing/under/syndicate/tacticool,
 		DYE_CENT = /obj/item/clothing/under/rank/centcom_officer,
-		DYE_QM = /obj/item/clothing/under/rank/cargo
+		DYE_QM = /obj/item/clothing/under/rank/cargo/qm
 	),
 	DYE_REGISTRY_JUMPSKIRT = list(
 		DYE_RED = /obj/item/clothing/under/skirt/color/red,
@@ -33,15 +33,15 @@ GLOBAL_LIST_INIT(dye_registry, list(
 		DYE_PURPLE = /obj/item/clothing/under/skirt/color/lightpurple,
 		DYE_BLACK = /obj/item/clothing/under/skirt/color/black,
 		DYE_WHITE = /obj/item/clothing/under/skirt/color/white,
-		DYE_MIME = /obj/item/clothing/under/rank/mime/skirt,
-		DYE_LAW = /obj/item/clothing/under/lawyer/blacksuit/skirt,
-		DYE_CAPTAIN = /obj/item/clothing/under/rank/captain/skirt,
-		DYE_HOP = /obj/item/clothing/under/rank/head_of_personnel/skirt,
-		DYE_HOS = /obj/item/clothing/under/rank/head_of_security/skirt,
-		DYE_CE = /obj/item/clothing/under/rank/chief_engineer/skirt,
-		DYE_RD = /obj/item/clothing/under/rank/research_director/skirt,
-		DYE_CMO = /obj/item/clothing/under/rank/chief_medical_officer/skirt,
-		DYE_QM = /obj/item/clothing/under/rank/cargo/skirt
+		DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt,
+		DYE_LAW = /obj/item/clothing/under/rank/civilian/lawyer/blacksuit/skirt,
+		DYE_CAPTAIN = /obj/item/clothing/under/rank/command/captain/skirt,
+		DYE_HOP = /obj/item/clothing/under/rank/command/head_of_personnel/skirt,
+		DYE_HOS = /obj/item/clothing/under/rank/security/head_of_security/skirt,
+		DYE_CE = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt,
+		DYE_RD = /obj/item/clothing/under/rank/rnd/research_director/skirt,
+		DYE_CMO = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt,
+		DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt
 	),
 	DYE_REGISTRY_GLOVES = list(
 		DYE_RED = /obj/item/clothing/gloves/color/red,
@@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
 			lefthand_file = initial(target_type.lefthand_file)
 			righthand_file = initial(target_type.righthand_file)
 			item_state = initial(target_type.item_state)
-			mob_overlay_icon = initial(target_type.mob_overlay_icon)
+			worn_icon = initial(target_type.worn_icon)
 			worn_icon_state = initial(target_type.worn_icon_state)
 			inhand_x_dimension = initial(target_type.inhand_x_dimension)
 			inhand_y_dimension = initial(target_type.inhand_y_dimension)