mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
Adds Jumpsuit/Jumpskirt Preference (#44883)
Adds a preference for jumpsuit/jumpskirt into the game. Currently runs a jumpskirt for all occupations on spawn except for miner, since they have their special lavaland suit, and no skirt variant I could find. Doesn't remove skirts from lockers/machines yet since I am not 100% as to whether that should be done (clothes are available generically for the sake of changing outfits/recovering clothes after a whoops with some pyrotechnics).
This commit is contained in:
committed by
Tad Hardesty
parent
334f476cfb
commit
176bcdad93
@@ -57,6 +57,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
var/undershirt = "Nude" //undershirt type
|
||||
var/socks = "Nude" //socks type
|
||||
var/backbag = DBACKPACK //backpack type
|
||||
var/jumpsuit_style = PREF_SUIT //suit/skirt
|
||||
var/hair_style = "Bald" //Hair type
|
||||
var/hair_color = "000" //Hair color
|
||||
var/facial_hair_style = "Shaved" //Face hair type
|
||||
@@ -226,6 +227,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
dat += "<b>Undershirt:</b><BR><a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><BR>"
|
||||
dat += "<b>Socks:</b><BR><a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><BR>"
|
||||
dat += "<b>Backpack:</b><BR><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><BR>"
|
||||
dat += "<b>Jumpsuit:</b><BR><a href ='?_src_=prefs;preference=suit;task=input'>[jumpsuit_style]</a><BR>"
|
||||
dat += "<b>Uplink Spawn Location:</b><BR><a href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a><BR></td>"
|
||||
|
||||
var/use_skintones = pref_species.use_skintones
|
||||
@@ -780,7 +782,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
if(job_preferences[j] == JP_HIGH)
|
||||
job_preferences[j] = JP_MEDIUM
|
||||
//technically break here
|
||||
|
||||
|
||||
job_preferences[job.title] = level
|
||||
return TRUE
|
||||
|
||||
@@ -798,7 +800,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
to_chat(user, "<span class='danger'>UpdateJobPreference - desired level was not a number. Please notify coders!</span>")
|
||||
ShowChoices(user)
|
||||
return
|
||||
|
||||
|
||||
var/jpval = null
|
||||
switch(desiredLvl)
|
||||
if(3)
|
||||
@@ -813,7 +815,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
jpval = null
|
||||
else
|
||||
jpval = JP_LOW
|
||||
|
||||
|
||||
SetJobPreferenceLevel(job, jpval)
|
||||
SetChoices(user)
|
||||
|
||||
@@ -1010,6 +1012,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
skin_tone = random_skin_tone()
|
||||
if("bag")
|
||||
backbag = pick(GLOB.backbaglist)
|
||||
if("suit")
|
||||
jumpsuit_style = pick(GLOB.jumpsuitlist)
|
||||
if("all")
|
||||
random_character()
|
||||
|
||||
@@ -1277,6 +1281,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
if(new_backbag)
|
||||
backbag = new_backbag
|
||||
|
||||
if("suit")
|
||||
if(jumpsuit_style == PREF_SUIT)
|
||||
jumpsuit_style = PREF_SKIRT
|
||||
else
|
||||
jumpsuit_style = PREF_SUIT
|
||||
|
||||
if("uplink_loc")
|
||||
var/new_loc = input(user, "Choose your character's traitor uplink spawn location:", "Character Preference") as null|anything in GLOB.uplink_spawn_loc_list
|
||||
if(new_loc)
|
||||
@@ -1454,7 +1464,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
auto_fit_viewport = !auto_fit_viewport
|
||||
if(auto_fit_viewport && parent)
|
||||
parent.fit_viewport()
|
||||
|
||||
|
||||
if("widescreenpref")
|
||||
widescreenpref = !widescreenpref
|
||||
user.client.change_view(CONFIG_GET(string/default_view))
|
||||
@@ -1520,6 +1530,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
|
||||
character.backbag = backbag
|
||||
|
||||
character.jumpsuit_style = jumpsuit_style
|
||||
|
||||
var/datum/species/chosen_species
|
||||
chosen_species = pref_species.type
|
||||
if(!(pref_species.id in GLOB.roundstart_races) && !(pref_species.id in (CONFIG_GET(keyed_list/roundstart_no_hard_check))))
|
||||
|
||||
@@ -56,7 +56,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
var/job_civilian_high = 0
|
||||
var/job_civilian_med = 0
|
||||
var/job_civilian_low = 0
|
||||
|
||||
|
||||
var/job_medsci_high = 0
|
||||
var/job_medsci_med = 0
|
||||
var/job_medsci_low = 0
|
||||
@@ -290,6 +290,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["undershirt"] >> undershirt
|
||||
S["socks"] >> socks
|
||||
S["backbag"] >> backbag
|
||||
S["jumpsuit_style"] >> jumpsuit_style
|
||||
S["uplink_loc"] >> uplink_spawn_loc
|
||||
S["feature_mcolor"] >> features["mcolor"]
|
||||
S["feature_ethcolor"] >> features["ethcolor"]
|
||||
@@ -374,6 +375,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
eye_color = sanitize_hexcolor(eye_color, 3, 0)
|
||||
skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones)
|
||||
backbag = sanitize_inlist(backbag, GLOB.backbaglist, initial(backbag))
|
||||
jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style))
|
||||
uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
|
||||
features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0)
|
||||
features["ethcolor"] = copytext(features["ethcolor"],1,7)
|
||||
@@ -423,7 +425,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
WRITE_FILE(S["underwear"] , underwear)
|
||||
WRITE_FILE(S["undershirt"] , undershirt)
|
||||
WRITE_FILE(S["socks"] , socks)
|
||||
WRITE_FILE(S["backbag"] , backbag)
|
||||
WRITE_FILE(S["backbag"] , backbag)
|
||||
WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style)
|
||||
WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc)
|
||||
WRITE_FILE(S["species"] , pref_species.id)
|
||||
WRITE_FILE(S["feature_mcolor"] , features["mcolor"])
|
||||
|
||||
Reference in New Issue
Block a user