Skip to content

Commit

Permalink
Dress Blues (#5845)
Browse files Browse the repository at this point in the history
# About the pull request
Changes all marine presets to use the dress blues rather than current
dress equipment.
I have not changed Whiskey Outpost presets, they'll be done later or in
another PR.

# Explain why it's good for the game

Makes things consistent as the blues are full marine dress uniforms
rather than the mismatched stuff we have currently.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog
:cl:
add: Changed all marine presets to use Dress Blues as their dress
equipment.
del: Excluding Whiskey Outpost, removed all previous dress equipment
from vendors.
/:cl:
  • Loading branch information
realforest2001 authored Mar 19, 2024
1 parent ed53130 commit bf44add
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 23 deletions.
14 changes: 14 additions & 0 deletions code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
ACCESS_CIVILIAN_LOGISTICS,
)

dress_shoes = list(/obj/item/clothing/shoes/dress)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)

/datum/equipment_preset/survivor/forecon/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
Expand Down Expand Up @@ -210,6 +216,10 @@
skills = /datum/skills/military/survivor/forecon_squad_leader
paygrade = PAY_SHORT_MO1

dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/survivor/forecon/squad_leader/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
Expand Down Expand Up @@ -238,6 +248,10 @@
idtype = /obj/item/card/id/gold
role_comm_title = "FORECON CO"

dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/survivor/forecon/major/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/reconnaissance/uniform = new()
var/obj/item/clothing/accessory/storage/droppouch/pouch = new()
Expand Down
38 changes: 35 additions & 3 deletions code/modules/gear_presets/uscm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
service_hat = list(/obj/item/clothing/head/cmcap)
service_shoes = list(/obj/item/clothing/shoes/dress)

dress_under = list(/obj/item/clothing/under/marine/dress)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
dress_hat = list(/obj/item/clothing/head/marine/peaked)
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_shoes = list(/obj/item/clothing/shoes/dress)
var/auto_squad_name
Expand Down Expand Up @@ -72,6 +72,8 @@
skills = /datum/skills/pfc

minimap_icon = "private"
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/pfc/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
Expand Down Expand Up @@ -108,6 +110,8 @@
skills = /datum/skills/smartgunner

minimap_icon = "smartgunner"
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/sg/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
Expand Down Expand Up @@ -227,6 +231,9 @@
utility_under = list(/obj/item/clothing/under/marine/officer/intel)

minimap_icon = "io"
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm/intel/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
Expand Down Expand Up @@ -279,6 +286,8 @@
skills = /datum/skills/specialist

minimap_icon = "spec"
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/spec/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
Expand Down Expand Up @@ -338,6 +347,8 @@
minimap_icon = "medic"

utility_under = list(/obj/item/clothing/under/marine/medic)
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/medic/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/medic
Expand Down Expand Up @@ -400,6 +411,8 @@
minimap_icon = "engi"

utility_under = list(/obj/item/clothing/under/marine/engineer)
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/engineer/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
Expand Down Expand Up @@ -463,6 +476,8 @@
skills = /datum/skills/pfc/crafty

minimap_icon = "private"
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/private_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
Expand Down Expand Up @@ -553,6 +568,8 @@
skills = /datum/skills/smartgunner

minimap_icon = "smartgunner"
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/smartgunner_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
Expand Down Expand Up @@ -592,6 +609,8 @@
minimap_icon = "engi"

utility_under = list(/obj/item/clothing/under/marine/engineer)
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/engineer_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
Expand Down Expand Up @@ -638,6 +657,8 @@
minimap_icon = "medic"

utility_under = list(/obj/item/clothing/under/marine/medic)
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/medic_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
Expand Down Expand Up @@ -690,6 +711,8 @@
skills = /datum/skills/specialist

minimap_icon = "spec"
dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)

/datum/equipment_preset/uscm/specialist_equipped/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = NUTRITION_NORMAL
Expand Down Expand Up @@ -873,6 +896,9 @@
skills = /datum/skills/commando/deathsquad/leader

minimap_icon = "leader"
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
Expand All @@ -898,6 +924,9 @@
role_comm_title = "CMD."
paygrade = PAY_SHORT_MO3
skills = /datum/skills/commando/deathsquad/officer
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm/marsoc/cmd/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
Expand Down Expand Up @@ -956,6 +985,9 @@
skills = /datum/skills/commando/deathsquad/leader

minimap_icon = "leader"
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm/marsoc/sl/load_rank(mob/living/carbon/human/new_human)
if(new_human.client)
Expand Down
30 changes: 27 additions & 3 deletions code/modules/gear_presets/uscm_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
service_extra = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer/bomber)
service_hat = list(/obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/marine/commander/dress, /obj/item/clothing/head/beret/marine/commander/black)

dress_under = list(/obj/item/clothing/under/marine/dress, /obj/item/clothing/under/marine/officer/formal/servicedress)
dress_under = list(/obj/item/clothing/under/marine/dress/blues/general)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
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_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)

/datum/equipment_preset/uscm_event/colonel/New()
. = ..()
Expand Down Expand Up @@ -72,6 +72,10 @@
service_gloves = list(/obj/item/clothing/gloves/black, /obj/item/clothing/gloves/marine/dress)
service_hat = list(/obj/item/clothing/head/general, /obj/item/clothing/head/beret/marine/commander/black)

dress_under = list(/obj/item/clothing/under/marine/dress/blues/general)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm_event/general/New()
. = ..()
access = get_access(ACCESS_LIST_GLOBAL)
Expand Down Expand Up @@ -149,6 +153,10 @@
role_comm_title = "OT"
skills = /datum/skills/spy

dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)

/datum/equipment_preset/uscm_event/upp_spy/load_gear(mob/living/carbon/human/new_human)
//TODO: add backpacks and satchels
var/back_item = /obj/item/storage/backpack/marine/satchel/tech
Expand Down Expand Up @@ -200,6 +208,10 @@
role_comm_title = "PvE"
flags = EQUIPMENT_PRESET_EXTRA

dress_under = list(/obj/item/clothing/under/marine/dress/blues)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)

/datum/equipment_preset/uscm_event/provost/enforcer/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
Expand Down Expand Up @@ -242,6 +254,10 @@
role_comm_title = "PvTML"
flags = EQUIPMENT_PRESET_EXTRA

dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)

/datum/equipment_preset/uscm_event/provost/tml/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
Expand Down Expand Up @@ -284,6 +300,10 @@
role_comm_title = "PvI"
flags = EQUIPMENT_PRESET_EXTRA

dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm_event/provost/inspector/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
Expand Down Expand Up @@ -331,6 +351,10 @@
role_comm_title = PAY_SHORT_PVM
flags = EQUIPMENT_PRESET_EXTRA

dress_under = list(/obj/item/clothing/under/marine/dress/blues/general)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)

/datum/equipment_preset/uscm_event/provost/marshal/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/satchel/sec
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
Expand Down
12 changes: 9 additions & 3 deletions code/modules/gear_presets/uscm_medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
service_hat = list(/obj/item/clothing/head/cmcap)
service_shoes = list(/obj/item/clothing/shoes/dress)

dress_under = list(/obj/item/clothing/under/marine/dress)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress)
dress_hat = list(/obj/item/clothing/head/marine/peaked)
dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_shoes = list(/obj/item/clothing/shoes/dress)

Expand Down Expand Up @@ -101,6 +101,12 @@

minimap_icon = list("medic")

dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior)
dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco)
dress_hat = list(/obj/item/clothing/head/marine/dress_cover)
dress_gloves = list(/obj/item/clothing/gloves/marine/dress)
dress_shoes = list(/obj/item/clothing/shoes/dress)

/datum/equipment_preset/uscm_ship/uscm_medical/nurse/load_gear(mob/living/carbon/human/new_human)
var/back_item = /obj/item/storage/backpack/marine/satchel
if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
Expand Down
Loading

0 comments on commit bf44add

Please sign in to comment.