diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index 32f5bcd4fc8..a679783c4b2 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -30,7 +30,7 @@ /obj/effect/spawner/costume/madscientist name = "mad scientist costume spawner" items = list( - /obj/item/clothing/under/rank/captain/suit, + /obj/item/clothing/under/costume/captain, /obj/item/clothing/head/flatcap, /obj/item/clothing/suit/toggle/labcoat/mad, ) @@ -38,7 +38,7 @@ /obj/effect/spawner/costume/elpresidente name = "el presidente costume spawner" items = list( - /obj/item/clothing/under/rank/captain/suit, + /obj/item/clothing/under/costume/captain, /obj/item/clothing/head/flatcap, /obj/item/cigarette/cigar/havana, /obj/item/clothing/shoes/jackboots, diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 0a4b401848b..fa7390b794b 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -513,3 +513,36 @@ armor_type = /datum/armor/clothing_under/rank_security has_sensor = NO_SENSORS +/obj/item/clothing/under/costume/captain + name = "captain's suit" + desc = "A green suit and yellow necktie. Exemplifies authority." + icon_state = "green_suit" + inhand_icon_state = "dg_suit" + can_adjust = FALSE + +/obj/item/clothing/under/costume/captain/skirt + name = "green suitskirt" + desc = "A green suitskirt and yellow necktie. Exemplifies authority." + icon_state = "green_suit_skirt" + inhand_icon_state = "dg_suit" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/costume/head_of_personnel + name = "head of personnel's suit" + desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble." + icon_state = "teal_suit" + inhand_icon_state = "g_suit" + can_adjust = FALSE + +/obj/item/clothing/under/costume/head_of_personnel/skirt + name = "teal suitskirt" + desc = "A teal suitskirt and yellow necktie. An authoritative yet tacky ensemble." + icon_state = "teal_suit_skirt" + inhand_icon_state = "g_suit" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/code/modules/clothing/under/jobs/civilian/civilian.dm b/code/modules/clothing/under/jobs/civilian/civilian.dm index 4aa1e7bc1e0..86ea0a9e452 100644 --- a/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -44,23 +44,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/rank/civilian/head_of_personnel/suit - name = "head of personnel's suit" - desc = "A teal suit and yellow necktie. An authoritative yet tacky ensemble." - icon_state = "teal_suit" - inhand_icon_state = "g_suit" - can_adjust = FALSE - -/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt - name = "teal suitskirt" - desc = "A teal suitskirt and yellow necktie. An authoritative yet tacky ensemble." - icon_state = "teal_suit_skirt" - inhand_icon_state = "g_suit" - body_parts_covered = CHEST|GROIN|ARMS - dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/rank/civilian/hydroponics desc = "It's a jumpsuit designed to protect against minor plant-related hazards." name = "botanist's jumpsuit" diff --git a/code/modules/clothing/under/jobs/command.dm b/code/modules/clothing/under/jobs/command.dm index 2969eabc63c..3016eb9fa2c 100644 --- a/code/modules/clothing/under/jobs/command.dm +++ b/code/modules/clothing/under/jobs/command.dm @@ -22,23 +22,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/rank/captain/suit - name = "captain's suit" - desc = "A green suit and yellow necktie. Exemplifies authority." - icon_state = "green_suit" - inhand_icon_state = "dg_suit" - can_adjust = FALSE - -/obj/item/clothing/under/rank/captain/suit/skirt - name = "green suitskirt" - desc = "A green suitskirt and yellow necktie. Exemplifies authority." - icon_state = "green_suit_skirt" - inhand_icon_state = "dg_suit" - body_parts_covered = CHEST|GROIN|ARMS - dying_key = DYE_REGISTRY_JUMPSKIRT - female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY - supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON - /obj/item/clothing/under/rank/captain/parade name = "captain's parade uniform" desc = "A captain's luxury-wear, for special occasions." diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 70eef00785e..5f388987a4b 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -5,14 +5,6 @@ female_sprite_flags = FEMALE_UNIFORM_NO_BREASTS inhand_icon_state = null -/obj/item/clothing/under/suit/green - name = "green suit" - desc = "A green suit and yellow necktie. Baller." - icon = 'icons/obj/clothing/under/captain.dmi' - icon_state = "green_suit" - inhand_icon_state = "dg_suit" - worn_icon = 'icons/mob/clothing/under/captain.dmi' - /obj/item/clothing/under/suit/red //Also used by the Curator's suit, /obj/item/clothing/under/rank/civilian/curator name = "red suit" desc = "A red suit and blue tie. Somewhat formal." diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index ffdf0bd5aa0..645d249d404 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -94,8 +94,8 @@ GLOBAL_LIST_INIT(autodrobe_entretainers_items, list( )) GLOBAL_LIST_INIT(autodrobe_fancy_items, list( - /obj/item/clothing/under/rank/captain/suit = 1, - /obj/item/clothing/under/rank/captain/suit/skirt = 1, + /obj/item/clothing/under/costume/captain = 1, + /obj/item/clothing/under/costume/captain/skirt = 1, /obj/item/clothing/under/costume/seifuku = 3, /obj/item/clothing/under/costume/seifuku/red = 3, /obj/item/clothing/under/costume/seifuku/teal = 3, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index c0ce26b5ca2..f5669329cfd 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -120,8 +120,8 @@ /obj/item/clothing/suit/costume/poncho = 3, /obj/item/clothing/under/dress/skirt = 3, /obj/item/clothing/under/suit/white/skirt = 3, - /obj/item/clothing/under/rank/captain/suit/skirt = 2, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2, + /obj/item/clothing/under/costume/captain/skirt = 2, + /obj/item/clothing/under/costume/head_of_personnel/skirt = 2, /obj/item/clothing/under/rank/civilian/purple_bartender = 2, /obj/item/clothing/suit/jacket/miljacket = 3, /obj/item/clothing/suit/apron/overalls = 3, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 6886c1ae418..241a5eafa83 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -328,10 +328,10 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE) /obj/item/clothing/glasses/regular/jamjar = 1, /obj/item/clothing/under/rank/civilian/curator = 1, /obj/item/clothing/under/rank/civilian/curator/skirt = 1, - /obj/item/clothing/under/rank/captain/suit = 1, - /obj/item/clothing/under/rank/captain/suit/skirt = 1, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit = 1, - /obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 1, + /obj/item/clothing/under/costume/captain = 1, + /obj/item/clothing/under/costume/captain/skirt = 1, + /obj/item/clothing/under/costume/head_of_personnel = 1, + /obj/item/clothing/under/costume/head_of_personnel/skirt = 1, /obj/item/clothing/suit/toggle/lawyer/greyscale = 1, /obj/item/storage/backpack/satchel/explorer = 1, /obj/item/storage/backpack/messenger/explorer = 1, diff --git a/icons/mob/clothing/under/captain.dmi b/icons/mob/clothing/under/captain.dmi index 4a6a2f337a1..49de8ab784e 100644 Binary files a/icons/mob/clothing/under/captain.dmi and b/icons/mob/clothing/under/captain.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index 44193562364..0aeebe27c32 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/mob/clothing/under/costume.dmi b/icons/mob/clothing/under/costume.dmi index cb3aa993571..7d19612486c 100644 Binary files a/icons/mob/clothing/under/costume.dmi and b/icons/mob/clothing/under/costume.dmi differ diff --git a/icons/obj/clothing/under/captain.dmi b/icons/obj/clothing/under/captain.dmi index 836abad6f2f..335ce733253 100644 Binary files a/icons/obj/clothing/under/captain.dmi and b/icons/obj/clothing/under/captain.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index 968faeda11f..572263d9085 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ diff --git a/icons/obj/clothing/under/costume.dmi b/icons/obj/clothing/under/costume.dmi index a2e57153238..e4a53a3979a 100644 Binary files a/icons/obj/clothing/under/costume.dmi and b/icons/obj/clothing/under/costume.dmi differ diff --git a/tools/UpdatePaths/Scripts/94014_captain_costumes.txt b/tools/UpdatePaths/Scripts/94014_captain_costumes.txt new file mode 100644 index 00000000000..5617337b629 --- /dev/null +++ b/tools/UpdatePaths/Scripts/94014_captain_costumes.txt @@ -0,0 +1,4 @@ +/obj/item/clothing/under/rank/captain/suit : /obj/item/clothing/under/costume/captain{@OLD} +/obj/item/clothing/under/rank/captain/suit/skirt : /obj/item/clothing/under/costume/captain/skirt{@OLD} +/obj/item/clothing/under/rank/civilian/head_of_personnel/suit : /obj/item/clothing/under/costume/head_of_personnel{@OLD} +/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt : /obj/item/clothing/under/costume/head_of_personnel/skirt{@OLD}