Skip to content

Commit

Permalink
engineers/medical
Browse files Browse the repository at this point in the history
  • Loading branch information
@Misttyy
Misttyy committed Jul 26, 2023
1 parent a252f4f commit 9538b98
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/modules/client/preferences.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@ var/const/MAX_SAVE_SLOTS = 10
affiliation = new_co_affiliation

if("co_career_path")
var/list/options = list("Infantry", "Intel", "Logistics", "Aviation")
var/list/options = list("Infantry", "Engineering", "Medical", "Intel", "Logistics", "Aviation")
var/new_career_path = tgui_input_list(user, "Choose your career path.", "Commanding Officer's Career", options)
if(!new_career_path)
return
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/preferences_savefile.dm
View file
Original file line number Diff line number Diff line change
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", "Engineering", "Medical", "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
51 changes: 48 additions & 3 deletions code/modules/gear_presets/uscm_ship.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,49 @@
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/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)
//Jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)
if("Engineering")
//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/eng(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/engineer(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/yellow(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)
//Jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)
if("Medical")
//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/dress(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/medic(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/latex(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
Expand All @@ -493,6 +535,8 @@
//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)
//Jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)
if("Logistics")
//back
new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK)
Expand All @@ -516,10 +560,9 @@
//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)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY)
//gun
new_human.equip_to_slot_or_del(new sidearmpath(new_human), WEAR_WAIST)
if(kit)
Expand All @@ -531,6 +574,8 @@
//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)
//Jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET)


//*****************************************************************************************************/
Expand Down

0 comments on commit 9538b98

Please sign in to comment.