Skip to content

Commit

Permalink
updated corpse
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Sep 22, 2024
1 parent 1e8ed66 commit 7402aa2
Showing 1 changed file with 91 additions and 20 deletions.
111 changes: 91 additions & 20 deletions code/modules/gear_presets/corpses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -612,35 +612,106 @@
//*****************************************************************************************************/

//UPP
/datum/equipment_preset/corpse/upp/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(60;MALE,40;FEMALE)
var/datum/preferences/A = new()
A.randomize_appearance(new_human)
var/random_name
var/first_name
var/last_name
//gender checks
if(new_human.gender == MALE)
if(prob(40))
first_name = "[capitalize(randomly_generate_chinese_word(1))]"
else
first_name = "[pick(GLOB.first_names_male_upp)]"
new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache")
else
if(prob(40))
first_name = "[capitalize(randomly_generate_chinese_word(1))]"
else
first_name = "[pick(GLOB.first_names_female_upp)]"
//surname
if(prob(35))
last_name = "[capitalize(randomly_generate_chinese_word(pick(20;1, 80;2)))]"
else
last_name = "[pick(GLOB.last_names_upp)]"
//put them together
random_name = "[first_name] [last_name]"

new_human.change_real_name(new_human, random_name)
new_human.age = rand(17,35)
var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54))
var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44))
var/hair_color = pick(hair_colors)
new_human.r_hair = hair_colors[hair_color][1]
new_human.g_hair = hair_colors[hair_color][2]
new_human.b_hair = hair_colors[hair_color][3]
new_human.r_facial = hair_colors[hair_color][1]
new_human.g_facial = hair_colors[hair_color][2]
new_human.b_facial = hair_colors[hair_color][3]
var/eye_color = pick(colors)
new_human.r_eyes = colors[eye_color][1]
new_human.g_eyes = colors[eye_color][2]
new_human.b_eyes = colors[eye_color][3]
if(new_human.gender == MALE)
new_human.h_style = pick("Undercut, Top", "Partly Shaved", "CIA", "Mulder", "Medium Fade", "High Fade", "Pixie Cut Left", "Pixie Cut Right", "Coffee House Cut")
new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",)
else
new_human.h_style = pick("Undercut, Top", "CIA", "Mulder", "Pixie Cut Left", "Pixie Cut Right", "Scully", "Pvt. Redding", "Bun", "Short Bangs")

/datum/equipment_preset/corpse/upp
name = "Corpse - Union of Progressive Peoples Soldier"
assignment = JOB_UPP
idtype = /obj/item/card/id/dogtag
paygrades = list(PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_0)
rank = JOB_UPP
name = "Corpse - UPP Squad Rifleman"
faction = FACTION_UPP

/datum/equipment_preset/corpse/upp/New()
. = ..()
access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL)
assignment = JOB_SQUAD_MARINE
role_comm_title = "RFN"
rank = JOB_SQUAD_MARINE
paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_1)
skills = /datum/skills/pfc
access = list(ACCESS_UPP_GENERAL)
idtype = /obj/item/card/id/dogtag

/datum/equipment_preset/corpse/upp/load_gear(mob/living/carbon/human/new_human)
var/obj/item/clothing/under/marine/veteran/UPP/UPP = new()
new_human.equip_to_slot_or_del(UPP, WEAR_BODY)
//back
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/roller/bedroll, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/canteen, WEAR_IN_BACK)
//face
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD)
//head
var/maybeberet = rand(1,3)
switch(maybeberet)
if(1)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/naval, WEAR_HEAD)
if(2)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/naval/alt, WEAR_HEAD)
if(3)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
//uniform
var/obj/item/clothing/under/marine/veteran/UPP/uniform = new()
var/random_uniform = rand(1,2)
switch(random_uniform)
if(1)
uniform.roll_suit_jacket(new_human)
if(2)
uniform.roll_suit_sleeves(new_human)
new_human.equip_to_slot_or_del(uniform, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/platoon, WEAR_ACCESSORY)
//jacket
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown, WEAR_HANDS)
add_random_survivor_equipment(new_human)

if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_JACKET)
//limbs
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife, WEAR_FEET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS)
//pockets
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine, WEAR_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71, WEAR_IN_R_STORE)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid, WEAR_L_STORE)

/datum/equipment_preset/corpse/upp/burst
name = "Corpse - Burst Union of Progressive Peoples Soldier"
name = "Corpse - Burst UPP Squad Rifleman"
xenovictim = TRUE

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

0 comments on commit 7402aa2

Please sign in to comment.