From 7c7c7048742cc1bb417924287d8bd80f584aa806 Mon Sep 17 00:00:00 2001 From: riot Date: Sat, 2 Sep 2023 15:23:56 -0500 Subject: [PATCH] ah --- .../vendor_types/crew/senior_officers.dm | 14 ++++++++++++-- code/modules/clothing/suits/marine_coat.dm | 5 +++-- code/modules/gear_presets/uscm_ship.dm | 4 ++-- icons/mob/humans/onmob/suit_1.dmi | Bin 235635 -> 235634 bytes icons/obj/items/clothing/cm_suits.dmi | Bin 75454 -> 75453 bytes 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index e392e037916f..8e4a6ff87c68 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -271,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), @@ -319,7 +323,6 @@ 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("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), )) @@ -367,3 +370,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, + ) diff --git a/code/modules/clothing/suits/marine_coat.dm b/code/modules/clothing/suits/marine_coat.dm index 66c57edcb590..d6781147a092 100644 --- a/code/modules/clothing/suits/marine_coat.dm +++ b/code/modules/clothing/suits/marine_coat.dm @@ -136,9 +136,10 @@ flags_atom = NO_SNOW_TYPE /obj/item/clothing/suit/storage/jacket/marine/dress - name = "marine dress jacket" + name = "marine formal service jacket" desc = "Smells like vanilla. Signifies prestige and power, if a little flashy." - icon_state = "marine_formal" + icon_state = "coat_formal" + initial_icon_state = "coat_formal" armor_melee = CLOTHING_ARMOR_LOW armor_bullet = CLOTHING_ARMOR_LOW armor_laser = CLOTHING_ARMOR_NONE diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 966a65387331..81031fc399a0 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -415,9 +415,9 @@ dress_under = list(/obj/item/clothing/under/marine/dress, /obj/item/clothing/under/marine/officer/formal/servicedress) dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full) - dress_hat = list(/obj/item/clothing/head/marine/peaked/captain/white, /obj/item/clothing/head/marine/peaked/captain/black) + dress_hat = list(/obj/item/clothing/head/marine/peaked/captain/white, /obj/item/clothing/head/marine/peaked/captain/black, /obj/item/clothing/head/marine/peaked) dress_shoes = list(/obj/item/clothing/shoes/dress/commander) - dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/white, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/black, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit) + dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/white, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/black, /obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit, /obj/item/clothing/suit/storage/jacket/marine/dress) /datum/equipment_preset/uscm_ship/commander/New() . = ..() diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index 07d829cc2a0e8bdfb6b8ff07dd0ffc1d4e902cb1..398471e71a7883873df8f9bc7db881bf7e8857ae 100644 GIT binary patch delta 1362 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 Put-76HK65SB*Xs!xK4r|