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.

Sign up for GitHub

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

Jump to bottom

WIP - Preset Gear Loadout Overhaul #326

Closed
wants to merge 7 commits into from
Closed

WIP - Preset Gear Loadout Overhaul #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1aca287
TT
AmoryBlaine Jul 7, 2024
0d5399b
Update misc.dm
AmoryBlaine Jul 7, 2024
80f6cf4
wait until Hybrisa
AmoryBlaine Jul 7, 2024
a0060bf
bits and pieces
AmoryBlaine Jul 8, 2024
27f2e00
Revert "wait until Hybrisa"
AmoryBlaine Jul 12, 2024
2b9d647
Revert "Update misc.dm"
AmoryBlaine Jul 12, 2024
dbef5ff
Dietrich bad hair
AmoryBlaine Jul 12, 2024
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
34 changes: 30 additions & 4 deletions code/modules/gear_presets/colonist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,38 @@
minimap_icon = "surv"
minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN

/datum/equipment_preset/colonist/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
A.randomize_appearance(new_human)
var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
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", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade", "Coffee House Cut")
new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "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("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "Mulder", "Pvt. Redding", "Pixie Cut Left", "Pixie Cut Right", "Bun")
new_human.change_real_name(new_human, random_name)
new_human.age = rand(20,35)

/datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET)
new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET)
new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE)

/datum/equipment_preset/survivor/load_id(mob/living/carbon/human/new_human, client/mob_client)
Expand Down
20 changes: 19 additions & 1 deletion code/modules/gear_presets/survivors/survivors.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,26 @@
var/datum/preferences/A = new
A.randomize_appearance(new_human)
var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
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", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade", "Coffee House Cut")
new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "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("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "Mulder", "Pvt. Redding", "Pixie Cut Left", "Pixie Cut Right", "Bun")
new_human.change_real_name(new_human, random_name)
new_human.age = rand(21,45)
new_human.age = rand(20,35)

/datum/equipment_preset/survivor/load_gear(mob/living/carbon/human/new_human) // Essentially where you will put the most essential piece of kit you want survivors to spawn with.
add_random_survivor_equipment(new_human)
Expand Down
26 changes: 26 additions & 0 deletions code/modules/gear_presets/uscm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,32 @@
/datum/equipment_preset/uscm/load_status(mob/living/carbon/human/new_human)
new_human.nutrition = rand(NUTRITION_VERYLOW, NUTRITION_LOW)

/datum/equipment_preset/uscm/load_name(mob/living/carbon/human/new_human, randomise)
new_human.gender = pick(MALE, FEMALE)
var/datum/preferences/A = new
A.randomize_appearance(new_human)
var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names))
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", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade", "Coffee House Cut")
new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "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("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "Mulder", "Pvt. Redding", "Pixie Cut Left", "Pixie Cut Right", "Bun")
new_human.change_real_name(new_human, random_name)
new_human.age = rand(20,35)

/datum/equipment_preset/uscm/load_preset(mob/living/carbon/human/new_human, randomise, count_participant)
. = ..()
if(!auto_squad_name || (is_admin_level(new_human.z) && !ert_squad))
Expand Down
Binary file modified icons/mob/humans/human_hair.dmi
View file
Open in desktop
Binary file not shown.
Loading