Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provost sprites and code cleanup #4409

Merged
merged 3 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1635,47 +1635,47 @@
//=======================================================================\\

/obj/item/clothing/suit/storage/marine/MP/provost
name = "\improper M3 pattern Provost armor"
desc = "A lighter Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
icon_state = "pvlight"
item_state_slots = list(WEAR_JACKET = "pvlight")
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
w_class = SIZE_MEDIUM

/obj/item/clothing/suit/storage/marine/MP/provost/enforcer
name = "\improper M3 pattern Provost armor"
desc = "A standard Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
icon_state = "pvmedium"
item_state_slots = list(WEAR_JACKET = "pvmedium")
slowdown = SLOWDOWN_ARMOR_MEDIUM
armor_melee = CLOTHING_ARMOR_MEDIUM
slowdown = SLOWDOWN_ARMOR_LIGHT
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_bomb = CLOTHING_ARMOR_MEDIUMHIGH
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
storage_slots = 3

/obj/item/clothing/suit/storage/marine/MP/provost/tml
name = "\improper M3 pattern Senior Provost armor"
desc = "A more refined Provost M3 Pattern Chestplate for senior officers. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
icon_state = "pvleader"
item_state_slots = list(WEAR_JACKET = "pvleader")
desc = "A more refined Provost M3 Pattern Chestplate for senior officers. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."

slowdown = SLOWDOWN_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH

/obj/item/clothing/suit/storage/marine/MP/provost/marshal
name = "\improper M5 pattern Provost Marshal armor"
desc = "A custom fit luxury armor suit for Provost Marshals. Useful for letting your men know who is in charge when taking to the field."
icon_state = "pvmarshal"
item_state_slots = list(WEAR_JACKET = "pvmarshal")
name = "\improper M3 pattern Provost Marshal armor"
desc = "A custom fit luxury armor suit for Provost Marshals. Useful for letting your men know who is in charge when taking to the field."
w_class = SIZE_MEDIUM
storage_slots = 4

/obj/item/clothing/suit/storage/marine/MP/provost/light
name = "\improper M3 pattern Provost light armor"
desc = "A lighter Provost M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
icon_state = "pvlight"
item_state_slots = list(WEAR_JACKET = "pvlight")
slowdown = SLOWDOWN_ARMOR_VERY_LIGHT

/obj/item/clothing/suit/storage/marine/MP/provost/marshal/chief
name = "\improper M3 pattern Provost Chief Marshal armor"
/obj/item/clothing/suit/storage/marine/MP/provost/light/flexi
name = "\improper M3 pattern Provost flexi-armor"
desc = "A flexible and easy to store M3 Pattern Chestplate. Protects the chest from ballistic rounds, bladed objects and accidents. It has a small leather pouch strapped to it for limited storage."
w_class = SIZE_MEDIUM
icon_state = "pvlight_2"
item_state_slots = list(WEAR_JACKET = "pvlight_2")
storage_slots = 2

//================//UNITED AMERICAS ALLIED COMMAND\\=====================\\
//=======================================================================\\
Expand Down
30 changes: 11 additions & 19 deletions code/modules/clothing/suits/marine_coat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -235,31 +235,23 @@

//=========================//PROVOST\\================================\\
//=======================================================================\\

/obj/item/clothing/suit/storage/jacket/marine/provost
name = "\improper Provost Coat"
desc = "The crisp coat of a Provost Officer."
name = "\improper Provost Jacket"
desc = "A crisp jacket with the Provost sigil."
icon_state = "provost_jacket"
flags_atom = NO_SNOW_TYPE|NO_NAME_OVERRIDE
icon_state = "provost_coat"
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_RANK, ACCESSORY_SLOT_DECOR)

/obj/item/clothing/suit/storage/jacket/marine/provost/advisor
name = "\improper Provost Advisor Jacket"
desc = "The crisp jacket of a Provost Advisor."
icon_state = "provost_jacket"

/obj/item/clothing/suit/storage/jacket/marine/provost/inspector
name = "\improper Provost Inspector Jacket"
desc = "The crisp jacket of a Provost Inspector."
icon_state = "provost_jacket"
/obj/item/clothing/suit/storage/jacket/marine/provost/coat
name = "\improper Provost Coat"
desc = "The crisp coat of a Provost Officer."
icon_state = "provost_coat"

/obj/item/clothing/suit/storage/jacket/marine/provost/marshal
name = "\improper Provost Marshal Jacket"
desc = "The crisp jacket of a Provost Marshal."
icon_state = "provost_jacket"
/obj/item/clothing/suit/storage/jacket/marine/provost/coat/marshal
name = "\improper Provost Marshal Coat"
icon_state = "provost_coat_marshal"

/obj/item/clothing/suit/storage/jacket/marine/provost/marshal/chief
name = "\improper Provost Chief Marshal Jacket"
desc = "The crisp jacket of the Provost Chief Marshal."

//=========================//DRESS BLUES\\================================\\
//=======================================================================\\
Expand Down
38 changes: 7 additions & 31 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -374,41 +374,17 @@

min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT

/obj/item/clothing/under/marine/mp/provost/enforcer
name = "\improper Provost Enforcer Uniform"
desc = "The crisp uniform of a Provost Enforcer."

/obj/item/clothing/under/marine/mp/provost/tml
name = "\improper Provost Team Leader Uniform"
desc = "The crisp uniform of a Provost Team Leader."
icon_state = "warden_jumpsuit"
worn_state = "warden_jumpsuit"

/obj/item/clothing/under/marine/mp/provost/advisor
name = "\improper Provost Advisor Uniform"
desc = "The crisp uniform of a Provost Advisor."
icon_state = "warden_jumpsuit"
worn_state = "warden_jumpsuit"

/obj/item/clothing/under/marine/mp/provost/inspector
name = "\improper Provost Inspector Uniform"
desc = "The crisp uniform of a Provost Inspector."
icon_state = "warden_jumpsuit"
worn_state = "warden_jumpsuit"
/obj/item/clothing/under/marine/mp/provost/senior
name = "\improper Provost Senior Uniform"
desc = "The crisp uniform of a senior member of the Provost Office."
icon_state = "provost_tml"
worn_state = "provost_tml"

/obj/item/clothing/under/marine/mp/provost/marshal
name = "\improper Provost Marshal Uniform"
desc = "The crisp uniform of a Provost Marshal."
icon_state = "WO_jumpsuit"
worn_state = "WO_jumpsuit"

/obj/item/clothing/under/marine/mp/provost/marshal/sector
name = "\improper Provost Sector Marshal Uniform"
desc = "The crisp uniform of a Provost Sector Marshal."

/obj/item/clothing/under/marine/mp/provost/marshal/chief
name = "\improper Provost Chief Marshal Uniform"
desc = "The crisp uniform of the Provost Chief Marshal."
icon_state = "provost_marshal"
worn_state = "provost_marshal"

//==================//UNITED AMERICAS ALLIED COMMAND\\===================\\
//=======================================================================\\
Expand Down
104 changes: 15 additions & 89 deletions code/modules/gear_presets/uscm_event.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@
back_item = /obj/item/storage/backpack/security

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/enforcer(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/full(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/enforcer(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human), WEAR_JACKET)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
Expand Down Expand Up @@ -248,7 +248,7 @@
back_item = /obj/item/storage/backpack/security

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/tml(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/senior(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST)
Expand All @@ -275,44 +275,8 @@
new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_J_STORE)


/datum/equipment_preset/uscm_event/provost/advisor
name = "Provost Advisor (ME6)"
skills = /datum/skills/CMP

assignment = JOB_PROVOST_ADVISOR
rank = "Provost Advisor"
paygrade = "ME6"
role_comm_title = "PvA"
flags = EQUIPMENT_PRESET_EXTRA

/datum/equipment_preset/uscm_event/provost/advisor/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))
back_item = /obj/item/storage/backpack/security

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/advisor(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/advisor(new_human), WEAR_JACKET)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/senior(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human.back), WEAR_IN_BACK)

new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET)

/datum/equipment_preset/uscm_event/provost/inspector
name = "Provost Inspector (PvI)"
skills = /datum/skills/CMP

assignment = JOB_PROVOST_INSPECTOR
rank = "Provost Inspector"
Expand All @@ -326,11 +290,11 @@
back_item = /obj/item/storage/backpack/security

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/inspector(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/senior(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/inspector(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost(new_human), WEAR_JACKET)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
Expand All @@ -339,11 +303,19 @@
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost(new_human.back), WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/light/flexi(new_human.back), WEAR_IN_BACK)

new_human.equip_to_slot_or_del(new /obj/item/device/flash(new_human), WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/handcuffs(new_human), WEAR_IN_JACKET)

/datum/equipment_preset/uscm_event/provost/inspector/advisor
name = "Provost Advisor (ME6)"

assignment = JOB_PROVOST_ADVISOR
rank = "Provost Advisor"
paygrade = "ME6"
role_comm_title = "PvA"
flags = EQUIPMENT_PRESET_EXTRA

/datum/equipment_preset/uscm_event/provost/marshal
name = "Provost Marshal (MO6)"
Expand All @@ -366,7 +338,7 @@
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/coat/marshal(new_human), WEAR_JACKET)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
Expand All @@ -377,70 +349,24 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK)


/datum/equipment_preset/uscm_event/provost/marshal/sector
name = "Provost Sector Marshal (MO7)"
minimum_age = 50
skills = /datum/skills/general

assignment = JOB_PROVOST_SMARSHAL
rank = "Provost Sector Marshal"
paygrade = "MO7"
role_comm_title = "PvSM"

/datum/equipment_preset/uscm_event/provost/marshal/sector/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))
back_item = /obj/item/storage/backpack/security

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal(new_human), WEAR_JACKET)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal(new_human.back), WEAR_IN_BACK)


/datum/equipment_preset/uscm_event/provost/marshal/chief
name = "Provost Chief Marshal (PvCM)"
minimum_age = 60
skills = /datum/skills/general

assignment = JOB_PROVOST_CMARSHAL
rank = "Provost Chief Marshal"
paygrade = "PvCM"
role_comm_title = "PvCM"

/datum/equipment_preset/uscm_event/provost/marshal/chief/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))
back_item = /obj/item/storage/backpack/security

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/highcom(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/marshal/chief(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/general/impact(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/marshal/chief(new_human), WEAR_JACKET)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
else
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/mp/provost/marshal(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/taperecorder(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol/pmc_mateba(new_human), WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/MP/provost/marshal/chief(new_human.back), WEAR_IN_BACK)

/*****************************************************************************************************/

/datum/equipment_preset/uscm_event/uaac/tis
Expand Down
Binary file modified icons/mob/humans/onmob/suit_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/uniform_0.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_suits.dmi
Binary file not shown.
Binary file modified icons/obj/items/clothing/uniforms.dmi
Binary file not shown.