Skip to content

Commit

Permalink
New CIC uniform (#4320)
Browse files Browse the repository at this point in the history
# About the pull request

Does new CIC sprites, they look cool.
New cosmetic options with brown gloves and boots
New outfit that looks like the operation uniform gorman wears in the
movie
CTs getting actual caps instead of beanies is nice, RO(i'm not calling
it QM 🖕) still has a distinct hat to seperate the two out.


# Explain why it's good for the game

New sprites, service uniforms being static to the map makes sense as the
operations uniform is what is wore groundside in the movie, service
uniform is more of a shipside/non-combat uniform


# Images


![image](https://github.com/cmss13-devs/cmss13/assets/103988604/206fac1f-c84a-4edd-bc98-3f670e92c2e8)



# Changelog
:cl: CapCamIII, AmoryBlaine
add: Adds new service uniform sprite that is standard across maps,
sprites by AmoryBlaine
add: Resprites old dress uniform, renames it, adds to XO vendor as a
uniform choice as it fits there now, sprites by AmoryBlaine
add: Adds new uniform, command boiler suit like gorman wears in the
movie, available in SO locker, SO vendor, XO vendor, CO vendor, sprites
by AmoryBlaine
add: Adds new brown versions of gloves and boot to custom loadout, also
lowers the price of jungle boots to two, sprites by AmoryBlaine
add: Seperates officer cap and RO cap, officers get officer cap, QM gets
RO cap, CTs get req cap, sprites once again by AmoryBlaine
add: UPP boots and gloves use the new brown sprite, as it fits their
color scheme and looks cool.
fix: Freelancer leader now spawns with a knife in their boots
imageadd: Resprites patrol cap, officer cap, SEA cap, standard black
boot, standard black glove, and formal gloves, sprites by AmoryBlaine
/:cl:
  • Loading branch information
CapCamIII committed Sep 26, 2023
1 parent 3d61f2e commit 513f645
Show file tree
Hide file tree
Showing 27 changed files with 167 additions and 98 deletions.
2 changes: 1 addition & 1 deletion code/datums/supply_packs/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
/obj/item/clothing/under/rank/qm_suit,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/bridge,
/obj/item/clothing/under/marine/officer/exec,
/obj/item/clothing/under/marine/dress,
/obj/item/clothing/under/marine/officer/ce,
)
name = "officer outfit crate"
Expand Down
22 changes: 18 additions & 4 deletions code/game/machinery/vending/vendor_types/crew/senior_officers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,12 @@ GLOBAL_LIST_INIT(cm_vending_clothing_req_officer, list(
list("Quartermaster Uniform", 0, /obj/item/clothing/under/rank/qm_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/marine/satchel/tech, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),
list("Req Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY),
list("Quartermaster Jacket", 0, /obj/item/clothing/suit/storage/RO, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("Headgear (CHOOSE 1)", 0, null, null, null),
list("Quartermaster Cap", 0, /obj/item/clothing/head/cmcap/req/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_RECOMMENDED),
list("Requisitions Cap", 0, /obj/item/clothing/head/cmcap/req, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),

list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("Mod 88 Pistol", 0, /obj/item/storage/belt/gun/m4a3/mod88, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
Expand Down Expand Up @@ -268,10 +271,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(

list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Service Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY),

list("UNIFORM (CHOOSE ONE)", 0, null, null, null),
list("Service Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Operations Uniform", 0, /obj/item/clothing/under/marine/officer/boiler, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Formal Uniform", 0, /obj/effect/essentials_set/xoformal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),

list("PERSONAL WEAPON (CHOOSE 1)", 0, null, null, null),
list("VP78 Pistol", 0, /obj/item/storage/belt/gun/m4a3/vp78, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED),
list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/commander, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -316,9 +323,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(

list("HATS (CHOOSE 1)", 0, null, null, null),
list("Officer Beret", 0, /obj/item/clothing/head/beret/marine/chiefofficer, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("Peaked cap", 0, /obj/item/clothing/head/marine/peaked, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("Service Peaked Cap", 0, /obj/item/clothing/head/marine/peaked/service, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("Officer Cap", 0, /obj/item/clothing/head/cmcap/ro, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
list("Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR),
))


Expand Down Expand Up @@ -364,3 +371,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list(
/obj/item/storage/belt/security/MP/full,
/obj/item/clothing/head/helmet/marine/MP/WO,
)

/obj/effect/essentials_set/xoformal
spawned_gear_list = list(
/obj/item/clothing/suit/storage/jacket/marine/dress,
/obj/item/clothing/head/marine/peaked,
/obj/item/clothing/under/marine/dress,
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,25 @@

GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Helmet", 0, /obj/item/clothing/head/helmet/marine/MP/SO, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),


list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Service Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Operations Uniform", 0, /obj/item/clothing/under/marine/officer/boiler, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),

list("JACKET (CHOOSE 1)", 0, null, null, null),
list("Service Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED),

list("HAT (CHOOSE 1)", 0, null, null, null),
list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
list("Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
list("Service Peaked Cap", 0, /obj/item/clothing/head/marine/peaked/service, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),


list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null),
Expand Down
5 changes: 3 additions & 2 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,9 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("Ushanka", 12, /obj/item/clothing/head/ushanka, null, VENDOR_ITEM_REGULAR),
list("Cap", 12, /obj/item/clothing/head/cmcap, null, VENDOR_ITEM_REGULAR),
list("MP Cap", 12, /obj/item/clothing/head/beret/marine/mp/mpcap, null, VENDOR_ITEM_REGULAR),
list("RO Cap", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR),
list("Officer Cap", 12, /obj/item/clothing/head/cmcap/ro, null, VENDOR_ITEM_REGULAR),
list("QM Cap", 12, /obj/item/clothing/head/cmcap/req/ro, null, VENDOR_ITEM_REGULAR),
list("Req Cap", 12, /obj/item/clothing/head/cmcap/req, null, VENDOR_ITEM_REGULAR),
list("Officer Cap", 12, /obj/item/clothing/head/cmcap/bridge, null, VENDOR_ITEM_REGULAR),
list("Bio Hood", 12, /obj/item/clothing/head/bio_hood/synth, null, VENDOR_ITEM_REGULAR),
list("Marine Helmet", 12, /obj/item/clothing/head/helmet/marine, null, VENDOR_ITEM_REGULAR),
list("Grey Marine Helmet", 12, /obj/item/clothing/head/helmet/marine/grey, null, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list(
list("XM12 Officer Helmet", 0, /obj/item/clothing/head/helmet/marine/rto/intel, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED),
list("Beret, Standard", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
list("USCM Officer Cap", 0, /obj/item/clothing/head/cmcap/ro, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),
list("USCM Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR),

list("BELT (CHOOSE 1)", 0, null, null, null),
list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
. = ..()
new /obj/item/clothing/head/beret/cm(src)
new /obj/item/clothing/head/beret/cm(src)
new /obj/item/clothing/head/cmcap/ro(src)
new /obj/item/clothing/head/cmcap/ro(src)
new /obj/item/clothing/head/cmcap/bridge(src)
new /obj/item/clothing/head/cmcap/bridge(src)
new /obj/item/clothing/under/marine/officer/bridge(src)
new /obj/item/clothing/under/marine/officer/bridge(src)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/clothing/shoes/marine(src)
new /obj/item/storage/belt/marine(src)
new /obj/item/storage/belt/marine(src)
new /obj/item/clothing/under/marine/officer/command(src)
new /obj/item/clothing/under/marine/officer/command(src)
new /obj/item/clothing/under/marine/officer/boiler(src)
new /obj/item/clothing/under/marine/officer/boiler(src)
new /obj/item/clothing/suit/storage/webbing(src)
new /obj/item/clothing/suit/storage/webbing(src)
new /obj/item/clothing/gloves/combat(src)
Expand Down Expand Up @@ -100,7 +100,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
. = ..()
new /obj/item/clothing/head/beret/cm(src)
new /obj/item/clothing/head/beret/cm/tan(src)
new /obj/item/clothing/head/cmcap/ro(src)
new /obj/item/clothing/head/cmcap/bridge(src)
new /obj/item/clothing/head/helmet/marine/rto/intel(src)
new /obj/item/clothing/under/marine/officer/intel(src)
new /obj/item/clothing/shoes/marine(src)
Expand Down
12 changes: 11 additions & 1 deletion code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,17 @@ var/global/list/gear_datums_by_name = list()
/datum/gear/misc/jungle_boots
display_name = "Jungle pattern combat boots"
path = /obj/item/clothing/shoes/marine/jungle
cost = 3
cost = 2

/datum/gear/misc/brown_boots
display_name = "brown combat boots"
path = /obj/item/clothing/shoes/marine/brown
cost = 2

/datum/gear/misc/brown_gloves
display_name = "brown combat gloves"
path = /obj/item/clothing/gloves/marine/brown
cost = 2

/datum/gear/misc/pdt_kit
display_name = "PDT/L kit"
Expand Down
15 changes: 13 additions & 2 deletions code/modules/clothing/gloves/marine_gloves.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name = "marine combat gloves"
desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'."
icon_state = "black"
item_state = "bgloves"
item_state = "black"
siemens_coefficient = 0.6
permeability_coefficient = 0.05
flags_cold_protection = BODY_FLAG_HANDS
Expand Down Expand Up @@ -46,6 +46,13 @@
name = "marine black combat gloves"
adopts_squad_color = FALSE

/obj/item/clothing/gloves/marine/brown
name = "marine brown combat gloves"
desc = "Standard issue marine tactical gloves. It reads: 'knit by Marine Widows Association'. These are brown instead of the classic black."
icon_state = "brown"
item_state = "brown"
adopts_squad_color = FALSE

/obj/item/clothing/gloves/marine/officer
name = "officer gloves"
desc = "Shiny and impressive. They look expensive."
Expand Down Expand Up @@ -115,6 +122,10 @@
armor_internaldamage = CLOTHING_ARMOR_HIGH
adopts_squad_color = FALSE

/obj/item/clothing/gloves/marine/veteran/upp
icon_state = "brown"
item_state = "brown"

/obj/item/clothing/gloves/marine/veteran/insulated
name = "insulated armored gloves"
desc = "Non-standard kevlon fiber gloves. These are apparently ESPECIALLY insulated."
Expand Down Expand Up @@ -146,7 +157,7 @@
name = "dress gloves"
desc = "A pair of fashionable white gloves, worn by marines in dress."
icon_state = "white"
item_state = "white"
item_state = "marine_white"
adopts_squad_color = FALSE

/obj/item/clothing/gloves/marine/veteran/souto
Expand Down
32 changes: 22 additions & 10 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -370,17 +370,23 @@
name = "\improper USCM formal Commanding Officer's black cap"
icon_state = "co_formalhat_black"

/obj/item/clothing/head/cmcap/ro
name = "\improper USCM officer cap"
desc = "A hat usually worn by officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable."
/obj/item/clothing/head/cmcap/req/ro
name = "\improper USCM quartermaster cap"
desc = "It's a fancy hat for a not-so-fancy military supply clerk."
icon_state = "rocap"
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/head/cmcap/req
name = "\improper USCM requisition cap"
desc = "It's a fancy hat for a not-so-fancy military supply clerk."
desc = "It's a not-so-fancy hat for a not-so-fancy military supply clerk."
icon_state = "cargocap"
flags_atom = FPRINT|NO_SNOW_TYPE

/obj/item/clothing/head/cmcap/bridge
name = "\improper USCM officer cap"
desc = "A hat usually worn by officers in the USCM. While it provides no protection, some officers wear it in the field to make themselves more recognisable."
icon_state = "cap_officer"

/obj/item/clothing/head/cmcap/flap
name = "\improper USCM expedition cap"
desc = "It's a cap, with flaps. A patch stitched across the front reads \"<b>USS ALMAYER</b>\"."
Expand Down Expand Up @@ -494,10 +500,19 @@
/obj/item/clothing/head/marine/peaked
name = "marine peaked cap"
desc = "A peaked cap. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
icon = 'icons/obj/items/clothing/hats.dmi'
icon_state = "officercap"
icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "marine_formal"
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi'
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
)

/obj/item/clothing/head/marine/peaked/service
name = "marine service peaked cap"
desc = "A peaked cap. Wearer may suffer the heavy weight of responsibility upon their head and shoulders."
icon = 'icons/obj/items/clothing/cm_hats.dmi'
icon_state = "marine_service"
item_icons = list(
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
)

/obj/item/clothing/head/marine/peaked/captain
Expand Down Expand Up @@ -735,9 +750,6 @@
WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi'
)

/obj/item/clothing/head/drillhat/Initialize(mapload, ...)
. = ..()
select_gamemode_skin(/obj/item/clothing/head/drillhat)
#undef HAT_GARB_RELAY_ICON_STATE

//==========================//DRESS BLUES\\===============================\\
Expand Down
8 changes: 8 additions & 0 deletions code/modules/clothing/shoes/marine_shoes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@
/obj/item/clothing/shoes/marine/jungle/knife
knife_type = /obj/item/attachable/bayonet

/obj/item/clothing/shoes/marine/brown
icon_state = "marine_brown"
desc = "Standard issue combat boots for combat scenarios or combat situations. All combat, all the time. These are brown."

/obj/item/clothing/shoes/marine/brown/knife
knife_type = /obj/item/attachable/bayonet

/obj/item/clothing/shoes/marine/monkey
name = "monkey combat boots"
desc = "A sturdy pair of combat boots, the reflection of the polished leather reflects your true self."
Expand All @@ -54,6 +61,7 @@

/obj/item/clothing/shoes/marine/upp
name = "military combat boots"
icon_state = "marine_brown"
armor_melee = CLOTHING_ARMOR_MEDIUMLOW
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_bomb = CLOTHING_ARMOR_MEDIUM
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
icon_state = "officer"
storage_slots = 3
flags_atom = null
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer)
uniform_restricted = list(/obj/item/clothing/under/marine/officer, /obj/item/clothing/under/rank/qm_suit, /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/under/marine/dress)
specialty = "M2 pattern officer"
item_state_slots = list(WEAR_JACKET = "officer")

Expand Down
14 changes: 11 additions & 3 deletions code/modules/clothing/suits/marine_coat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,10 @@
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/jacket/marine/dress
name = "marine dress jacket"
desc = "Smells like vanilla. Signifies prestige and power, if a little flashy, but it still gives off that unga vibe."
icon_state = "marine_formal"
name = "marine formal service jacket"
desc = "Smells like vanilla. Signifies prestige and power, if a little flashy."
icon_state = "coat_formal"
initial_icon_state = "coat_formal"
armor_melee = CLOTHING_ARMOR_LOW
armor_bullet = CLOTHING_ARMOR_LOW
armor_laser = CLOTHING_ARMOR_NONE
Expand All @@ -148,11 +149,13 @@
armor_rad = CLOTHING_ARMOR_LOW
armor_internaldamage = CLOTHING_ARMOR_LOW
flags_atom = NO_SNOW_TYPE
has_buttons = TRUE

/obj/item/clothing/suit/storage/jacket/marine/dress/officer
name = "marine officer dress jacket"
desc = "Dress Jacket worn by Commanding Officers of the USCM."
icon_state = "co_jacket"
has_buttons = FALSE
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)

Expand Down Expand Up @@ -192,6 +195,7 @@
WEAR_JACKET = 'icons/mob/humans/onmob/suit_0.dmi'
)
item_state = "general_jacket"
has_buttons = FALSE
storage_slots = 4
armor_melee = CLOTHING_ARMOR_HIGHPLUS
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
Expand All @@ -202,17 +206,20 @@
/obj/item/clothing/suit/storage/jacket/marine/dress/general/executive
name = "director's jacket"
desc = "A black trench coat with gold metallic trim. Flashy, highly protective, and over-the-top. Fit for a king - or, in this case, a Director. Has quite a few pockets."
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/dress/bridge_coat
name = "bridge coat"
desc = "A heavy synthetic woolen coat issued to USCM Officers. Based on a classical design this coat is quite nice on cold nights in the Air conditioned CIC or a miserable cold night on a barren world. This one is a Dressy Blue for a Commanding officer."
has_buttons = FALSE
item_state = "bridge_coat"
icon_state = "bridge_coat"
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_MEDAL)

/obj/item/clothing/suit/storage/jacket/marine/dress/bridge_coat_grey
name = "bridge coat"
desc = "A heavy synthetic woolen coat issued to USCM Officers. Based on a classical design this coat is quite nice on cold nights in the Air conditioned CIC or a miserable cold night on a barren world. This one is Black."
has_buttons = FALSE
item_state = "bridge_coat_grey"
icon_state = "bridge_coat_grey"
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_MEDAL)
Expand Down Expand Up @@ -263,6 +270,7 @@
icon = 'icons/mob/humans/onmob/contained/marinedressblues.dmi'
icon_state = "e_jacket"
item_state = "e_jacket"
has_buttons = FALSE
item_state_slots = null
contained_sprite = TRUE

Expand Down
Loading

0 comments on commit 513f645

Please sign in to comment.