Skip to content

Commit

Permalink
adding unfirosm to uscm_ship
Browse files Browse the repository at this point in the history
  • Loading branch information
@Misttyy
Misttyy committed Jul 26, 2023
1 parent 0c26015 commit a252f4f
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 17 deletions.
4 changes: 2 additions & 2 deletions code/modules/client/preferences.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1341,10 +1341,10 @@ var/const/MAX_SAVE_SLOTS = 10

if("co_career_path")
var/list/options = list("Infantry", "Intel", "Logistics", "Aviation")
var/new_career_path = tgui_input_list(user, "Choose your career path.", "Commanding Officer's Career Path", options)
var/new_career_path = tgui_input_list(user, "Choose your career path.", "Commanding Officer's Career", options)
if(!new_career_path)
return
command-path = new_command_path // Default should be infantry, with the other paths overriding it.
co_career_path = new_career_path // Default should be infantry, with the other paths overriding it.

if("yautja_status")
var/list/options = list("Normal" = WHITELIST_NORMAL)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/client/preferences_savefile.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@

S["commander_status"] >> commander_status
S["co_sidearm"] >> commander_sidearm
S["co_command_path"] >> co_command_path
S["co_command_path"] >> co_career_path
S["co_affiliation"] >> affiliation
S["yautja_status"] >> yautja_status
S["synth_status"] >> synth_status
Expand Down Expand Up @@ -247,7 +247,7 @@
predator_flavor_text = predator_flavor_text ? sanitize_text(predator_flavor_text, initial(predator_flavor_text)) : initial(predator_flavor_text)
commander_status = sanitize_inlist(commander_status, whitelist_hierarchy, initial(commander_status))
commander_sidearm = sanitize_inlist(commander_sidearm, list("Mateba","Colonel's Mateba","Golden Desert Eagle","Desert Eagle"), initial(commander_sidearm))
co_career_path = sanitize_inlist(co_career_path, list("Infantry", "Intel", "Logistics", Aviation), initial(co_career_path))
co_career_path = sanitize_inlist(co_career_path, list("Infantry", "Intel", "Logistics", "Aviation"), initial(co_career_path))
affiliation = sanitize_inlist(affiliation, FACTION_ALLEGIANCE_USCM_COMMANDER, initial(affiliation))
yautja_status = sanitize_inlist(yautja_status, whitelist_hierarchy + list("Elder"), initial(yautja_status))
synth_status = sanitize_inlist(synth_status, whitelist_hierarchy, initial(synth_status))
Expand Down Expand Up @@ -355,7 +355,7 @@

S["commander_status"] << commander_status
S["co_sidearm"] << commander_sidearm
S["co_command_path"] << co_command_path
S["co_command_path"] << co_career_path
S["co_affiliation"] << affiliation
S["yautja_status"] << yautja_status
S["synth_status"] << synth_status
Expand Down
93 changes: 81 additions & 12 deletions code/modules/gear_presets/uscm_ship.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,18 +451,87 @@
if("VP78")
sidearmpath = /obj/item/storage/belt/gun/m4a3/vp78

new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress/commander(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST)
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
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/storage/pouch/pistol/command(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_L_HAND)
if(kit)
new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK)
if(new_human.client && new_human.client.prefs)
var/co_career_path = "Infantry"
co_career_path = new_human.client.prefs.co_career_path
switch(co_career_path)
if("Infantry")
//back
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/ro(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR)
//uniform
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY)
//gun
new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST)
if(kit)
new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/black(new_human), WEAR_HANDS)
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/device/binoculars/range/designator(new_human), WEAR_L_HAND)
//pockets
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/storage/pouch/pistol/command(new_human), WEAR_L_STORE)
if("Intel")
//back
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/black(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR)
//uniform
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/intel(new_human), WEAR_BODY)
//gun
new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST)
if(kit)
new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/black(new_human), WEAR_HANDS)
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/device/binoculars/range/designator(new_human), WEAR_L_HAND)
//pockets
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/storage/pouch/pistol/command(new_human), WEAR_L_STORE)
if("Logistics")
//back
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/cm/tan(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR)
//uniform
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress(new_human), WEAR_BODY)
//gun
new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST)
if(kit)
new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/dress(new_human), WEAR_HANDS)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_L_HAND)
//pockets
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/storage/pouch/pistol/command(new_human), WEAR_L_STORE)
if("Aviation")
//back
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
//head
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/pilot(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR)
//uniform
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/synthetic/flight(new_human), WEAR_BODY)
//gun
new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST)
if(kit)
new_human.equip_to_slot_or_del(new kit(new_human), WEAR_IN_BACK)
//limbs
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/clothing/shoes/marine/knife(new_human), WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator(new_human), WEAR_L_HAND)
//pockets
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/storage/pouch/pistol/command(new_human), WEAR_L_STORE)


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

Expand Down
1 change: 1 addition & 0 deletions config/example/role_whitelist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@
#######################################################

#Your_name_here +Everything
Misfrag +Everything

0 comments on commit a252f4f

Please sign in to comment.