Repaths green "captain" suits to not be real captain clothing (#94014)

## About The Pull Request

Repaths the green captain suit and its skirt version to be costumes
instead of real captain clothing, as this is in line with how they're
used and makes them not have the armour of real captain clothing.

Deleted an unused identical copy of the same suit.

Fixes #93972

## Why It's Good For The Game

These are costumes and it's inconsistent for them to have armour values.

## Changelog
🆑
fix: The captain suit costume (green suit) no longer has the same armour
as real captain outfits.
/🆑
This commit is contained in:
Thunder12345
2025-11-26 02:40:41 +00:00
committed by GitHub
parent 5001b880c6
commit ae9183c32c
15 changed files with 47 additions and 52 deletions
@@ -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,
+33
View File
@@ -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
@@ -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"
@@ -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."
-8
View File
@@ -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."
+2 -2
View File
@@ -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,
+2 -2
View File
@@ -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,
+4 -4
View File
@@ -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,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 28 KiB

@@ -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}