Skip to content

Commit

Permalink
Remove UPP officer uniform, People's Police preset
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Sep 8, 2024
1 parent 64c286b commit 287cfa5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 38 deletions.
6 changes: 0 additions & 6 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -523,12 +523,6 @@
worn_state = "upp_boiler"
flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE

/obj/item/clothing/under/marine/veteran/UPP/officer
name = "\improper UPP Officer fatigues"
desc = "A set of Officer UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
icon_state = "upp_uniform_officer"
worn_state = "upp_uniform_officer"

/obj/item/clothing/under/marine/veteran/UPP/civi1
name = "\improper UPP Civilian-style Orange overalls"
desc = "A set of Civilian-style Orange Overalls with a dark tan undershirt. The material is of a poor quality, however it's better than nothing. Clothing of this style is typically given out to those who work laborious jobs."
Expand Down
33 changes: 1 addition & 32 deletions code/modules/gear_presets/upp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD)
//uniform
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY)
//jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/jacket/service, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_JACKET)
Expand Down Expand Up @@ -721,34 +721,3 @@ var/random_name

if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/foxtrot, WEAR_FACE)

/* /datum/equipment_preset/upp/security
name = "(WIP) UPP People's Police Militiaman"
flags = EQUIPMENT_PRESET_EXTRA
skills = /datum/skills/upp/military_police
assignment = "People's Police Militiaman"
rank = JOB_UPP_POLICE
role_comm_title = "MILTSY"
paygrade = "UC1"
idtype = /obj/item/card/id/silver
/datum/equipment_preset/upp/security/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked/police, WEAR_HEAD)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
//uniform
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black, WEAR_ACCESSORY)
//jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey/upp, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver, WEAR_J_STORE)
//waist
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/security/MP/UPP/full, WEAR_WAIST)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET)
//pockets
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack, WEAR_IN_R_STORE) */

0 comments on commit 287cfa5

Please sign in to comment.