shrivel

shiptest-ss13 · Nov 5, 2023 · 896244b · 896244b
1 parent 1a6cabc
commit 896244b
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 11 deletions.
diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -3504,7 +3504,7 @@
 	pixel_x = -28
 	},
 /obj/item/clothing/under/rank/command/captain,
-/obj/item/clothing/under/rank/command/lieutenant,
+/obj/item/clothing/under/rank/command,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/shoes/cowboy/black,
 /obj/item/clothing/suit/armor/vest/capcarapace/alt,

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -414,7 +414,7 @@
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/head/beret/lt(src)
 	new /obj/item/clothing/head/beret/black(src)
-	new /obj/item/clothing/under/rank/command/lieutenant(src)
-	new /obj/item/clothing/under/rank/command/lieutenant/skirt(src)
-	new /obj/item/clothing/under/rank/command/lieutenant/nt(src)
-	new /obj/item/clothing/under/rank/command/lieutenant/nt/skirt(src)
+	new /obj/item/clothing/under/rank/command(src)
+	new /obj/item/clothing/under/rank/command/skirt(src)
+	new /obj/item/clothing/under/rank/command/nt(src)
+	new /obj/item/clothing/under/rank/command/nt/skirt(src)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
@@ -389,7 +389,7 @@
 
 	id = /obj/item/card/id/silver
 	head = /obj/item/clothing/head/beret/lt
-	uniform = /obj/item/clothing/under/rank/command/lieutenant
+	uniform = /obj/item/clothing/under/rank/command
 	alt_uniform = /obj/item/clothing/under/rank/command
 	suit = /obj/item/clothing/suit/toggle/lieutenant
 	alt_suit = /obj/item/clothing/suit/armor/lieutenant_trenchcoat

diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm
@@ -20,7 +20,7 @@
 /obj/item/clothing/under/rank/command/nt/skirt
 	desc = "A standard command jumpskirt."
 	name = "command jumpskirt"
-	icon_state = "cmd_skirt"
+	icon_state = "cmd_nt_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
 
@@ -113,27 +113,27 @@
 
 //Lieutenant
 
-/obj/item/clothing/under/rank/command/lieutenant
+/obj/item/clothing/under/rank/command
 	desc = "A standard command jumpsuit in the colours of the Lieutenant."
 	name = "\improper lieutenant jumpsuit"
 	icon_state = "lt"
 	can_adjust = FALSE
 
-/obj/item/clothing/under/rank/command/lieutenant/skirt
+/obj/item/clothing/under/rank/command/skirt
 	desc = "A command jumpskirt in the colours of the Lieutenant."
 	name = "\improper lieutenant jumpskirt"
 	icon_state = "lt_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
 
-/obj/item/clothing/under/rank/command/lieutenant/nt
+/obj/item/clothing/under/rank/command/nt
 	desc = "A standard command jumpsuit in the colours of the Lieutenant."
 	name = "\improper lieutenant blue jumpsuit"
 	icon_state = "lt_nt"
 	item_state = "b_suit"
 
-/obj/item/clothing/under/rank/command/lieutenant/nt/skirt
+/obj/item/clothing/under/rank/command/nt/skirt
 	desc = "A command jumpskirt in the colours of the Lieutenant."
 	name = "\improper lieutenant blue jumpskirt"
 	icon_state = "lt_nt_skirt"

diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
diff --git a/icons/mob/clothing/under/command.dmi b/icons/mob/clothing/under/command.dmi
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
diff --git a/icons/obj/clothing/under/command.dmi b/icons/obj/clothing/under/command.dmi