| "
dat += "Name: "
- dat += "[real_name]"
+ dat += "[active_character.real_name]"
dat += "(Randomize)"
- dat += "(Always Randomize) " + dat += "(Always Randomize) " dat += " | "
dat += " " + dat += "Slot [default_slot][active_character.from_db ? "" : " (empty)"] " dat += "Load slot - " - dat += "Save slot - " - dat += "Reload slot" - if(saved) - dat += " - Clear slot" + dat += "Save slot" + if(active_character.from_db) + dat += "- Clear slot" dat += " |
| "
@@ -281,81 +178,83 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "You are banned from using custom names and appearances. \
You can continue to adjust your characters, but you will be randomised once you join the game.\
" - dat += "Gender: [gender == MALE ? "Male" : (gender == FEMALE ? "Female" : "Genderless")]" + dat += "Gender: [active_character.gender == MALE ? "Male" : (active_character.gender == FEMALE ? "Female" : "Genderless")]" dat += " " - dat += "Age: [age] " + dat += "Age: [active_character.age] " dat += "Body: (®) " - dat += "Species: [species] " - if(species == "Vox") - dat += "N2 Tank: [speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"] " - if(species == "Grey") + dat += "Species: [active_character.species] " + if(active_character.species == "Vox") // Purge these bastards + dat += "N2 Tank: [active_character.speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank"] " + if(active_character.species == "Grey") dat += "Wingdings: Set in disabilities " - dat += "Voice Translator: [speciesprefs ? "Yes" : "No"] " - dat += "Secondary Language: [language] " + dat += "Voice Translator: [active_character.speciesprefs ? "Yes" : "No"] " + dat += "Secondary Language: [active_character.language] " if(S.autohiss_basic_map) - dat += "Auto-accent: [autohiss_mode == AUTOHISS_FULL ? "Full" : (autohiss_mode == AUTOHISS_BASIC ? "Basic" : "Off")] " - dat += "Blood Type: [b_type] " + dat += "Auto-accent: [active_character.autohiss_mode == AUTOHISS_FULL ? "Full" : (active_character.autohiss_mode == AUTOHISS_BASIC ? "Basic" : "Off")] " + dat += "Blood Type: [active_character.b_type] " if(S.bodyflags & (HAS_SKIN_TONE|HAS_ICON_SKIN_TONE)) - dat += "Skin Tone: [S.bodyflags & HAS_ICON_SKIN_TONE ? "[s_tone]" : "[-s_tone + 35]/220"] " + dat += "Skin Tone: [S.bodyflags & HAS_ICON_SKIN_TONE ? "[active_character.s_tone]" : "[-active_character.s_tone + 35]/220"] " dat += "Disabilities: \[Set\] " - dat += "Nanotrasen Relation: [nanotrasen_relation] " + dat += "Nanotrasen Relation: [active_character.nanotrasen_relation] " dat += "Set Flavor Text " - if(length(flavor_text) <= 40) - if(!length(flavor_text)) dat += "\[...\] " - else dat += "[flavor_text] " - else dat += "[TextPreview(flavor_text)]... " + if(length(active_character.flavor_text) <= 40) + if(!length(active_character.flavor_text)) + dat += "\[...\] " + else + dat += "[active_character.flavor_text] " + else dat += "[TextPreview(active_character.flavor_text)]... " dat += " Hair & Accessories" if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species that have head accessories. var/headaccessoryname = "Head Accessory: " - if(species == "Unathi") + if(active_character.species == "Unathi") headaccessoryname = "Horns: " dat += "[headaccessoryname]" - dat += "[ha_style] " - dat += "Color [color_square(hacc_colour)]" + dat += "[active_character.ha_style] " + dat += "Color [color_square(active_character.hacc_colour)] " if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings. dat += "Head Markings: " - dat += "[m_styles["head"]]" - dat += "Color [color_square(m_colours["head"])] " + dat += "[active_character.m_styles["head"]]" + dat += "Color [color_square(active_character.m_colours["head"])] " if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos. dat += "Body Markings: " - dat += "[m_styles["body"]]" - dat += "Color [color_square(m_colours["body"])] " + dat += "[active_character.m_styles["body"]]" + dat += "Color [color_square(active_character.m_colours["body"])] " if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings. dat += "Tail Markings: " - dat += "[m_styles["tail"]]" - dat += "Color [color_square(m_colours["tail"])] " + dat += "[active_character.m_styles["tail"]]" + dat += "Color [color_square(active_character.m_colours["tail"])] " dat += "Hair: " - dat += "[h_style]" - dat += "Color [color_square(h_colour)]" - var/datum/sprite_accessory/temp_hair_style = GLOB.hair_styles_public_list[h_style] + dat += "[active_character.h_style]" + dat += "Color [color_square(active_character.h_colour)]" + var/datum/sprite_accessory/temp_hair_style = GLOB.hair_styles_public_list[active_character.h_style] if(temp_hair_style && temp_hair_style.secondary_theme && !temp_hair_style.no_sec_colour) - dat += " Color #2 [color_square(h_sec_colour)]" + dat += " Color #2 [color_square(active_character.h_sec_colour)]" dat += " " dat += "Facial Hair: " - dat += "[f_style ? "[f_style]" : "Shaved"]" - dat += "Color [color_square(f_colour)]" - var/datum/sprite_accessory/temp_facial_hair_style = GLOB.facial_hair_styles_list[f_style] + dat += "[active_character.f_style ? "[active_character.f_style]" : "Shaved"]" + dat += "Color [color_square(active_character.f_colour)]" + var/datum/sprite_accessory/temp_facial_hair_style = GLOB.facial_hair_styles_list[active_character.f_style] if(temp_facial_hair_style && temp_facial_hair_style.secondary_theme && !temp_facial_hair_style.no_sec_colour) - dat += " Color #2 [color_square(f_sec_colour)]" + dat += " Color #2 [color_square(active_character.f_sec_colour)]" dat += " " if(!(S.bodyflags & ALL_RPARTS)) dat += "Eyes: " - dat += "Color [color_square(e_colour)] " + dat += "Color [color_square(active_character.e_colour)] " - if((S.bodyflags & HAS_SKIN_COLOR) || GLOB.body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins + if((S.bodyflags & HAS_SKIN_COLOR) || GLOB.body_accessory_by_species[active_character.species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins dat += "Body Color: " - dat += "Color [color_square(s_colour)] " + dat += "Color [color_square(active_character.s_colour)] " - if(GLOB.body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) + if(GLOB.body_accessory_by_species[active_character.species] || check_rights(R_ADMIN, 0, user)) dat += "Body Accessory: " - dat += "[body_accessory ? "[body_accessory]" : "None"] " + dat += "[active_character.body_accessory ? "[active_character.body_accessory]" : "None"] " dat += " | "
dat += "Occupation Choices" @@ -368,15 +267,15 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += "Limbs" if(S.bodyflags & HAS_ALT_HEADS) //Species with alt heads. dat += "Alternate Head: " - dat += "[alt_head]" + dat += "[active_character.alt_head] " dat += "Limbs and Parts: Adjust " - if(species != "Slime People" && species != "Machine") + if(active_character.species != "Slime People" && active_character.species != "Machine") dat += "Internal Organs: Adjust " //display limbs below var/ind = 0 - for(var/name in organ_data) - var/status = organ_data[name] + for(var/name in active_character.organ_data) + var/status = active_character.organ_data[name] var/organ_name = null switch(name) if("chest") @@ -421,8 +320,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts switch(status) if("cyborg") var/datum/robolimb/R - if(rlimb_data[name] && GLOB.all_robolimbs[rlimb_data[name]]) - R = GLOB.all_robolimbs[rlimb_data[name]] + if(active_character.rlimb_data[name] && GLOB.all_robolimbs[active_character.rlimb_data[name]]) + R = GLOB.all_robolimbs[active_character.rlimb_data[name]] else R = GLOB.basic_robolimb dat += "\t[R.company] [organ_name] prosthesis" @@ -435,12 +334,12 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += " Clothing" if(S.clothing_flags & HAS_UNDERWEAR) - dat += "Underwear: [underwear]" + dat += "Underwear: [active_character.underwear] " if(S.clothing_flags & HAS_UNDERSHIRT) - dat += "Undershirt: [undershirt] " + dat += "Undershirt: [active_character.undershirt] " if(S.clothing_flags & HAS_SOCKS) - dat += "Socks: [socks] " - dat += "Backpack Type: [backbag] " + dat += "Socks: [active_character.socks] " + dat += "Backpack Type: [active_character.backbag] " dat += " |
" + var/name -/datum/preferences/proc/get_gear_metadata(datum/gear/G) - . = loadout_gear[G.display_name] - if(!.) - . = list() - loadout_gear[G.display_name] = . + for(var/i in 1 to length(character_saves)) + var/datum/character_save/CS = character_saves[i] + if(CS.from_db) + name = CS.real_name + else + name = "Character [i]" + if(i == default_slot) + name = "[name]" + dat += "[name]
" -/datum/preferences/proc/get_tweak_metadata(datum/gear/G, datum/gear_tweak/tweak) - var/list/metadata = get_gear_metadata(G) - . = metadata["[tweak]"] - if(!.) - . = tweak.get_default() - metadata["[tweak]"] = . + dat += "
" + dat += "Close
" + dat += "
" // Easier to press up here. - else - html += "
Unavailable occupations are crossed out.
" - html += "
" // Easier to press up here. - html += "
Left-click to raise an occupation preference, right-click to lower it.
"
- html += ""
- html += "| " // Table within a table for alignment, also allows you to easily add more colomns.
- html += " |
|
Get random job if preferences unavailable
" - if(BE_ASSISTANT) - html += "
Be a civilian if preferences unavailable
" - if(RETURN_TO_LOBBY) - html += "
Return to lobby if preferences unavailable
" - - html += "
Learn About Job Selection
Occupation Preferences
", width, height)
- popup.set_window_options("can_close=0")
- var/html_string = html.Join()
- popup.set_content(html_string)
+ var/datum/browser/popup = new(user, "saves", "Character Saves
", 300, 390)
+ popup.set_content(dat)
popup.open(0)
- return
-/datum/preferences/proc/SetJobPreferenceLevel(datum/job/job, level)
- if(!job)
- return 0
+/datum/preferences/proc/close_load_dialog(mob/user)
+ user << browse(null, "window=saves")
- if(level == 1) // to high
- // remove any other job(s) set to high
- job_support_med |= job_support_high
- job_engsec_med |= job_engsec_high
- job_medsci_med |= job_medsci_high
- job_karma_med |= job_karma_high
- job_support_high = 0
- job_engsec_high = 0
- job_medsci_high = 0
- job_karma_high = 0
-
- if(job.department_flag == JOBCAT_SUPPORT)
- job_support_low &= ~job.flag
- job_support_med &= ~job.flag
- job_support_high &= ~job.flag
-
- switch(level)
- if(1)
- job_support_high |= job.flag
- if(2)
- job_support_med |= job.flag
- if(3)
- job_support_low |= job.flag
-
- return 1
- else if(job.department_flag == JOBCAT_ENGSEC)
- job_engsec_low &= ~job.flag
- job_engsec_med &= ~job.flag
- job_engsec_high &= ~job.flag
-
- switch(level)
- if(1)
- job_engsec_high |= job.flag
- if(2)
- job_engsec_med |= job.flag
- if(3)
- job_engsec_low |= job.flag
-
- return 1
- else if(job.department_flag == JOBCAT_MEDSCI)
- job_medsci_low &= ~job.flag
- job_medsci_med &= ~job.flag
- job_medsci_high &= ~job.flag
-
- switch(level)
- if(1)
- job_medsci_high |= job.flag
- if(2)
- job_medsci_med |= job.flag
- if(3)
- job_medsci_low |= job.flag
-
- return 1
- else if(job.department_flag == JOBCAT_KARMA)
- job_karma_low &= ~job.flag
- job_karma_med &= ~job.flag
- job_karma_high &= ~job.flag
-
- switch(level)
- if(1)
- job_karma_high |= job.flag
- if(2)
- job_karma_med |= job.flag
- if(3)
- job_karma_low |= job.flag
-
- return 1
-
- return 0
/datum/preferences/proc/UpdateJobPreference(mob/user, role, desiredLvl)
var/datum/job/job = SSjobs.GetJob(role)
@@ -853,96 +523,19 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
return
if(role == "Civilian")
- if(job_support_low & job.flag)
- job_support_low &= ~job.flag
+ if(active_character.job_support_low & job.flag)
+ active_character.job_support_low &= ~job.flag
else
- job_support_low |= job.flag
- SetChoices(user)
+ active_character.job_support_low |= job.flag
+ active_character.SetChoices(user)
return 1
- SetJobPreferenceLevel(job, desiredLvl)
- SetChoices(user)
+ active_character.SetJobPreferenceLevel(job, desiredLvl)
+ active_character.SetChoices(user)
return 1
-/datum/preferences/proc/ShowDisabilityState(mob/user, flag, label)
- return "Choose Disabilities
", 350, 380)
- popup.set_content(HTML)
- popup.open(0)
-
-/datum/preferences/proc/SetRecords(mob/user)
- var/HTML = ""
- HTML += "" - - if(length(med_record) <= 40) - HTML += "[med_record]" - else - HTML += "[copytext(med_record, 1, 37)]..." - - HTML += "
Employment Records
" - - if(length(gen_record) <= 40) - HTML += "[gen_record]" - else - HTML += "[copytext(gen_record, 1, 37)]..." - - HTML += "
Security Records
" - - if(length(sec_record) <= 40) - HTML += "[sec_record]
" - else - HTML += "[copytext(sec_record, 1, 37)]...
" - - HTML += "\[Done\]" - HTML += "
Character Records
", 350, 300)
- popup.set_content(HTML)
- popup.open(0)
-
-/datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
- return player_alt_titles.Find(job.title) > 0 \
- ? player_alt_titles[job.title] \
- : job.title
-
-/datum/preferences/proc/SetPlayerAltTitle(datum/job/job, new_title)
- // remove existing entry
- if(player_alt_titles.Find(job.title))
- player_alt_titles -= job.title
- // add one if it's not default
- if(job.title != new_title)
- player_alt_titles[job.title] = new_title
-
+// This is scoped here instead of /datum/character_save just because of ShowChoices()
/datum/preferences/proc/SetJob(mob/user, role)
var/datum/job/job = SSjobs.GetJob(role)
if(!job)
@@ -951,1387 +544,21 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
return
if(role == "Civilian")
- if(job_support_low & job.flag)
- job_support_low &= ~job.flag
+ if(active_character.job_support_low & job.flag)
+ active_character.job_support_low &= ~job.flag
else
- job_support_low |= job.flag
- SetChoices(user)
+ active_character.job_support_low |= job.flag
+ active_character.SetChoices(user)
return 1
- if(GetJobDepartment(job, 1) & job.flag)
- SetJobDepartment(job, 1)
- else if(GetJobDepartment(job, 2) & job.flag)
- SetJobDepartment(job, 2)
- else if(GetJobDepartment(job, 3) & job.flag)
- SetJobDepartment(job, 3)
+ if(active_character.GetJobDepartment(job, 1) & job.flag)
+ active_character.SetJobDepartment(job, 1)
+ else if(active_character.GetJobDepartment(job, 2) & job.flag)
+ active_character.SetJobDepartment(job, 2)
+ else if(active_character.GetJobDepartment(job, 3) & job.flag)
+ active_character.SetJobDepartment(job, 3)
else//job = Never
- SetJobDepartment(job, 4)
+ active_character.SetJobDepartment(job, 4)
- SetChoices(user)
+ active_character.SetChoices(user)
return 1
-
-/datum/preferences/proc/ResetJobs()
- job_support_high = 0
- job_support_med = 0
- job_support_low = 0
-
- job_medsci_high = 0
- job_medsci_med = 0
- job_medsci_low = 0
-
- job_engsec_high = 0
- job_engsec_med = 0
- job_engsec_low = 0
-
- job_karma_high = 0
- job_karma_med = 0
- job_karma_low = 0
-
-
-/datum/preferences/proc/GetJobDepartment(datum/job/job, level)
- if(!job || !level) return 0
- switch(job.department_flag)
- if(JOBCAT_SUPPORT)
- switch(level)
- if(1)
- return job_support_high
- if(2)
- return job_support_med
- if(3)
- return job_support_low
- if(JOBCAT_MEDSCI)
- switch(level)
- if(1)
- return job_medsci_high
- if(2)
- return job_medsci_med
- if(3)
- return job_medsci_low
- if(JOBCAT_ENGSEC)
- switch(level)
- if(1)
- return job_engsec_high
- if(2)
- return job_engsec_med
- if(3)
- return job_engsec_low
- if(JOBCAT_KARMA)
- switch(level)
- if(1)
- return job_karma_high
- if(2)
- return job_karma_med
- if(3)
- return job_karma_low
- return 0
-
-/datum/preferences/proc/SetJobDepartment(datum/job/job, level)
- if(!job || !level) return 0
- switch(level)
- if(1)//Only one of these should ever be active at once so clear them all here
- job_support_high = 0
- job_medsci_high = 0
- job_engsec_high = 0
- job_karma_high = 0
- return 1
- if(2)//Set current highs to med, then reset them
- job_support_med |= job_support_high
- job_medsci_med |= job_medsci_high
- job_engsec_med |= job_engsec_high
- job_karma_med |= job_karma_high
- job_support_high = 0
- job_medsci_high = 0
- job_engsec_high = 0
- job_karma_high = 0
-
- switch(job.department_flag)
- if(JOBCAT_SUPPORT)
- switch(level)
- if(2)
- job_support_high = job.flag
- job_support_med &= ~job.flag
- if(3)
- job_support_med |= job.flag
- job_support_low &= ~job.flag
- else
- job_support_low |= job.flag
- if(JOBCAT_MEDSCI)
- switch(level)
- if(2)
- job_medsci_high = job.flag
- job_medsci_med &= ~job.flag
- if(3)
- job_medsci_med |= job.flag
- job_medsci_low &= ~job.flag
- else
- job_medsci_low |= job.flag
- if(JOBCAT_ENGSEC)
- switch(level)
- if(2)
- job_engsec_high = job.flag
- job_engsec_med &= ~job.flag
- if(3)
- job_engsec_med |= job.flag
- job_engsec_low &= ~job.flag
- else
- job_engsec_low |= job.flag
- if(JOBCAT_KARMA)
- switch(level)
- if(2)
- job_karma_high = job.flag
- job_karma_med &= ~job.flag
- if(3)
- job_karma_med |= job.flag
- job_karma_low &= ~job.flag
- else
- job_karma_low |= job.flag
- return 1
-
-/datum/preferences/proc/process_link(mob/user, list/href_list)
- if(!user) return
-
- var/datum/species/S = GLOB.all_species[species]
- if(href_list["preference"] == "job")
- switch(href_list["task"])
- if("close")
- user << browse(null, "window=mob_occupation")
- ShowChoices(user)
- if("reset")
- ResetJobs()
- SetChoices(user)
- if("learnaboutselection")
- if(GLOB.configuration.url.wiki_url)
- if(alert("Would you like to open the Job selection info in your browser?", "Open Job Selection", "Yes", "No") == "Yes")
- user << link("[GLOB.configuration.url.wiki_url]/index.php/Job_Selection_and_Assignment")
- else
- to_chat(user, "The Wiki URL is not set in the server configuration.")
- if("random")
- if(alternate_option == GET_RANDOM_JOB || alternate_option == BE_ASSISTANT)
- alternate_option += 1
- else if(alternate_option == RETURN_TO_LOBBY)
- alternate_option = 0
- else
- return 0
- SetChoices(user)
- if("alt_title")
- var/datum/job/job = locate(href_list["job"])
- if(job)
- var/choices = list(job.title) + job.alt_titles
- var/choice = input("Pick a title for [job.title].", "Character Generation", GetPlayerAltTitle(job)) as anything in choices | null
- if(choice)
- SetPlayerAltTitle(job, choice)
- SetChoices(user)
- if("input")
- SetJob(user, href_list["text"])
- if("setJobLevel")
- UpdateJobPreference(user, href_list["text"], text2num(href_list["level"]))
- else
- SetChoices(user)
- return 1
- else if(href_list["preference"] == "disabilities")
-
- switch(href_list["task"])
- if("close")
- user << browse(null, "window=disabil")
- ShowChoices(user)
- if("reset")
- disabilities=0
- SetDisabilities(user)
- if("input")
- var/dflag=text2num(href_list["disability"])
- if(dflag >= 0) // Toggle it.
- disabilities ^= text2num(href_list["disability"]) //MAGIC
- SetDisabilities(user)
- else
- SetDisabilities(user)
- return 1
-
- else if(href_list["preference"] == "records")
- if(text2num(href_list["record"]) >= 1)
- SetRecords(user)
- return
- else
- user << browse(null, "window=records")
- if(href_list["task"] == "med_record")
- var/medmsg = input(usr,"Set your medical notes here.","Medical Records",html_decode(med_record)) as message
-
- if(medmsg != null)
- medmsg = copytext(medmsg, 1, MAX_PAPER_MESSAGE_LEN)
- medmsg = html_encode(medmsg)
-
- med_record = medmsg
- SetRecords(user)
-
- if(href_list["task"] == "sec_record")
- var/secmsg = input(usr,"Set your security notes here.","Security Records",html_decode(sec_record)) as message
-
- if(secmsg != null)
- secmsg = copytext(secmsg, 1, MAX_PAPER_MESSAGE_LEN)
- secmsg = html_encode(secmsg)
-
- sec_record = secmsg
- SetRecords(user)
- if(href_list["task"] == "gen_record")
- var/genmsg = input(usr,"Set your employment notes here.","Employment Records",html_decode(gen_record)) as message
-
- if(genmsg != null)
- genmsg = copytext(genmsg, 1, MAX_PAPER_MESSAGE_LEN)
- genmsg = html_encode(genmsg)
-
- gen_record = genmsg
- SetRecords(user)
-
- if(href_list["preference"] == "gear")
- if(href_list["toggle_gear"])
- var/datum/gear/TG = GLOB.gear_datums[href_list["toggle_gear"]]
- if(TG.display_name in loadout_gear)
- loadout_gear -= TG.display_name
- else
- if(TG.donator_tier && user.client.donator_level < TG.donator_tier)
- to_chat(user, "That gear is only available at a higher donation tier than you are on.")
- return
- var/total_cost = 0
- var/list/type_blacklist = list()
- for(var/gear_name in loadout_gear)
- var/datum/gear/G = GLOB.gear_datums[gear_name]
- if(istype(G))
- if(!G.subtype_cost_overlap)
- if(G.subtype_path in type_blacklist)
- continue
- type_blacklist += G.subtype_path
- total_cost += G.cost
-
- if((total_cost + TG.cost) <= max_gear_slots)
- loadout_gear += TG.display_name
-
- else if(href_list["gear"] && href_list["tweak"])
- var/datum/gear/gear = GLOB.gear_datums[href_list["gear"]]
- var/datum/gear_tweak/tweak = locate(href_list["tweak"])
- if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks))
- return
- var/metadata = tweak.get_metadata(user, get_tweak_metadata(gear, tweak))
- if(!metadata)
- return
- set_tweak_metadata(gear, tweak, metadata)
- else if(href_list["select_category"])
- gear_tab = href_list["select_category"]
- else if(href_list["clear_loadout"])
- loadout_gear.Cut()
-
- ShowChoices(user)
- return
-
- switch(href_list["task"])
- if("random")
- var/datum/robolimb/robohead
- if(S.bodyflags & ALL_RPARTS)
- var/head_model = "[!rlimb_data["head"] ? "Morpheus Cyberkinetics" : rlimb_data["head"]]"
- robohead = GLOB.all_robolimbs[head_model]
- switch(href_list["preference"])
- if("name")
- real_name = random_name(gender,species)
- if(isnewplayer(user))
- var/mob/new_player/N = user
- N.new_player_panel_proc()
- if("age")
- age = rand(AGE_MIN, AGE_MAX)
- if("hair")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
- h_colour = rand_hex_color()
- if("secondary_hair")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
- h_sec_colour = rand_hex_color()
- if("h_style")
- h_style = random_hair_style(gender, species, robohead)
- if("facial")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
- f_colour = rand_hex_color()
- if("secondary_facial")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Wryn", "Vulpkanin", "Vox"))
- f_sec_colour = rand_hex_color()
- if("f_style")
- f_style = random_facial_hair_style(gender, species, robohead)
- if("headaccessory")
- if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species that have head accessories.
- hacc_colour = rand_hex_color()
- if("ha_style")
- if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species that have head accessories.
- ha_style = random_head_accessory(species)
- if("m_style_head")
- if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings.
- m_styles["head"] = random_marking_style("head", species, robohead, null, alt_head)
- if("m_head_colour")
- if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings.
- m_colours["head"] = rand_hex_color()
- if("m_style_body")
- if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings.
- m_styles["body"] = random_marking_style("body", species)
- if("m_body_colour")
- if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings.
- m_colours["body"] = rand_hex_color()
- if("m_style_tail")
- if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings.
- m_styles["tail"] = random_marking_style("tail", species, null, body_accessory)
- if("m_tail_colour")
- if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings.
- m_colours["tail"] = rand_hex_color()
- if("underwear")
- underwear = random_underwear(gender, species)
- ShowChoices(user)
- if("undershirt")
- undershirt = random_undershirt(gender, species)
- ShowChoices(user)
- if("socks")
- socks = random_socks(gender, species)
- ShowChoices(user)
- if("eyes")
- e_colour = rand_hex_color()
- if("s_tone")
- if(S.bodyflags & (HAS_SKIN_TONE|HAS_ICON_SKIN_TONE))
- s_tone = random_skin_tone()
- if("s_color")
- if(S.bodyflags & HAS_SKIN_COLOR)
- s_colour = rand_hex_color()
- if("bag")
- backbag = pick(GLOB.backbaglist)
- /*if("skin_style")
- h_style = random_skin_style(gender)*/
- if("all")
- random_character()
- if("input")
- switch(href_list["preference"])
- if("name")
- var/raw_name = clean_input("Choose your character's name:", "Character Preference", , user)
- if(!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
- var/new_name = reject_bad_name(raw_name, 1)
- if(new_name)
- real_name = new_name
- if(isnewplayer(user))
- var/mob/new_player/N = user
- N.new_player_panel_proc()
- else
- to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .")
-
- if("age")
- var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null
- if(new_age)
- age = max(min(round(text2num(new_age)), AGE_MAX),AGE_MIN)
- if("species")
- var/list/new_species = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
- var/prev_species = species
-
- for(var/species in GLOB.whitelisted_species)
- if(is_alien_whitelisted(user, species))
- new_species += species
-
- species = input("Please select a species", "Character Generation", null) in sortTim(new_species, /proc/cmp_text_asc)
- var/datum/species/NS = GLOB.all_species[species]
- if(!istype(NS)) //The species was invalid. Notify the user and fail out.
- species = prev_species
- to_chat(user, "Invalid species, please pick something else.")
- return
- if(prev_species != species)
- if(NS.has_gender && gender == PLURAL)
- gender = pick(MALE,FEMALE)
- var/datum/robolimb/robohead
- if(NS.bodyflags & ALL_RPARTS)
- var/head_model = "[!rlimb_data["head"] ? "Morpheus Cyberkinetics" : rlimb_data["head"]]"
- robohead = GLOB.all_robolimbs[head_model]
- //grab one of the valid hair styles for the newly chosen species
- h_style = random_hair_style(gender, species, robohead)
-
- //grab one of the valid facial hair styles for the newly chosen species
- f_style = random_facial_hair_style(gender, species, robohead)
-
- if(NS.bodyflags & HAS_HEAD_ACCESSORY) //Species that have head accessories.
- ha_style = random_head_accessory(species)
- else
- ha_style = "None" // No Vulp ears on Unathi
- hacc_colour = rand_hex_color()
-
- if(NS.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings.
- m_styles["head"] = random_marking_style("head", species, robohead, null, alt_head)
- else
- m_styles["head"] = "None"
- m_colours["head"] = "#000000"
-
- if(NS.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos.
- m_styles["body"] = random_marking_style("body", species)
- else
- m_styles["body"] = "None"
- m_colours["body"] = "#000000"
-
- if(NS.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings.
- m_styles["tail"] = random_marking_style("tail", species, null, body_accessory)
- else
- m_styles["tail"] = "None"
- m_colours["tail"] = "#000000"
-
- // Don't wear another species' underwear!
- var/datum/sprite_accessory/SA = GLOB.underwear_list[underwear]
- if(!SA || !(species in SA.species_allowed))
- underwear = random_underwear(gender, species)
-
- SA = GLOB.undershirt_list[undershirt]
- if(!SA || !(species in SA.species_allowed))
- undershirt = random_undershirt(gender, species)
-
- SA = GLOB.socks_list[socks]
- if(!SA || !(species in SA.species_allowed))
- socks = random_socks(gender, species)
-
- //reset skin tone and colour
- if(NS.bodyflags & (HAS_SKIN_TONE|HAS_ICON_SKIN_TONE))
- random_skin_tone(species)
- else
- s_tone = 0
-
- if(!(NS.bodyflags & HAS_SKIN_COLOR))
- s_colour = "#000000"
-
- alt_head = "None" //No alt heads on species that don't have them.
- speciesprefs = 0 //My Vox tank shouldn't change how my future Grey talks.
-
- body_accessory = null //no vulptail on humans damnit
-
- //Reset prosthetics.
- organ_data = list()
- rlimb_data = list()
-
- if(!(NS.autohiss_basic_map))
- autohiss_mode = AUTOHISS_OFF
- if("speciesprefs")
- speciesprefs = !speciesprefs //Starts 0, so if someone clicks the button up top there, this won't be 0 anymore. If they click it again, it'll go back to 0.
- if("language")
-// var/languages_available
- var/list/new_languages = list("None")
- for(var/L in GLOB.all_languages)
- var/datum/language/lang = GLOB.all_languages[L]
- if(!(lang.flags & RESTRICTED))
- new_languages += lang.name
-
- language = input("Please select a secondary language", "Character Generation", null) in sortTim(new_languages, /proc/cmp_text_asc)
-
- if("autohiss_mode")
- if(S.autohiss_basic_map)
- var/list/autohiss_choice = list("Off" = AUTOHISS_OFF, "Basic" = AUTOHISS_BASIC, "Full" = AUTOHISS_FULL)
- var/new_autohiss_pref = input(user, "Choose your character's auto-accent level:", "Character Preference") as null|anything in autohiss_choice
- if(new_autohiss_pref)
- autohiss_mode = autohiss_choice[new_autohiss_pref]
-
- if("metadata")
- var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata) as message|null
- if(new_metadata)
- metadata = sanitize(copytext(new_metadata,1,MAX_MESSAGE_LEN))
-
- if("b_type")
- var/new_b_type = input(user, "Choose your character's blood-type:", "Character Preference") as null|anything in list( "A+", "A-", "B+", "B-", "AB+", "AB-", "O+", "O-" )
- if(new_b_type)
- b_type = new_b_type
-
- if("hair")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox")) //Species that have hair. (No HAS_HAIR flag)
- var/input = "Choose your character's hair colour:"
- var/new_hair = input(user, input, "Character Preference", h_colour) as color|null
- if(new_hair)
- h_colour = new_hair
-
- if("secondary_hair")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
- var/datum/sprite_accessory/hair_style = GLOB.hair_styles_public_list[h_style]
- if(hair_style.secondary_theme && !hair_style.no_sec_colour)
- var/new_hair = input(user, "Choose your character's secondary hair colour:", "Character Preference", h_sec_colour) as color|null
- if(new_hair)
- h_sec_colour = new_hair
-
- if("h_style")
- var/list/valid_hairstyles = list()
- for(var/hairstyle in GLOB.hair_styles_public_list)
- var/datum/sprite_accessory/SA = GLOB.hair_styles_public_list[hairstyle]
-
- if(hairstyle == "Bald") //Just in case.
- valid_hairstyles += hairstyle
- continue
- if(S.bodyflags & ALL_RPARTS) //Species that can use prosthetic heads.
- var/head_model
- if(!rlimb_data["head"]) //Handle situations where the head is default.
- head_model = "Morpheus Cyberkinetics"
- else
- head_model = rlimb_data["head"]
- var/datum/robolimb/robohead = GLOB.all_robolimbs[head_model]
- if((species in SA.species_allowed) && robohead.is_monitor && ((SA.models_allowed && (robohead.company in SA.models_allowed)) || !SA.models_allowed)) //If this is a hair style native to the user's species, check to see if they have a head with an ipc-style screen and that the head's company is in the screen style's allowed models list.
- valid_hairstyles += hairstyle //Give them their hairstyles if they do.
- else
- if(!robohead.is_monitor && ("Human" in SA.species_allowed)) /*If the hairstyle is not native to the user's species and they're using a head with an ipc-style screen, don't let them access it.
- But if the user has a robotic humanoid head and the hairstyle can fit humans, let them use it as a wig. */
- valid_hairstyles += hairstyle
- else //If the user is not a species who can have robotic heads, use the default handling.
- if(species in SA.species_allowed) //If the user's head is of a species the hairstyle allows, add it to the list.
- valid_hairstyles += hairstyle
-
- sortTim(valid_hairstyles, /proc/cmp_text_asc) //this alphabetizes the list
- var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in valid_hairstyles
- if(new_h_style)
- h_style = new_h_style
-
- if("headaccessory")
- if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species with head accessories.
- var/input = "Choose the colour of your your character's head accessory:"
- var/new_head_accessory = input(user, input, "Character Preference", hacc_colour) as color|null
- if(new_head_accessory)
- hacc_colour = new_head_accessory
-
- if("ha_style")
- if(S.bodyflags & HAS_HEAD_ACCESSORY) //Species with head accessories.
- var/list/valid_head_accessory_styles = list()
- for(var/head_accessory_style in GLOB.head_accessory_styles_list)
- var/datum/sprite_accessory/H = GLOB.head_accessory_styles_list[head_accessory_style]
- if(!(species in H.species_allowed))
- continue
-
- valid_head_accessory_styles += head_accessory_style
-
- sortTim(valid_head_accessory_styles, /proc/cmp_text_asc)
- var/new_head_accessory_style = input(user, "Choose the style of your character's head accessory:", "Character Preference") as null|anything in valid_head_accessory_styles
- if(new_head_accessory_style)
- ha_style = new_head_accessory_style
-
- if("alt_head")
- if(organ_data["head"] == "cyborg")
- return
- if(S.bodyflags & HAS_ALT_HEADS) //Species with alt heads.
- var/list/valid_alt_heads = list()
- valid_alt_heads["None"] = GLOB.alt_heads_list["None"] //The only null entry should be the "None" option
- for(var/alternate_head in GLOB.alt_heads_list)
- var/datum/sprite_accessory/alt_heads/head = GLOB.alt_heads_list[alternate_head]
- if(!(species in head.species_allowed))
- continue
-
- valid_alt_heads += alternate_head
-
- var/new_alt_head = input(user, "Choose your character's alternate head style:", "Character Preference") as null|anything in valid_alt_heads
- if(new_alt_head)
- alt_head = new_alt_head
- if(m_styles["head"])
- var/head_marking = m_styles["head"]
- var/datum/sprite_accessory/body_markings/head/head_marking_style = GLOB.marking_styles_list[head_marking]
- if(!head_marking_style.heads_allowed || (!("All" in head_marking_style.heads_allowed) && !(alt_head in head_marking_style.heads_allowed)))
- m_styles["head"] = "None"
-
- if("m_style_head")
- if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings.
- var/list/valid_markings = list()
- valid_markings["None"] = GLOB.marking_styles_list["None"]
- for(var/markingstyle in GLOB.marking_styles_list)
- var/datum/sprite_accessory/body_markings/head/M = GLOB.marking_styles_list[markingstyle]
- if(!(species in M.species_allowed))
- continue
- if(M.marking_location != "head")
- continue
- if(alt_head && alt_head != "None")
- if(!("All" in M.heads_allowed) && !(alt_head in M.heads_allowed))
- continue
- else
- if(M.heads_allowed && !("All" in M.heads_allowed))
- continue
-
- if(S.bodyflags & ALL_RPARTS) //Species that can use prosthetic heads.
- var/head_model
- if(!rlimb_data["head"]) //Handle situations where the head is default.
- head_model = "Morpheus Cyberkinetics"
- else
- head_model = rlimb_data["head"]
- var/datum/robolimb/robohead = GLOB.all_robolimbs[head_model]
- if(robohead.is_monitor && M.name != "None") //If the character can have prosthetic heads and they have the default Morpheus head (or another monitor-head), no optic markings.
- continue
- else if(!robohead.is_monitor && M.name != "None") //Otherwise, if they DON'T have the default head and the head's not a monitor but the head's not in the style's list of allowed models, skip.
- if(!(robohead.company in M.models_allowed))
- continue
-
- valid_markings += markingstyle
- sortTim(valid_markings, /proc/cmp_text_asc)
- var/new_marking_style = input(user, "Choose the style of your character's head markings:", "Character Preference", m_styles["head"]) as null|anything in valid_markings
- if(new_marking_style)
- m_styles["head"] = new_marking_style
-
- if("m_head_colour")
- if(S.bodyflags & HAS_HEAD_MARKINGS) //Species with head markings.
- var/input = "Choose the colour of your your character's head markings:"
- var/new_markings = input(user, input, "Character Preference", m_colours["head"]) as color|null
- if(new_markings)
- m_colours["head"] = new_markings
-
- if("m_style_body")
- if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos.
- var/list/valid_markings = list()
- valid_markings["None"] = GLOB.marking_styles_list["None"]
- for(var/markingstyle in GLOB.marking_styles_list)
- var/datum/sprite_accessory/M = GLOB.marking_styles_list[markingstyle]
- if(!(species in M.species_allowed))
- continue
- if(M.marking_location != "body")
- continue
-
- valid_markings += markingstyle
- sortTim(valid_markings, /proc/cmp_text_asc)
- var/new_marking_style = input(user, "Choose the style of your character's body markings:", "Character Preference", m_styles["body"]) as null|anything in valid_markings
- if(new_marking_style)
- m_styles["body"] = new_marking_style
-
- if("m_body_colour")
- if(S.bodyflags & HAS_BODY_MARKINGS) //Species with body markings/tattoos.
- var/input = "Choose the colour of your your character's body markings:"
- var/new_markings = input(user, input, "Character Preference", m_colours["body"]) as color|null
- if(new_markings)
- m_colours["body"] = new_markings
-
- if("m_style_tail")
- if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings.
- var/list/valid_markings = list()
- valid_markings["None"] = GLOB.marking_styles_list["None"]
- for(var/markingstyle in GLOB.marking_styles_list)
- var/datum/sprite_accessory/body_markings/tail/M = GLOB.marking_styles_list[markingstyle]
- if(M.marking_location != "tail")
- continue
- if(!(species in M.species_allowed))
- continue
- if(!body_accessory)
- if(M.tails_allowed)
- continue
- else
- if(!M.tails_allowed || !(body_accessory in M.tails_allowed))
- continue
-
- valid_markings += markingstyle
- sortTim(valid_markings, /proc/cmp_text_asc)
- var/new_marking_style = input(user, "Choose the style of your character's tail markings:", "Character Preference", m_styles["tail"]) as null|anything in valid_markings
- if(new_marking_style)
- m_styles["tail"] = new_marking_style
-
- if("m_tail_colour")
- if(S.bodyflags & HAS_TAIL_MARKINGS) //Species with tail markings.
- var/input = "Choose the colour of your your character's tail markings:"
- var/new_markings = input(user, input, "Character Preference", m_colours["tail"]) as color|null
- if(new_markings)
- m_colours["tail"] = new_markings
-
- if("body_accessory")
- var/list/possible_body_accessories = list()
- if(check_rights(R_ADMIN, 1, user))
- possible_body_accessories = GLOB.body_accessory_by_name.Copy()
- else
- for(var/B in GLOB.body_accessory_by_name)
- var/datum/body_accessory/accessory = GLOB.body_accessory_by_name[B]
- if(!istype(accessory))
- possible_body_accessories += "None" //the only null entry should be the "None" option
- continue
- if(species in accessory.allowed_species)
- possible_body_accessories += B
- sortTim(possible_body_accessories, /proc/cmp_text_asc)
- var/new_body_accessory = input(user, "Choose your body accessory:", "Character Preference") as null|anything in possible_body_accessories
- if(new_body_accessory)
- m_styles["tail"] = "None"
- body_accessory = (new_body_accessory == "None") ? null : new_body_accessory
-
- if("facial")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox")) //Species that have facial hair. (No HAS_HAIR_FACIAL flag)
- var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference", f_colour) as color|null
- if(new_facial)
- f_colour = new_facial
-
- if("secondary_facial")
- if(species in list("Human", "Unathi", "Tajaran", "Skrell", "Machine", "Vulpkanin", "Vox"))
- var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[f_style]
- if(facial_hair_style.secondary_theme && !facial_hair_style.no_sec_colour)
- var/new_facial = input(user, "Choose your character's secondary facial-hair colour:", "Character Preference", f_sec_colour) as color|null
- if(new_facial)
- f_sec_colour = new_facial
-
- if("f_style")
- var/list/valid_facial_hairstyles = list()
- for(var/facialhairstyle in GLOB.facial_hair_styles_list)
- var/datum/sprite_accessory/SA = GLOB.facial_hair_styles_list[facialhairstyle]
-
- if(facialhairstyle == "Shaved") //Just in case.
- valid_facial_hairstyles += facialhairstyle
- continue
- if(gender == MALE && SA.gender == FEMALE)
- continue
- if(gender == FEMALE && SA.gender == MALE)
- continue
- if(S.bodyflags & ALL_RPARTS) //Species that can use prosthetic heads.
- var/head_model
- if(!rlimb_data["head"]) //Handle situations where the head is default.
- head_model = "Morpheus Cyberkinetics"
- else
- head_model = rlimb_data["head"]
- var/datum/robolimb/robohead = GLOB.all_robolimbs[head_model]
- if((species in SA.species_allowed) && robohead.is_monitor && ((SA.models_allowed && (robohead.company in SA.models_allowed)) || !SA.models_allowed)) //If this is a facial hair style native to the user's species, check to see if they have a head with an ipc-style screen and that the head's company is in the screen style's allowed models list.
- valid_facial_hairstyles += facialhairstyle //Give them their facial hairstyles if they do.
- else
- if(!robohead.is_monitor && ("Human" in SA.species_allowed)) /*If the facial hairstyle is not native to the user's species and they're using a head with an ipc-style screen, don't let them access it.
- But if the user has a robotic humanoid head and the facial hairstyle can fit humans, let them use it as a wig. */
- valid_facial_hairstyles += facialhairstyle
- else //If the user is not a species who can have robotic heads, use the default handling.
- if(species in SA.species_allowed) //If the user's head is of a species the facial hair style allows, add it to the list.
- valid_facial_hairstyles += facialhairstyle
- sortTim(valid_facial_hairstyles, /proc/cmp_text_asc)
- var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in valid_facial_hairstyles
- if(new_f_style)
- f_style = new_f_style
-
- if("underwear")
- var/list/valid_underwear = list()
- for(var/underwear in GLOB.underwear_list)
- var/datum/sprite_accessory/SA = GLOB.underwear_list[underwear]
- if(gender == MALE && SA.gender == FEMALE)
- continue
- if(gender == FEMALE && SA.gender == MALE)
- continue
- if(!(species in SA.species_allowed))
- continue
- valid_underwear[underwear] = GLOB.underwear_list[underwear]
- sortTim(valid_underwear, /proc/cmp_text_asc)
- var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference") as null|anything in valid_underwear
- ShowChoices(user)
- if(new_underwear)
- underwear = new_underwear
- if("undershirt")
- var/list/valid_undershirts = list()
- for(var/undershirt in GLOB.undershirt_list)
- var/datum/sprite_accessory/SA = GLOB.undershirt_list[undershirt]
- if(gender == MALE && SA.gender == FEMALE)
- continue
- if(gender == FEMALE && SA.gender == MALE)
- continue
- if(!(species in SA.species_allowed))
- continue
- valid_undershirts[undershirt] = GLOB.undershirt_list[undershirt]
- sortTim(valid_undershirts, /proc/cmp_text_asc)
- var/new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in valid_undershirts
- ShowChoices(user)
- if(new_undershirt)
- undershirt = new_undershirt
-
- if("socks")
- var/list/valid_sockstyles = list()
- for(var/sockstyle in GLOB.socks_list)
- var/datum/sprite_accessory/SA = GLOB.socks_list[sockstyle]
- if(gender == MALE && SA.gender == FEMALE)
- continue
- if(gender == FEMALE && SA.gender == MALE)
- continue
- if(!(species in SA.species_allowed))
- continue
- valid_sockstyles[sockstyle] = GLOB.socks_list[sockstyle]
- sortTim(valid_sockstyles, /proc/cmp_text_asc)
- var/new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in valid_sockstyles
- ShowChoices(user)
- if(new_socks)
- socks = new_socks
-
- if("eyes")
- var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference", e_colour) as color|null
- if(new_eyes)
- e_colour = new_eyes
-
- if("s_tone")
- if(S.bodyflags & HAS_SKIN_TONE)
- var/new_s_tone = input(user, "Choose your character's skin-tone:\n(Light 1 - 220 Dark)", "Character Preference") as num|null
- if(new_s_tone)
- s_tone = 35 - max(min(round(new_s_tone), 220), 1)
- else if(S.bodyflags & HAS_ICON_SKIN_TONE)
- var/const/MAX_LINE_ENTRIES = 4
- var/prompt = "Choose your character's skin tone: 1-[S.icon_skin_tones.len]\n("
- for(var/i = 1 to S.icon_skin_tones.len)
- if(i > MAX_LINE_ENTRIES && !((i - 1) % MAX_LINE_ENTRIES))
- prompt += "\n"
- prompt += "[i] = [S.icon_skin_tones[i]]"
- if(i != S.icon_skin_tones.len)
- prompt += ", "
- prompt += ")"
- var/skin_c = input(user, prompt, "Character Preference") as num|null
- if(isnum(skin_c))
- s_tone = max(min(round(skin_c), S.icon_skin_tones.len), 1)
-
- if("skin")
- if((S.bodyflags & HAS_SKIN_COLOR) || GLOB.body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user))
- var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference", s_colour) as color|null
- if(new_skin)
- s_colour = new_skin
-
- if("ooccolor")
- var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference", ooccolor) as color|null
- if(new_ooccolor)
- ooccolor = new_ooccolor
-
- if("bag")
- var/new_backbag = input(user, "Choose your character's style of bag:", "Character Preference") as null|anything in GLOB.backbaglist
- if(new_backbag)
- backbag = new_backbag
-
- if("nt_relation")
- var/new_relation = input(user, "Choose your relation to NT. Note that this represents what others can find out about your character by researching your background, not what your character actually thinks.", "Character Preference") as null|anything in list("Loyal", "Supportive", "Neutral", "Skeptical", "Opposed")
- if(new_relation)
- nanotrasen_relation = new_relation
-
- if("flavor_text")
- var/msg = input(usr,"Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance. SFW Drawn Art of your character is acceptable.","Flavor Text",html_decode(flavor_text)) as message
-
- if(msg != null)
- msg = copytext(msg, 1, MAX_MESSAGE_LEN)
- msg = html_encode(msg)
-
- flavor_text = msg
-
- if("limbs")
- var/valid_limbs = list("Left Leg", "Right Leg", "Left Arm", "Right Arm", "Left Foot", "Right Foot", "Left Hand", "Right Hand")
- if(S.bodyflags & ALL_RPARTS)
- valid_limbs = list("Torso", "Lower Body", "Head", "Left Leg", "Right Leg", "Left Arm", "Right Arm", "Left Foot", "Right Foot", "Left Hand", "Right Hand")
- var/limb_name = input(user, "Which limb do you want to change?") as null|anything in valid_limbs
- if(!limb_name) return
-
- var/limb = null
- var/second_limb = null // if you try to change the arm, the hand should also change
- var/third_limb = null // if you try to unchange the hand, the arm should also change
- var/valid_limb_states = list("Normal", "Amputated", "Prosthesis")
- var/no_amputate = 0
-
- switch(limb_name)
- if("Torso")
- limb = "chest"
- second_limb = "groin"
- no_amputate = 1
- if("Lower Body")
- limb = "groin"
- no_amputate = 1
- if("Head")
- limb = "head"
- no_amputate = 1
- if("Left Leg")
- limb = "l_leg"
- second_limb = "l_foot"
- if("Right Leg")
- limb = "r_leg"
- second_limb = "r_foot"
- if("Left Arm")
- limb = "l_arm"
- second_limb = "l_hand"
- if("Right Arm")
- limb = "r_arm"
- second_limb = "r_hand"
- if("Left Foot")
- limb = "l_foot"
- if(!(S.bodyflags & ALL_RPARTS))
- third_limb = "l_leg"
- if("Right Foot")
- limb = "r_foot"
- if(!(S.bodyflags & ALL_RPARTS))
- third_limb = "r_leg"
- if("Left Hand")
- limb = "l_hand"
- if(!(S.bodyflags & ALL_RPARTS))
- third_limb = "l_arm"
- if("Right Hand")
- limb = "r_hand"
- if(!(S.bodyflags & ALL_RPARTS))
- third_limb = "r_arm"
-
- var/new_state = input(user, "What state do you wish the limb to be in?") as null|anything in valid_limb_states
- if(!new_state) return
-
- switch(new_state)
- if("Normal")
- if(limb == "head")
- m_styles["head"] = "None"
- h_style = GLOB.hair_styles_public_list["Bald"]
- f_style = GLOB.facial_hair_styles_list["Shaved"]
- organ_data[limb] = null
- rlimb_data[limb] = null
- if(third_limb)
- organ_data[third_limb] = null
- rlimb_data[third_limb] = null
- if("Amputated")
- if(!no_amputate)
- organ_data[limb] = "amputated"
- rlimb_data[limb] = null
- if(second_limb)
- organ_data[second_limb] = "amputated"
- rlimb_data[second_limb] = null
- if("Prosthesis")
- var/choice
- var/subchoice
- var/datum/robolimb/R = new()
- var/in_model
- var/robolimb_companies = list()
- for(var/limb_type in typesof(/datum/robolimb)) //This loop populates a list of companies that offer the limb the user selected previously as one of their cybernetic products.
- R = new limb_type()
- if(!R.unavailable_at_chargen && (limb in R.parts) && R.has_subtypes) //Ensures users can only choose companies that offer the parts they want, that singular models get added to the list as well companies that offer more than one model, and...
- robolimb_companies[R.company] = R //List only main brands that have the parts we're looking for.
- R = new() //Re-initialize R.
-
- choice = input(user, "Which manufacturer do you wish to use for this limb?") as null|anything in robolimb_companies //Choose from a list of companies that offer the part the user wants.
- if(!choice)
- return
- R.company = choice
- R = GLOB.all_robolimbs[R.company]
- if(R.has_subtypes == 1) //If the company the user selected provides more than just one base model, lets handle it.
- var/list/robolimb_models = list()
- for(var/limb_type in typesof(R)) //Handling the different models of parts that manufacturers can provide.
- var/datum/robolimb/L = new limb_type()
- if(limb in L.parts) //Make sure that only models that provide the parts the user needs populate the list.
- robolimb_models[L.company] = L
- if(robolimb_models.len == 1) //If there's only one model available in the list, autoselect it to avoid having to bother the user with a dialog that provides only one option.
- subchoice = L.company //If there ends up being more than one model populating the list, subchoice will be overwritten later anyway, so this isn't a problem.
- if(second_limb in L.parts) //If the child limb of the limb the user selected is also present in the model's parts list, state it's been found so the second limb can be set later.
- in_model = 1
- if(robolimb_models.len > 1) //If there's more than one model in the list that can provide the part the user wants, let them choose.
- subchoice = input(user, "Which model of [choice] [limb_name] do you wish to use?") as null|anything in robolimb_models
- if(subchoice)
- choice = subchoice
- if(limb in list("head", "chest", "groin"))
- if(!(S.bodyflags & ALL_RPARTS))
- return
- if(limb == "head")
- ha_style = "None"
- alt_head = null
- h_style = GLOB.hair_styles_public_list["Bald"]
- f_style = GLOB.facial_hair_styles_list["Shaved"]
- m_styles["head"] = "None"
- rlimb_data[limb] = choice
- organ_data[limb] = "cyborg"
- if(second_limb)
- if(subchoice)
- if(in_model)
- rlimb_data[second_limb] = choice
- organ_data[second_limb] = "cyborg"
- else
- rlimb_data[second_limb] = choice
- organ_data[second_limb] = "cyborg"
- if("organs")
- var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Eyes", "Ears", "Heart", "Lungs", "Liver", "Kidneys")
- if(!organ_name)
- return
-
- var/organ = null
- switch(organ_name)
- if("Eyes")
- organ = "eyes"
- if("Ears")
- organ = "ears"
- if("Heart")
- organ = "heart"
- if("Lungs")
- organ = "lungs"
- if("Liver")
- organ = "liver"
- if("Kidneys")
- organ = "kidneys"
-
- var/new_state = input(user, "What state do you wish the organ to be in?") as null|anything in list("Normal", "Cybernetic")
- if(!new_state) return
-
- switch(new_state)
- if("Normal")
- organ_data[organ] = null
- if("Cybernetic")
- organ_data[organ] = "cybernetic"
-
- if("clientfps")
- var/version_message
- if(user.client && user.client.byond_version < 511)
- version_message = "\nYou need to be using byond version 511 or later to take advantage of this feature, your version of [user.client.byond_version] is too low"
- if(world.byond_version < 511)
- version_message += "\nThis server does not currently support client side fps. You can set now for when it does."
- var/desiredfps = input(user, "Choose your desired fps.[version_message]\n(0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
- if(!isnull(desiredfps))
- clientfps = desiredfps
- if(world.byond_version >= 511 && user.client && user.client.byond_version >= 511)
- parent.fps = clientfps
-
- else
- switch(href_list["preference"])
- if("publicity")
- if(unlock_content)
- toggles ^= PREFTOGGLE_MEMBER_PUBLIC
-
- if("donor_public")
- if(user.client.donator_level > 0)
- toggles ^= PREFTOGGLE_DONATOR_PUBLIC
-
- if("gender")
- if(!S.has_gender)
- var/newgender = input(user, "Choose Gender:") as null|anything in list("Male", "Female", "Genderless")
- switch(newgender)
- if("Male")
- gender = MALE
- if("Female")
- gender = FEMALE
- if("Genderless")
- gender = PLURAL
- else
- if(gender == MALE)
- gender = FEMALE
- else
- gender = MALE
- underwear = random_underwear(gender)
-
- if("hear_adminhelps")
- sound ^= SOUND_ADMINHELP
- if("ui")
- switch(UI_style)
- if("Midnight")
- UI_style = "Plasmafire"
- if("Plasmafire")
- UI_style = "Retro"
- if("Retro")
- UI_style = "Slimecore"
- if("Slimecore")
- UI_style = "Operative"
- if("Operative")
- UI_style = "White"
- else
- UI_style = "Midnight"
-
- if(ishuman(usr)) //mid-round preference changes, for aesthetics
- var/mob/living/carbon/human/H = usr
- H.remake_hud()
-
- if("tgui")
- toggles2 ^= PREFTOGGLE_2_FANCYUI
-
- if("ghost_att_anim")
- toggles2 ^= PREFTOGGLE_2_ITEMATTACK
-
- if("winflash")
- toggles2 ^= PREFTOGGLE_2_WINDOWFLASHING
-
- if("afk_watch")
- if(!(toggles2 & PREFTOGGLE_2_AFKWATCH))
- to_chat(user, "You will now get put into cryo dorms after [GLOB.configuration.afk.auto_cryo_minutes] minutes. \
- Then after [GLOB.configuration.afk.auto_despawn_minutes] minutes you will be fully despawned. You will receive a visual and auditory warning before you will be put into cryodorms.")
- else
- to_chat(user, "Automatic cryoing turned off.")
- toggles2 ^= PREFTOGGLE_2_AFKWATCH
-
- if("UIcolor")
- var/UI_style_color_new = input(user, "Choose your UI color, dark colors are not recommended!", UI_style_color) as color|null
- if(!UI_style_color_new) return
- UI_style_color = UI_style_color_new
-
- if(ishuman(usr)) //mid-round preference changes, for aesthetics
- var/mob/living/carbon/human/H = usr
- H.remake_hud()
-
- if("UIalpha")
- var/UI_style_alpha_new = input(user, "Select a new alpha(transparence) parameter for UI, between 50 and 255", UI_style_alpha) as num
- if(!UI_style_alpha_new || !(UI_style_alpha_new <= 255 && UI_style_alpha_new >= 50))
- return
- UI_style_alpha = UI_style_alpha_new
-
- if(ishuman(usr)) //mid-round preference changes, for aesthetics
- var/mob/living/carbon/human/H = usr
- H.remake_hud()
-
- if("be_special")
- var/r = href_list["role"]
- if(r in GLOB.special_roles)
- be_special ^= r
-
- if("name")
- be_random_name = !be_random_name
-
- if("randomslot")
- toggles2 ^= PREFTOGGLE_2_RANDOMSLOT
- if(isnewplayer(usr))
- var/mob/new_player/N = usr
- N.new_player_panel_proc()
-
- if("hear_midis")
- sound ^= SOUND_MIDI
-
- if("lobby_music")
- sound ^= SOUND_LOBBY
- if((sound & SOUND_LOBBY) && user.client)
- user.client.playtitlemusic()
- else
- user.stop_sound_channel(CHANNEL_LOBBYMUSIC)
-
- if("ghost_ears")
- toggles ^= PREFTOGGLE_CHAT_GHOSTEARS
-
- if("ghost_sight")
- toggles ^= PREFTOGGLE_CHAT_GHOSTSIGHT
-
- if("ghost_radio")
- toggles ^= PREFTOGGLE_CHAT_GHOSTRADIO
-
- if("ghost_pda")
- toggles ^= PREFTOGGLE_CHAT_GHOSTPDA
-
- if("ghost_anonsay")
- toggles2 ^= PREFTOGGLE_2_ANONDCHAT
-
- if("save")
- save_preferences(user)
- save_character(user)
-
- if("reload")
- load_preferences(user)
- load_character(user)
-
- if("clear")
- if(!saved || real_name != input("This will clear the current slot permanently. Please enter the character's full name to confirm."))
- return FALSE
- clear_character_slot(user)
-
- if("open_load_dialog")
- if(!IsGuestKey(user.key))
- open_load_dialog(user)
- return 1
-
- if("close_load_dialog")
- close_load_dialog(user)
-
- if("changeslot")
- if(!load_character(user,text2num(href_list["num"])))
- random_character()
- real_name = random_name(gender)
- save_character(user)
- close_load_dialog(user)
- if(isnewplayer(user))
- var/mob/new_player/N = user
- N.new_player_panel_proc()
-
- if("tab")
- if(href_list["tab"])
- current_tab = text2num(href_list["tab"])
-
-
- if("ambientocclusion")
- toggles ^= PREFTOGGLE_AMBIENT_OCCLUSION
- if(length(parent?.screen))
- var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen
- PM.backdrop(parent.mob)
-
- if("parallax")
- var/parallax_styles = list(
- "Off" = PARALLAX_DISABLE,
- "Low" = PARALLAX_LOW,
- "Medium" = PARALLAX_MED,
- "High" = PARALLAX_HIGH,
- "Insane" = PARALLAX_INSANE
- )
- parallax = parallax_styles[input(user, "Pick a parallax style", "Parallax Style") as null|anything in parallax_styles]
- if(parent && parent.mob && parent.mob.hud_used)
- parent.mob.hud_used.update_parallax_pref()
-
- if("edit_2fa")
- // Do this async so we arent holding up a topic() call
- INVOKE_ASYNC(user.client, /client.proc/edit_2fa)
- return // We return here to avoid focus being lost
-
-
- ShowChoices(user)
- return 1
-
-/datum/preferences/proc/copy_to(mob/living/carbon/human/character)
- var/datum/species/S = GLOB.all_species[species]
- character.set_species(S.type) // Yell at me if this causes everything to melt
- if(be_random_name)
- real_name = random_name(gender,species)
-
- character.add_language(language)
-
-
- character.real_name = real_name
- character.dna.real_name = real_name
- character.name = character.real_name
-
- character.flavor_text = flavor_text
- character.med_record = med_record
- character.sec_record = sec_record
- character.gen_record = gen_record
-
- character.change_gender(gender)
- character.age = age
-
- //Head-specific
- var/obj/item/organ/external/head/H = character.get_organ("head")
-
- H.hair_colour = h_colour
-
- H.sec_hair_colour = h_sec_colour
-
- H.facial_colour = f_colour
-
- H.sec_facial_colour = f_sec_colour
-
- H.h_style = h_style
- H.f_style = f_style
-
- H.alt_head = alt_head
- //End of head-specific.
-
- character.skin_colour = s_colour
-
- character.s_tone = s_tone
-
- // Destroy/cyborgize organs
- for(var/name in organ_data)
-
- var/status = organ_data[name]
- var/obj/item/organ/external/O = character.bodyparts_by_name[name]
- if(O)
- if(status == "amputated")
- qdel(O.remove(character))
-
- else if(status == "cyborg")
- if(rlimb_data[name])
- O.robotize(rlimb_data[name], convert_all = 0)
- else
- O.robotize()
- else
- var/obj/item/organ/internal/I = character.get_int_organ_tag(name)
- if(I)
- if(status == "cybernetic")
- I.robotize()
-
- character.dna.blood_type = b_type
-
- // Wheelchair necessary?
- var/obj/item/organ/external/l_foot = character.get_organ("l_foot")
- var/obj/item/organ/external/r_foot = character.get_organ("r_foot")
- if(!l_foot && !r_foot)
- var/obj/structure/chair/wheelchair/W = new /obj/structure/chair/wheelchair(character.loc)
- W.buckle_mob(character, TRUE)
-
- character.underwear = underwear
- character.undershirt = undershirt
- character.socks = socks
-
- if(character.dna.species.bodyflags & HAS_HEAD_ACCESSORY)
- H.headacc_colour = hacc_colour
- H.ha_style = ha_style
- if(character.dna.species.bodyflags & HAS_MARKINGS)
- character.m_colours = m_colours
- character.m_styles = m_styles
-
- if(body_accessory)
- character.body_accessory = GLOB.body_accessory_by_name["[body_accessory]"]
-
- character.backbag = backbag
-
- //Debugging report to track down a bug, which randomly assigned the plural gender to people.
- if(character.dna.species.has_gender && (character.gender in list(PLURAL, NEUTER)))
- if(isliving(src)) //Ghosts get neuter by default
- message_admins("[key_name_admin(character)] has spawned with their gender as plural or neuter. Please notify coders.")
- character.change_gender(MALE)
-
- character.change_eye_color(e_colour)
- character.original_eye_color = e_colour
-
- if(disabilities & DISABILITY_FLAG_FAT)
- character.dna.SetSEState(GLOB.fatblock, TRUE, TRUE)
- character.overeatduration = 600
- character.dna.default_blocks.Add(GLOB.fatblock)
-
- if(disabilities & DISABILITY_FLAG_NEARSIGHTED)
- character.dna.SetSEState(GLOB.glassesblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.glassesblock)
-
- if(disabilities & DISABILITY_FLAG_BLIND)
- character.dna.SetSEState(GLOB.blindblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.blindblock)
-
- if(disabilities & DISABILITY_FLAG_DEAF)
- character.dna.SetSEState(GLOB.deafblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.deafblock)
-
- if(disabilities & DISABILITY_FLAG_COLOURBLIND)
- character.dna.SetSEState(GLOB.colourblindblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.colourblindblock)
-
- if(disabilities & DISABILITY_FLAG_MUTE)
- character.dna.SetSEState(GLOB.muteblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.muteblock)
-
- if(disabilities & DISABILITY_FLAG_NERVOUS)
- character.dna.SetSEState(GLOB.nervousblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.nervousblock)
-
- if(disabilities & DISABILITY_FLAG_SWEDISH)
- character.dna.SetSEState(GLOB.swedeblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.swedeblock)
-
- if(disabilities & DISABILITY_FLAG_CHAV)
- character.dna.SetSEState(GLOB.chavblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.chavblock)
-
- if(disabilities & DISABILITY_FLAG_LISP)
- character.dna.SetSEState(GLOB.lispblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.lispblock)
-
- if(disabilities & DISABILITY_FLAG_DIZZY)
- character.dna.SetSEState(GLOB.dizzyblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.dizzyblock)
-
- if(disabilities & DISABILITY_FLAG_WINGDINGS && (CAN_WINGDINGS in character.dna.species.species_traits))
- character.dna.SetSEState(GLOB.wingdingsblock, TRUE, TRUE)
- character.dna.default_blocks.Add(GLOB.wingdingsblock)
-
- character.dna.species.handle_dna(character)
-
- if(character.dna.dirtySE)
- character.dna.UpdateSE()
- domutcheck(character, MUTCHK_FORCED) //'Activates' all the above disabilities.
-
- character.dna.ready_dna(character, flatten_SE = 0)
- character.sync_organ_dna(assimilate=1)
- character.UpdateAppearance()
-
- // Do the initial caching of the player's body icons.
- character.force_update_limbs()
- character.update_eyes()
- character.regenerate_icons()
-
-/datum/preferences/proc/open_load_dialog(mob/user)
-
- var/datum/db_query/query = SSdbcore.NewQuery("SELECT slot, real_name FROM characters WHERE ckey=:ckey ORDER BY slot", list(
- "ckey" = user.ckey
- ))
- var/list/slotnames[max_save_slots]
-
- if(!query.warn_execute())
- qdel(query)
- return
-
- while(query.NextRow())
- slotnames[text2num(query.item[1])] = query.item[2]
- qdel(query)
-
- var/dat = ""
- dat += "" - var/name - - for(var/i in 1 to max_save_slots) - name = slotnames[i] || "Character [i]" - if(i == default_slot) - name = "[name]" - dat += "[name]
" - - dat += "
" - dat += "Close
" - dat += "
Character Saves
", 300, 390)
- popup.set_content(dat)
- popup.open(0)
-
-/datum/preferences/proc/close_load_dialog(mob/user)
- user << browse(null, "window=saves")
-
-//Check if the user has ANY job selected.
-/datum/preferences/proc/check_any_job()
- return(job_support_high || job_support_med || job_support_low || job_medsci_high || job_medsci_med || job_medsci_low || job_engsec_high || job_engsec_med || job_engsec_low || job_karma_high || job_karma_med || job_karma_low)
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index 0f589cabaf3..8d8b16ead1e 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -1,32 +1,6 @@
-/datum/preferences/proc/load_preferences(client/C)
-
- var/datum/db_query/query = SSdbcore.NewQuery({"SELECT
- ooccolor,
- UI_style,
- UI_style_color,
- UI_style_alpha,
- be_role,
- default_slot,
- toggles,
- toggles_2,
- sound,
- volume_mixer,
- lastchangelog,
- exp,
- clientfps,
- atklog,
- fuid,
- parallax,
- 2fa_status
- FROM player
- WHERE ckey=:ckey"}, list(
- "ckey" = C.ckey
- ))
-
- if(!query.warn_execute())
- qdel(query)
- return
-
+/datum/preferences/proc/load_preferences(datum/db_query/query)
+ // Looking for the query?
+ // Check ../login_processing/10-load_preferences.dm
//general preferences
while(query.NextRow())
@@ -48,8 +22,6 @@
parallax = text2num(query.item[16])
_2fa_status = query.item[17]
- qdel(query)
-
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
UI_style = sanitize_inlist(UI_style, list("White", "Midnight", "Plasmafire", "Retro", "Slimecore", "Operative"), initial(UI_style))
@@ -65,7 +37,7 @@
atklog = sanitize_integer(atklog, 0, 100, initial(atklog))
fuid = sanitize_integer(fuid, 0, 10000000, initial(fuid))
parallax = sanitize_integer(parallax, 0, 16, initial(parallax))
- return 1
+ return TRUE
/datum/preferences/proc/save_preferences(client/C)
@@ -126,550 +98,23 @@
qdel(query)
return 1
-/datum/preferences/proc/load_character(client/C, slot)
- saved = FALSE
-
- if(!slot)
- slot = default_slot
- slot = sanitize_integer(slot, 1, max_save_slots, initial(default_slot))
- if(slot != default_slot)
- default_slot = slot
- var/datum/db_query/firstquery = SSdbcore.NewQuery("UPDATE player SET default_slot=:slot WHERE ckey=:ckey", list(
- "slot" = slot,
- "ckey" = C.ckey
- ))
- if(!firstquery.warn_execute(async = FALSE)) // Dont make this async. It makes roundstart slow.
- qdel(firstquery)
- return
- qdel(firstquery)
-
- if(!C) // If the client disconnected during the query, try again later.
- qdel(src)
- return TRUE
-
- // Let's not have this explode if you sneeze on the DB
- var/datum/db_query/query = SSdbcore.NewQuery({"SELECT
- OOC_Notes,
- real_name,
- name_is_always_random,
- gender,
- age,
- species,
- language,
- hair_colour,
- secondary_hair_colour,
- facial_hair_colour,
- secondary_facial_hair_colour,
- skin_tone,
- skin_colour,
- marking_colours,
- head_accessory_colour,
- hair_style_name,
- facial_style_name,
- marking_styles,
- head_accessory_style_name,
- alt_head_name,
- eye_colour,
- underwear,
- undershirt,
- backbag,
- b_type,
- alternate_option,
- job_support_high,
- job_support_med,
- job_support_low,
- job_medsci_high,
- job_medsci_med,
- job_medsci_low,
- job_engsec_high,
- job_engsec_med,
- job_engsec_low,
- job_karma_high,
- job_karma_med,
- job_karma_low,
- flavor_text,
- med_record,
- sec_record,
- gen_record,
- disabilities,
- player_alt_titles,
- organ_data,
- rlimb_data,
- nanotrasen_relation,
- speciesprefs,
- socks,
- body_accessory,
- gear,
- autohiss
- FROM characters WHERE ckey=:ckey AND slot=:slot"}, list(
- "ckey" = C.ckey,
- "slot" = slot
- ))
- if(!query.warn_execute(async = FALSE)) // Dont make this async. It makes roundstart slow.
- qdel(query)
- return
-
- while(query.NextRow())
- //Character
- metadata = query.item[1]
- real_name = query.item[2]
- be_random_name = text2num(query.item[3])
- gender = query.item[4]
- age = text2num(query.item[5])
- species = query.item[6]
- language = query.item[7]
-
- h_colour = query.item[8]
- h_sec_colour = query.item[9]
- f_colour = query.item[10]
- f_sec_colour = query.item[11]
- s_tone = text2num(query.item[12])
- s_colour = query.item[13]
- m_colours = params2list(query.item[14])
- hacc_colour = query.item[15]
- h_style = query.item[16]
- f_style = query.item[17]
- m_styles = params2list(query.item[18])
- ha_style = query.item[19]
- alt_head = query.item[20]
- e_colour = query.item[21]
- underwear = query.item[22]
- undershirt = query.item[23]
- backbag = query.item[24]
- b_type = query.item[25]
-
-
- //Jobs
- alternate_option = text2num(query.item[26])
- job_support_high = text2num(query.item[27])
- job_support_med = text2num(query.item[28])
- job_support_low = text2num(query.item[29])
- job_medsci_high = text2num(query.item[30])
- job_medsci_med = text2num(query.item[31])
- job_medsci_low = text2num(query.item[32])
- job_engsec_high = text2num(query.item[33])
- job_engsec_med = text2num(query.item[34])
- job_engsec_low = text2num(query.item[35])
- job_karma_high = text2num(query.item[36])
- job_karma_med = text2num(query.item[37])
- job_karma_low = text2num(query.item[38])
-
- //Miscellaneous
- flavor_text = query.item[39]
- med_record = query.item[40]
- sec_record = query.item[41]
- gen_record = query.item[42]
- // Apparently, the preceding vars weren't always encoded properly...
- if(findtext(flavor_text, "<")) // ... so let's clumsily check for tags!
- flavor_text = html_encode(flavor_text)
- if(findtext(med_record, "<"))
- med_record = html_encode(med_record)
- if(findtext(sec_record, "<"))
- sec_record = html_encode(sec_record)
- if(findtext(gen_record, "<"))
- gen_record = html_encode(gen_record)
- disabilities = text2num(query.item[43])
- player_alt_titles = params2list(query.item[44])
- organ_data = params2list(query.item[45])
- rlimb_data = params2list(query.item[46])
- nanotrasen_relation = query.item[47]
- speciesprefs = text2num(query.item[48])
-
- //socks
- socks = query.item[49]
- body_accessory = query.item[50]
- loadout_gear = params2list(query.item[51])
- autohiss_mode = text2num(query.item[52])
-
- saved = TRUE
-
- qdel(query)
- //Sanitize
- var/datum/species/SP = GLOB.all_species[species]
- metadata = sanitize_text(metadata, initial(metadata))
- real_name = reject_bad_name(real_name, 1)
- if(isnull(species)) species = "Human"
- if(isnull(language)) language = "None"
- if(isnull(nanotrasen_relation)) nanotrasen_relation = initial(nanotrasen_relation)
- if(isnull(speciesprefs)) speciesprefs = initial(speciesprefs)
- if(!real_name) real_name = random_name(gender,species)
- be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
- gender = sanitize_gender(gender, FALSE, !SP.has_gender)
- age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
- h_colour = sanitize_hexcolor(h_colour)
- h_sec_colour = sanitize_hexcolor(h_sec_colour)
- f_colour = sanitize_hexcolor(f_colour)
- f_sec_colour = sanitize_hexcolor(f_sec_colour)
- s_tone = sanitize_integer(s_tone, -185, 34, initial(s_tone))
- s_colour = sanitize_hexcolor(s_colour)
- for(var/marking_location in m_colours)
- m_colours[marking_location] = sanitize_hexcolor(m_colours[marking_location], DEFAULT_MARKING_COLOURS[marking_location])
- hacc_colour = sanitize_hexcolor(hacc_colour)
- h_style = sanitize_inlist(h_style, GLOB.hair_styles_public_list, initial(h_style))
- f_style = sanitize_inlist(f_style, GLOB.facial_hair_styles_list, initial(f_style))
- for(var/marking_location in m_styles)
- m_styles[marking_location] = sanitize_inlist(m_styles[marking_location], GLOB.marking_styles_list, DEFAULT_MARKING_STYLES[marking_location])
- ha_style = sanitize_inlist(ha_style, GLOB.head_accessory_styles_list, initial(ha_style))
- alt_head = sanitize_inlist(alt_head, GLOB.alt_heads_list, initial(alt_head))
- e_colour = sanitize_hexcolor(e_colour)
- underwear = sanitize_text(underwear, initial(underwear))
- undershirt = sanitize_text(undershirt, initial(undershirt))
- backbag = sanitize_text(backbag, initial(backbag))
- b_type = sanitize_text(b_type, initial(b_type))
- autohiss_mode = sanitize_integer(autohiss_mode, 0, 2, initial(autohiss_mode))
-
- alternate_option = sanitize_integer(alternate_option, 0, 2, initial(alternate_option))
- job_support_high = sanitize_integer(job_support_high, 0, 65535, initial(job_support_high))
- job_support_med = sanitize_integer(job_support_med, 0, 65535, initial(job_support_med))
- job_support_low = sanitize_integer(job_support_low, 0, 65535, initial(job_support_low))
- job_medsci_high = sanitize_integer(job_medsci_high, 0, 65535, initial(job_medsci_high))
- job_medsci_med = sanitize_integer(job_medsci_med, 0, 65535, initial(job_medsci_med))
- job_medsci_low = sanitize_integer(job_medsci_low, 0, 65535, initial(job_medsci_low))
- job_engsec_high = sanitize_integer(job_engsec_high, 0, 65535, initial(job_engsec_high))
- job_engsec_med = sanitize_integer(job_engsec_med, 0, 65535, initial(job_engsec_med))
- job_engsec_low = sanitize_integer(job_engsec_low, 0, 65535, initial(job_engsec_low))
- job_karma_high = sanitize_integer(job_karma_high, 0, 65535, initial(job_karma_high))
- job_karma_med = sanitize_integer(job_karma_med, 0, 65535, initial(job_karma_med))
- job_karma_low = sanitize_integer(job_karma_low, 0, 65535, initial(job_karma_low))
- disabilities = sanitize_integer(disabilities, 0, 65535, initial(disabilities))
-
- socks = sanitize_text(socks, initial(socks))
- body_accessory = sanitize_text(body_accessory, initial(body_accessory))
-
-// if(isnull(disabilities)) disabilities = 0
- if(!player_alt_titles) player_alt_titles = new()
- if(!organ_data) src.organ_data = list()
- if(!rlimb_data) src.rlimb_data = list()
- if(!loadout_gear) loadout_gear = list()
-
- // Check if the current body accessory exists
- if(!GLOB.body_accessory_by_name[body_accessory])
- body_accessory = null
-
- return 1
-
-/datum/preferences/proc/save_character(client/C)
- var/organlist
- var/rlimblist
- var/playertitlelist
- var/gearlist
-
- var/markingcolourslist = list2params(m_colours)
- var/markingstyleslist = list2params(m_styles)
- if(!isemptylist(organ_data))
- organlist = list2params(organ_data)
- if(!isemptylist(rlimb_data))
- rlimblist = list2params(rlimb_data)
- if(!isemptylist(player_alt_titles))
- playertitlelist = list2params(player_alt_titles)
- if(!isemptylist(loadout_gear))
- gearlist = list2params(loadout_gear)
-
- var/datum/db_query/firstquery = SSdbcore.NewQuery("SELECT slot FROM characters WHERE ckey=:ckey ORDER BY slot", list(
- "ckey" = C.ckey
- ))
- if(!firstquery.warn_execute())
- qdel(firstquery)
- return
- while(firstquery.NextRow())
- if(text2num(firstquery.item[1]) == default_slot)
- var/datum/db_query/query = SSdbcore.NewQuery({"UPDATE characters
- SET
- OOC_Notes=:metadata,
- real_name=:real_name,
- name_is_always_random=:be_random_name,
- gender=:gender,
- age=:age,
- species=:species,
- language=:language,
- hair_colour=:h_colour,
- secondary_hair_colour=:h_sec_colour,
- facial_hair_colour=:f_colour,
- secondary_facial_hair_colour=:f_sec_colour,
- skin_tone=:s_tone,
- skin_colour=:s_colour,
- marking_colours=:markingcolourslist,
- head_accessory_colour=:hacc_colour,
- hair_style_name=:h_style,
- facial_style_name=:f_style,
- marking_styles=:markingstyleslist,
- head_accessory_style_name=:ha_style,
- alt_head_name=:alt_head,
- eye_colour=:e_colour,
- underwear=:underwear,
- undershirt=:undershirt,
- backbag=:backbag,
- b_type=:b_type,
- alternate_option=:alternate_option,
- job_support_high=:job_support_high,
- job_support_med=:job_support_med,
- job_support_low=:job_support_low,
- job_medsci_high=:job_medsci_high,
- job_medsci_med=:job_medsci_med,
- job_medsci_low=:job_medsci_low,
- job_engsec_high=:job_engsec_high,
- job_engsec_med=:job_engsec_med,
- job_engsec_low=:job_engsec_low,
- job_karma_high=:job_karma_high,
- job_karma_med=:job_karma_med,
- job_karma_low=:job_karma_low,
- flavor_text=:flavor_text,
- med_record=:med_record,
- sec_record=:sec_record,
- gen_record=:gen_record,
- player_alt_titles=:playertitlelist,
- disabilities=:disabilities,
- organ_data=:organlist,
- rlimb_data=:rlimblist,
- nanotrasen_relation=:nanotrasen_relation,
- speciesprefs=:speciesprefs,
- socks=:socks,
- body_accessory=:body_accessory,
- gear=:gearlist,
- autohiss=:autohiss_mode
- WHERE ckey=:ckey
- AND slot=:slot"}, list(
- // OH GOD SO MANY PARAMETERS
- "metadata" = metadata,
- "real_name" = real_name,
- "be_random_name" = be_random_name,
- "gender" = gender,
- "age" = age,
- "species" = species,
- "language" = language,
- "h_colour" = h_colour,
- "h_sec_colour" = h_sec_colour,
- "f_colour" = f_colour,
- "f_sec_colour" = f_sec_colour,
- "s_tone" = s_tone,
- "s_colour" = s_colour,
- "markingcolourslist" = markingcolourslist,
- "hacc_colour" = hacc_colour,
- "h_style" = h_style,
- "f_style" = f_style,
- "markingstyleslist" = markingstyleslist,
- "ha_style" = ha_style,
- "alt_head" = (alt_head ? alt_head : ""), // This it intentional. It wont work without it!
- "e_colour" = e_colour,
- "underwear" = underwear,
- "undershirt" = undershirt,
- "backbag" = backbag,
- "b_type" = b_type,
- "alternate_option" = alternate_option,
- "job_support_high" = job_support_high,
- "job_support_med" = job_support_med,
- "job_support_low" = job_support_low,
- "job_medsci_high" = job_medsci_high,
- "job_medsci_med" = job_medsci_med,
- "job_medsci_low" = job_medsci_low,
- "job_engsec_high" = job_engsec_high,
- "job_engsec_med" = job_engsec_med,
- "job_engsec_low" = job_engsec_low,
- "job_karma_high" = job_karma_high,
- "job_karma_med" = job_karma_med,
- "job_karma_low" = job_karma_low,
- "flavor_text" = flavor_text,
- "med_record" = med_record,
- "sec_record" = sec_record,
- "gen_record" = gen_record,
- "playertitlelist" = (playertitlelist ? playertitlelist : ""), // This it intentnional. It wont work without it!
- "disabilities" = disabilities,
- "organlist" = (organlist ? organlist : ""),
- "rlimblist" = (rlimblist ? rlimblist : ""),
- "nanotrasen_relation" = nanotrasen_relation,
- "speciesprefs" = speciesprefs,
- "socks" = socks,
- "body_accessory" = (body_accessory ? body_accessory : ""),
- "gearlist" = (gearlist ? gearlist : ""),
- "autohiss_mode" = autohiss_mode,
- "ckey" = C.ckey,
- "slot" = default_slot
- )
- )
-
- if(!query.warn_execute())
- qdel(firstquery)
- qdel(query)
- return
- qdel(firstquery)
- qdel(query)
- return 1
-
- qdel(firstquery)
-
- var/datum/db_query/query = SSdbcore.NewQuery({"
- INSERT INTO characters (ckey, slot, OOC_Notes, real_name, name_is_always_random, gender,
- age, species, language,
- hair_colour, secondary_hair_colour,
- facial_hair_colour, secondary_facial_hair_colour,
- skin_tone, skin_colour,
- marking_colours,
- head_accessory_colour,
- hair_style_name,
- facial_style_name,
- marking_styles,
- head_accessory_style_name,
- alt_head_name,
- eye_colour,
- underwear, undershirt,
- backbag, b_type, alternate_option,
- job_support_high, job_support_med, job_support_low,
- job_medsci_high, job_medsci_med, job_medsci_low,
- job_engsec_high, job_engsec_med, job_engsec_low,
- job_karma_high, job_karma_med, job_karma_low,
- flavor_text,
- med_record,
- sec_record,
- gen_record,
- player_alt_titles,
- disabilities, organ_data, rlimb_data, nanotrasen_relation, speciesprefs,
- socks, body_accessory, gear, autohiss)
-
- VALUES
- (:ckey, :slot, :metadata, :name, :be_random_name, :gender,
- :age, :species, :language,
- :h_colour, :h_sec_colour,
- :f_colour, :f_sec_colour,
- :s_tone, :s_colour,
- :markingcolourslist,
- :hacc_colour,
- :h_style,
- :f_style,
- :markingstyleslist,
- :ha_style,
- :alt_head,
- :e_colour,
- :underwear, :undershirt,
- :backbag, :b_type, :alternate_option,
- :job_support_high, :job_support_med, :job_support_low,
- :job_medsci_high, :job_medsci_med, :job_medsci_low,
- :job_engsec_high, :job_engsec_med, :job_engsec_low,
- :job_karma_high, :job_karma_med, :job_karma_low,
- :flavor_text,
- :med_record,
- :sec_record,
- :gen_record,
- :playertitlelist,
- :disabilities, :organlist, :rlimblist, :nanotrasen_relation, :speciesprefs,
- :socks, :body_accessory, :gearlist, :autohiss_mode)
-
- "}, list(
- // This has too many params for anyone to look at this without going insae
- "ckey" = C.ckey,
- "slot" = default_slot,
- "metadata" = metadata,
- "name" = real_name,
- "be_random_name" = be_random_name,
- "gender" = gender,
- "age" = age,
- "species" = species,
- "language" = language,
- "h_colour" = h_colour,
- "h_sec_colour" = h_sec_colour,
- "f_colour" = f_colour,
- "f_sec_colour" = f_sec_colour,
- "s_tone" = s_tone,
- "s_colour" = s_colour,
- "markingcolourslist" = markingcolourslist,
- "hacc_colour" = hacc_colour,
- "h_style" = h_style,
- "f_style" = f_style,
- "markingstyleslist" = markingstyleslist,
- "ha_style" = ha_style,
- "alt_head" = alt_head,
- "e_colour" = e_colour,
- "underwear" = underwear,
- "undershirt" = undershirt,
- "backbag" = backbag,
- "b_type" = b_type,
- "alternate_option" = alternate_option,
- "job_support_high" = job_support_high,
- "job_support_med" = job_support_med,
- "job_support_low" = job_support_low,
- "job_medsci_high" = job_medsci_high,
- "job_medsci_med" = job_medsci_med,
- "job_medsci_low" = job_medsci_low,
- "job_engsec_high" = job_engsec_high,
- "job_engsec_med" = job_engsec_med,
- "job_engsec_low" = job_engsec_low,
- "job_karma_high" = job_karma_high,
- "job_karma_med" = job_karma_med,
- "job_karma_low" = job_karma_low,
- "flavor_text" = flavor_text,
- "med_record" = med_record,
- "sec_record" = sec_record,
- "gen_record" = gen_record,
- "playertitlelist" = (playertitlelist ? playertitlelist : ""), // This it intentnional. It wont work without it!
- "disabilities" = disabilities,
- "organlist" = (organlist ? organlist : ""),
- "rlimblist" = (rlimblist ? rlimblist : ""),
- "nanotrasen_relation" = nanotrasen_relation,
- "speciesprefs" = speciesprefs,
- "socks" = socks,
- "body_accessory" = (body_accessory ? body_accessory : ""),
- "gearlist" = (gearlist ? gearlist : ""),
- "autohiss_mode" = autohiss_mode
- ))
-
- if(!query.warn_execute())
- qdel(query)
- return
-
- qdel(query)
- saved = TRUE
- return 1
/datum/preferences/proc/load_random_character_slot(client/C)
- var/datum/db_query/query = SSdbcore.NewQuery("SELECT slot FROM characters WHERE ckey=:ckey ORDER BY slot", list(
- "ckey" = C.ckey
- ))
- var/list/saves = list()
+ var/list/datum/character_save/valid_slots = list()
+ for(var/datum/character_save/CS in character_saves)
+ if(CS.valid_save)
+ valid_slots += CS
- if(!query.warn_execute(async = FALSE)) // Dont async this. Youll make roundstart slow.
- qdel(query)
+ if(!length(valid_slots))
+ // They have no valid saves. Lets just randomise #1
+ var/datum/character_save/CS = C.prefs.character_saves[1] // Get slot 1
+ CS.randomise()
+ CS.real_name = random_name(CS.gender) // Pick a name
+ C.prefs.active_character = C.prefs.character_saves[1] // Set slot 1 as their active
return
- while(query.NextRow())
- saves += text2num(query.item[1])
- qdel(query)
-
- if(!saves.len)
- load_character(C)
- return 0
- load_character(C,pick(saves))
- return 1
-
-/datum/preferences/proc/clear_character_slot(client/C)
- . = FALSE
- // Is there a character in that slot?
- var/datum/db_query/query = SSdbcore.NewQuery("SELECT slot FROM characters WHERE ckey=:ckey AND slot=:slot", list(
- "ckey" = C.ckey,
- "slot" = default_slot
- ))
-
- if(!query.warn_execute())
- qdel(query)
- return
-
- if(!query.NextRow())
- qdel(query)
- return
-
- qdel(query)
-
- var/datum/db_query/delete_query = SSdbcore.NewQuery("DELETE FROM characters WHERE ckey=:ckey AND slot=:slot", list(
- "ckey" = C.ckey,
- "slot" = default_slot
- ))
-
- if(!delete_query.warn_execute())
- qdel(delete_query)
- return
-
- qdel(delete_query)
-
- saved = FALSE
- return TRUE
+ var/datum/character_save/CS = pick(valid_slots)
+ C.prefs.active_character = CS
/**
* Saves [/datum/preferences/proc/volume_mixer] for the current client.
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index bbcebdc519d..ea74a9778ca 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -458,10 +458,12 @@ BLIND // can't see anything
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/match) && src.loc == user)
var/obj/item/match/M = I
- if(M.matchignite()) // Match isn't lit, but isn't burnt.
+ if(!M.lit && !M.burnt) // Match isn't lit, but isn't burnt.
user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike [M] on the bottom of [src] to light it.")
+ M.matchignite()
playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
- else
+ return
+ if(M.lit && !M.burnt)
user.visible_message("[user] crushes [M] into the bottom of [src], extinguishing it.","You crush [M] into the bottom of [src], extinguishing it.")
M.dropped()
return
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 0d96d940233..535cd7f0435 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -5,7 +5,7 @@
icon_state = "hardsuit0-ert_commander"
item_state = "helm-command"
item_color = "ert_commander"
- armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50, fire = 80, acid = 80)
+ armor = list(MELEE = 45, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 100, RAD = 50, FIRE = 80, ACID = 80)
resistance_flags = FIRE_PROOF
var/obj/machinery/camera/camera
var/has_camera = TRUE
@@ -50,7 +50,7 @@
item_state = "suit-command"
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank/internals)
- armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50, fire = 80, acid = 80)
+ armor = list(MELEE = 45, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 100, RAD = 50, FIRE = 80, ACID = 80)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
@@ -121,6 +121,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer
name = "emergency response team engineer helmet"
desc = "A helmet worn by engineers of a Nanotrasen Emergency Response Team. Has yellow highlights. Armoured and space ready."
+ armor = list(MELEE = 45, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 100, RAD = 75, FIRE = 80, ACID = 80)
icon_state = "hardsuit0-ert_engineer"
item_state = "helm-orange"
item_color = "ert_engineer"
@@ -129,6 +130,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma
name = "elite emergency response team engineer helmet"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
+ armor = list(MELEE = 45, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 100, RAD = 100, FIRE = 80, ACID = 80)
icon_state = "hardsuit0-gammaengineer"
item_color = "gammaengineer"
@@ -137,12 +139,14 @@
desc = "A suit worn by the engineers of a Nanotrasen Emergency Response Team. Has yellow highlights. Armoured, space ready, and fire resistant."
icon_state = "ert_engineer"
item_state = "suit-orange"
+ armor = list(MELEE = 45, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 100, RAD = 75, FIRE = 80, ACID = 80)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer
/obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
name = "elite emergency response team engineer suit"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
icon_state = "ert_gengineer"
+ armor = list(MELEE = 45, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 100, RAD = 100, FIRE = 80, ACID = 80)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma
//Medical
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 65d820ce43f..4f15e3983e4 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -27,6 +27,7 @@
var/mob/living/simple_animal/mouse/blobinfected/B = new(vent.loc)
var/mob/M = pick(candidates)
B.key = M.key
+ B.mind.special_role = SPECIAL_ROLE_BLOB
SSticker.mode.update_blob_icons_added(B.mind)
to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.")
diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm
index 0edb18df72f..d3f291828ca 100644
--- a/code/modules/food_and_drinks/food/foods/seafood.dm
+++ b/code/modules/food_and_drinks/food/foods/seafood.dm
@@ -3,7 +3,7 @@
name = "carp fillet"
desc = "A fillet of spess carp meat."
icon = 'icons/obj/food/seafood.dmi'
- icon_state = "fishfillet"
+ icon_state = "carpfillet" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FFDEFE"
bitesize = 6
list_reagents = list("protein" = 3, "carpotoxin" = 2, "vitamin" = 2)
@@ -13,7 +13,7 @@
name = "raw salmon"
desc = "A fillet of raw salmon."
icon = 'icons/obj/food/seafood.dmi'
- icon_state = "fishfillet"
+ icon_state = "salmonfillet" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FFDEFE"
bitesize = 6
list_reagents = list("protein" = 3, "vitamin" = 2)
@@ -23,7 +23,7 @@
name = "salmon steak"
desc = "A fillet of freshly-grilled salmon meat."
icon = 'icons/obj/food/seafood.dmi'
- icon_state = "salmonsteak"
+ icon_state = "salmonsteak" // Sprite based on one created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
trash = /obj/item/trash/plate
filling_color = "#7A3D11"
bitesize = 3
@@ -34,7 +34,7 @@
name = "raw catfish"
desc = "A fillet of raw catfish."
icon = 'icons/obj/food/seafood.dmi'
- icon_state = "fishfillet"
+ icon_state = "catfishfillet" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use.
filling_color = "#FFDEFE"
bitesize = 6
list_reagents = list("protein" = 3, "vitamin" = 2)
diff --git a/code/modules/mapping/base_map_datum.dm b/code/modules/mapping/base_map_datum.dm
index 6a5c7260f3a..a1962d8bba1 100644
--- a/code/modules/mapping/base_map_datum.dm
+++ b/code/modules/mapping/base_map_datum.dm
@@ -12,3 +12,5 @@
var/technical_name
/// Path to the map file
var/map_path
+ /// URL to the maps webmap
+ var/webmap_url
diff --git a/code/modules/mapping/cyberiad.dm b/code/modules/mapping/cyberiad.dm
index 29c27d59c73..46850a42682 100644
--- a/code/modules/mapping/cyberiad.dm
+++ b/code/modules/mapping/cyberiad.dm
@@ -2,3 +2,4 @@
fluff_name = "NSS Cyberiad"
technical_name = "Cyberiad"
map_path = "_maps/map_files/cyberiad/cyberiad.dmm"
+ webmap_url = "https://affectedarc07.github.io/SS13WebMap/Paradise/Cyberiad/"
diff --git a/code/modules/mapping/delta.dm b/code/modules/mapping/delta.dm
index 6b8bbce94cd..3eceefb2012 100644
--- a/code/modules/mapping/delta.dm
+++ b/code/modules/mapping/delta.dm
@@ -2,3 +2,4 @@
fluff_name = "NSS Kerberos"
technical_name = "Delta"
map_path = "_maps/map_files/Delta/delta.dmm"
+ webmap_url = "https://affectedarc07.github.io/SS13WebMap/Paradise/Delta/"
diff --git a/code/modules/mapping/metastation.dm b/code/modules/mapping/metastation.dm
index 654aad46ac8..461d02cfc44 100644
--- a/code/modules/mapping/metastation.dm
+++ b/code/modules/mapping/metastation.dm
@@ -2,3 +2,4 @@
fluff_name = "NSS Cerebron"
technical_name = "MetaStation"
map_path = "_maps/map_files/MetaStation/MetaStation.dmm"
+ webmap_url = "https://affectedarc07.github.io/SS13WebMap/Paradise/MetaStation/"
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index b8b2a96402f..fb608d1b359 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -82,23 +82,6 @@
new random_crystal(loc)
qdel(src)
-/obj/machinery/anomalous_crystal/honk //Strips and equips you as a clown. I apologize for nothing
- activation_method = "mob_bump"
- activation_sound = 'sound/items/bikehorn.ogg'
-
-/obj/machinery/anomalous_crystal/honk/ActivationReaction(mob/user)
- if(..() && ishuman(user) && !(user in affected_targets))
- var/mob/living/carbon/human/H = user
- for(var/obj/item/W in H)
- H.unEquip(W)
- var/datum/job/clown/C = SSjobs.GetJob("Clown")
- C.equip(H)
- affected_targets.Add(H)
-
-/obj/machinery/anomalous_crystal/honk/New()
- ..()
- activation_method = pick("mob_bump","speech")
-
/obj/machinery/anomalous_crystal/theme_warp //Warps the area you're in to look like a new one
activation_method = "touch"
cooldown_add = 200
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 80fe2db8bb2..e32efa0c05a 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -743,7 +743,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
var/mob/living/carbon/human/new_char = new(get_turf(src))
- client.prefs.copy_to(new_char)
+ client.prefs.active_character.copy_to(new_char)
if(mind)
mind.active = TRUE
mind.transfer_to(new_char)
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 20b2a4d375a..0d67959c5e2 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -31,10 +31,6 @@
update_static_data(owner, ui)
. = TRUE
-/datum/orbit_menu/ui_data(mob/user)
- var/list/data = list()
- return data
-
/datum/orbit_menu/ui_static_data(mob/user)
var/list/data = list()
@@ -96,6 +92,7 @@
)
if(SSticker && SSticker.mode)
other_antags += list(
+ "Blob" = (mind.special_role == SPECIAL_ROLE_BLOB),
"Cultist" = (mind in SSticker.mode.cult),
"Wizard" = (mind in SSticker.mode.wizards),
"Wizard's Apprentice" = (mind in SSticker.mode.apprentices),
@@ -121,6 +118,10 @@
var/list/antag_serialized = serialized.Copy()
antag_serialized["antag"] = "Terror Spider"
antagonists += list(antag_serialized)
+ else if(istype(M, /mob/living/simple_animal/revenant))
+ var/list/antag_serialized = serialized.Copy()
+ antag_serialized["antag"] = "Revenant"
+ antagonists += list(antag_serialized)
else
misc += list(serialized)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 40a53d4ffab..b832ad724ef 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -207,6 +207,14 @@
items += s_store
return items
+/mob/living/proc/unequip_everything()
+ var/list/items = list()
+ items |= get_equipped_items(TRUE)
+ for(var/I in items)
+ unEquip(I)
+ drop_l_hand()
+ drop_r_hand()
+
/obj/item/proc/equip_to_best_slot(mob/M)
if(src != M.get_active_hand())
to_chat(M, "You are not holding anything to equip!")
diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm
index 78c12148ee3..0535b3f172b 100644
--- a/code/modules/mob/living/autohiss.dm
+++ b/code/modules/mob/living/autohiss.dm
@@ -2,17 +2,17 @@
return message // no autohiss at this level
/mob/living/carbon/human/handle_autohiss(message, datum/language/L)
- if(!client || client.prefs.autohiss_mode == AUTOHISS_OFF) // no need to process if there's no client or they have autohiss off
+ if(!client || client.prefs.active_character.autohiss_mode == AUTOHISS_OFF) // no need to process if there's no client or they have autohiss off
return message
- return dna.species.handle_autohiss(message, L, client.prefs.autohiss_mode)
+ return dna.species.handle_autohiss(message, L, client.prefs.active_character.autohiss_mode)
/client/verb/toggle_autohiss()
set name = "Toggle Auto-Accent"
set desc = "Toggle automatic accents for your species"
set category = "OOC"
- prefs.autohiss_mode = (prefs.autohiss_mode + 1) % AUTOHISS_NUM
- switch(prefs.autohiss_mode)
+ prefs.active_character.autohiss_mode = (prefs.active_character.autohiss_mode + 1) % AUTOHISS_NUM
+ switch(prefs.active_character.autohiss_mode)
if(AUTOHISS_OFF)
to_chat(src, "Auto-hiss is now OFF.")
if(AUTOHISS_BASIC)
@@ -20,7 +20,7 @@
if(AUTOHISS_FULL)
to_chat(src, "Auto-hiss is now FULL.")
else
- prefs.autohiss_mode = AUTOHISS_OFF
+ prefs.active_character.autohiss_mode = AUTOHISS_OFF
to_chat(src, "Auto-hiss is now OFF.")
/datum/species
@@ -61,7 +61,7 @@
/datum/species/drask
autohiss_basic_map = list(
"o" = list ("oo", "ooo"),
- "u" = list ("uu", "uuu")
+ "u" = list ("uu", "uuu")
)
autohiss_extra_map = list(
"m" = list ("mm", "mmm")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0677ca0f1d3..15ed07ecdf7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1955,7 +1955,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
if(GLOB.configuration.general.allow_character_metadata)
if(client)
- to_chat(usr, "[src]'s Metainfo:[sanitize(client.prefs.metadata)]") + to_chat(usr, "[src]'s Metainfo:
[sanitize(client.prefs.active_character.metadata)]") else to_chat(usr, "[src] does not have any stored infomation!") else diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index e48aa549c50..d3bf2007322 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -674,3 +674,107 @@ /datum/unarmed_attack/golem/tranquillite attack_sound = null + +/datum/species/golem/cloth + name = "Cloth Golem" + icobase = 'icons/mob/human_races/r_cloth_golem.dmi' + flesh_color = "#E9E9E9" + blood_color = "#E9E9E9" + info_text = "As a Cloth Golem, you are able to reform yourself after death, provided your remains aren't burned or destroyed. You are, of course, very flammable. \ + Being made of cloth, your body is magic resistant and faster than that of other golems, but weaker and less resilient." + inherent_traits = list(TRAIT_RESISTCOLD, TRAIT_NOBREATH, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE, TRAIT_RADIMMUNE, TRAIT_PIERCEIMMUNE, TRAIT_CHUNKYFINGERS, TRAIT_NOPAIN) + inherent_biotypes = MOB_UNDEAD | MOB_HUMANOID + brute_mod = 0.85 //15% damage reduction + burn_mod = 1.7 // don't get burned + tox_mod = 0.85 + clone_mod = 0.85 + brain_mod = 0.85 + stamina_mod = 0.85 + speed_mod = 1 // not as heavy as stone + punchdamagelow = 4 + punchstunthreshold = 7 + punchdamagehigh = 8 // not as heavy as stone + prefix = "Cloth" + golem_colour = null + special_names = null + +/datum/species/golem/cloth/get_random_name() + var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \ + "Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh + var/golem_name = "[pharaoh_name] \Roman[rand(1,99)]" + return golem_name + +/datum/species/golem/cloth/handle_life(mob/living/carbon/human/H) + if(H.fire_stacks < 1) + H.adjust_fire_stacks(1) //always prone to burning + ..() + +/datum/species/golem/cloth/handle_death(gibbed, mob/living/carbon/human/H) + if(gibbed) + return + if(H.on_fire) + H.visible_message("[H] burns into ash!") + H.dust() + return + + H.visible_message("[H] falls apart into a pile of bandages!") + new /obj/structure/cloth_pile(get_turf(H), H) + ..() + +/obj/structure/cloth_pile + name = "pile of bandages" + desc = "It emits a strange aura, as if there was still life within it..." + max_integrity = 50 + armor = list(MELEE = 90, BULLET = 90, LASER = 25, ENERGY = 80, BOMB = 50, BIO = 100, FIRE = -50, ACID = -50) + icon = 'icons/obj/items.dmi' + icon_state = "pile_bandages" + resistance_flags = FLAMMABLE + var/revive_time = 900 + var/mob/living/carbon/human/cloth_golem + +/obj/structure/cloth_pile/Initialize(mapload, mob/living/carbon/human/H) + . = ..() + if(!QDELETED(H) && is_species(H, /datum/species/golem/cloth)) + H.unequip_everything() + H.forceMove(src) + cloth_golem = H + to_chat(cloth_golem, "You start gathering your life energy, preparing to rise again...") + addtimer(CALLBACK(src, .proc/revive), revive_time) + else + return INITIALIZE_HINT_QDEL + +/obj/structure/cloth_pile/Destroy() + QDEL_NULL(cloth_golem) + return ..() + +/obj/structure/cloth_pile/burn() + visible_message("[src] burns into ash!") + new /obj/effect/decal/cleanable/ash(get_turf(src)) + ..() + +/obj/structure/cloth_pile/proc/revive() + if(QDELETED(src) || QDELETED(cloth_golem)) //QDELETED also checks for null, so if no cloth golem is set this won't runtime + return + if(cloth_golem.suiciding) + QDEL_NULL(cloth_golem) + return + + invisibility = INVISIBILITY_MAXIMUM //disappear before the animation + new /obj/effect/temp_visual/mummy_animation(get_turf(src)) + cloth_golem.revive() + cloth_golem.grab_ghost() //won't pull if it's a suicide + sleep(20) + cloth_golem.forceMove(get_turf(src)) + cloth_golem.visible_message("[src] rises and reforms into [cloth_golem]!", "You reform into yourself!") + cloth_golem = null + qdel(src) + +/obj/structure/cloth_pile/attackby(obj/item/P, mob/living/carbon/human/user, params) + . = ..() + + if(resistance_flags & ON_FIRE) + return + + if(is_hot(P)) + visible_message("[src] bursts into flames!") + fire_act() diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm index 915d0072434..6959a08e38f 100644 --- a/code/modules/mob/living/carbon/human/species/grey.dm +++ b/code/modules/mob/living/carbon/human/species/grey.dm @@ -67,7 +67,7 @@ to_chat(H, "The water stings[volume < 10 ? " you, but isn't concentrated enough to harm you" : null]!") /datum/species/grey/after_equip_job(datum/job/J, mob/living/carbon/human/H) - var/translator_pref = H.client.prefs.speciesprefs + var/translator_pref = H.client.prefs.active_character.speciesprefs if(translator_pref || ((ismindshielded(H) || J.is_command || J.supervisors == "the captain") && HAS_TRAIT(H, TRAIT_WINGDINGS))) if(J.title == "Mime") return diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm index 377da561e5a..a52ae7bb06d 100644 --- a/code/modules/mob/living/carbon/human/species/vox.dm +++ b/code/modules/mob/living/carbon/human/species/vox.dm @@ -81,7 +81,7 @@ H.unEquip(H.wear_mask) H.equip_or_collect(new /obj/item/clothing/mask/breath/vox(H), slot_wear_mask) - var/tank_pref = H.client && H.client.prefs ? H.client.prefs.speciesprefs : null + var/tank_pref = H.client && H.client.prefs ? H.client.prefs.active_character.speciesprefs : null var/obj/item/tank/internal_tank if(tank_pref)//Diseasel, here you go internal_tank = new /obj/item/tank/internals/nitrogen(H) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 5748775558a..8affd317c6a 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( /mob/living/silicon/robot/proc/pick_module() if(module) return - var/list/modules = list("Generalist", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security") + var/list/modules = list("Engineering", "Medical", "Miner", "Janitor", "Service") if(islist(force_modules) && force_modules.len) modules = force_modules.Copy() if(mmi != null && mmi.alien) @@ -315,14 +315,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( return switch(modtype) - if("Generalist") - module = new /obj/item/robot_module/standard(src) - module.channels = list("Engineering" = 1, "Medical" = 1, "Security" = 1, "Service" = 1, "Supply" = 1) - module_sprites["Basic"] = "robot_old" - module_sprites["Android"] = "droid" - module_sprites["Default"] = "Standard" - module_sprites["Noble-STD"] = "Noble-STD" - if("Service") module = new /obj/item/robot_module/butler(src) module.channels = list("Service" = 1) @@ -365,17 +357,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( see_reagents = TRUE if("Security") - if(!weapons_unlock) - var/count_secborgs = 0 - for(var/mob/living/silicon/robot/R in GLOB.alive_mob_list) - if(R && R.stat != DEAD && R.module && istype(R.module, /obj/item/robot_module/security)) - count_secborgs++ - var/max_secborgs = 2 - if(GLOB.security_level == SEC_LEVEL_GREEN) - max_secborgs = 1 - if(count_secborgs >= max_secborgs) - to_chat(src, "There are too many Security cyborgs active. Please choose another module.") - return module = new /obj/item/robot_module/security(src) module.channels = list("Security" = 1) module_sprites["Basic"] = "secborg" @@ -1349,7 +1330,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( scrambledcodes = 1 req_one_access = list(ACCESS_CENT_SPECOPS) ionpulse = 1 - force_modules = list("Engineering", "Medical", "Security") + force_modules = list("Engineering", "Medical") static_radio_channels = 1 allow_rename = FALSE weapons_unlock = TRUE diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 8a43a2a011e..ab7c4ff9562 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -265,47 +265,6 @@ /obj/item/robot_module/proc/handle_death(mob/living/silicon/robot/R, gibbed) return -// Standard cyborg module. -/obj/item/robot_module/standard - // if station is fine, assist with constructing station goal room, cleaning, and repairing cables chewed by rats - // if medical crisis, assist by providing basic healthcare, retrieving corpses, and monitoring crew lifesigns - // if eng crisis, assist by helping repair hull breaches - // if sec crisis, assist by opening doors for sec and providing backup zipties on patrols - name = "generalist robot module" - module_type = "Standard" - subsystems = list(/mob/living/silicon/proc/subsystem_power_monitor, /mob/living/silicon/proc/subsystem_crew_monitor) - basic_modules = list( - // sec - /obj/item/flash/cyborg, - /obj/item/restraints/handcuffs/cable/zipties/cyborg, - // janitorial - /obj/item/soap/nanotrasen, - /obj/item/lightreplacer/cyborg, - // eng - /obj/item/crowbar/cyborg, - /obj/item/wrench/cyborg, - /obj/item/extinguisher, // for firefighting, and propulsion in space - /obj/item/weldingtool/largetank/cyborg, - // mining - /obj/item/pickaxe, - /obj/item/t_scanner/adv_mining_scanner, - /obj/item/storage/bag/ore/cyborg, - // med - /obj/item/healthanalyzer, - /obj/item/reagent_containers/borghypo/basic, - /obj/item/roller_holder, // for taking the injured to medbay without worsening their injuries or leaving a blood trail the whole way - /obj/item/stack/sheet/metal/cyborg, - /obj/item/stack/cable_coil/cyborg, - /obj/item/stack/rods/cyborg, - /obj/item/stack/tile/plasteel/cyborg - ) - emag_modules = list(/obj/item/melee/energy/sword/cyborg) - special_rechargables = list( - /obj/item/extinguisher, - /obj/item/weldingtool/largetank/cyborg, - /obj/item/lightreplacer/cyborg - ) - // Medical cyborg module. /obj/item/robot_module/medical name = "medical robot module" @@ -319,6 +278,7 @@ /obj/item/borg_defib, /obj/item/handheld_defibrillator, /obj/item/roller_holder, + /obj/item/borg/cyborghug, /obj/item/reagent_containers/borghypo, /obj/item/scalpel/laser/laser1, /obj/item/hemostat, diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm index 00a90f64026..41a568559e0 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona.dm @@ -108,6 +108,8 @@ to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist forceMove(M) + else if(isrobot(M)) + M.visible_message("[M] playfully boops [src] on the head!", "You playfully boop [src] on the head!") else get_scooped(M) else diff --git a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm index c5c50177511..87e35f1157e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm @@ -1,7 +1,7 @@ //Gutlunches, passive mods that devour blood and gibs /mob/living/simple_animal/hostile/asteroid/gutlunch name = "gutlunch" - desc = "A scavenger that eats raw meat, often found alongside ash walkers. Produces a thick, nutritious milk." + desc = "A scavenger that eats raw meat, often found alongside ash walkers. Produces a thick, medicinally nutritious milk." icon = 'icons/mob/lavaland/lavaland_monsters.dmi' icon_state = "gutlunch" icon_living = "gutlunch" @@ -104,7 +104,9 @@ if(prob(60)) reagents.add_reagent("cream", rand(2, 5)) if(prob(45)) - reagents.add_reagent("salglu_solution", rand(2,5)) + reagents.add_reagent("salglu_solution", rand(2, 5)) + if(prob(30)) + reagents.add_reagent("epinephrine", rand(2, 5)) //Male gutlunch. They're smaller and more colorful! diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 38669dba55f..2d103da8be5 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -684,13 +684,13 @@ GLOBAL_LIST_INIT(intents, list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM /mob/proc/has_valid_preferences() if(!client) return FALSE //Not sure how this would get run without the mob having a client, but let's just be safe. - if(client.prefs.alternate_option != RETURN_TO_LOBBY) + if(client.prefs.active_character.alternate_option != RETURN_TO_LOBBY) return TRUE // If they have antags enabled, they're potentially doing this on purpose instead of by accident. Notify admins if so. var/has_antags = FALSE if(client.prefs.be_special.len > 0) has_antags = TRUE - if(!client.prefs.check_any_job()) + if(!client.prefs.active_character.check_any_job()) to_chat(src, "You have no jobs enabled, along with return to lobby if job is unavailable. This makes you ineligible for any round start role, please update your job preferences.") if(has_antags) log_admin("[src.ckey] just got booted back to lobby with no jobs, but antags enabled.") diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index ec54e6aa9c4..04aca83e512 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -42,7 +42,7 @@ /mob/new_player/proc/new_player_panel_proc() - var/real_name = client.prefs.real_name + var/real_name = client.prefs.active_character.real_name if(client.prefs.toggles2 & PREFTOGGLE_2_RANDOMSLOT) real_name = "Random Character Slot" var/output = "
Setup Character
[real_name]
" + if(!operating) + for (var/obj/item/O in holdingitems) + processing_chamber += "\A [html_encode(O.name)]
" - if (!processing_chamber) - is_chamber_empty = 1 - processing_chamber = "Nothing." - if (!beaker) - beaker_contents = "No beaker attached.
" - else - is_beaker_ready = 1 - beaker_contents = "The beaker contains:
" - var/anything = 0 - for(var/datum/reagent/R in beaker.reagents.reagent_list) - anything = 1 - beaker_contents += "[R.volume] - [R.name]
" - if(!anything) - beaker_contents += "Nothing
" - - - dat = {" - Processing chamber contains:
- [processing_chamber]
- [beaker_contents]
- "} - if (is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN))) - dat += "Grind the reagents
" - dat += "Juice the reagents
" - if(holdingitems && holdingitems.len > 0) - dat += "Eject the reagents
" - if (beaker) - dat += "Detach the beaker
" + if(!processing_chamber) + is_chamber_empty = 1 + processing_chamber = "Nothing." + if(!beaker) + beaker_contents = "No beaker attached.
" else - dat += "Please wait..." + is_beaker_ready = 1 + beaker_contents = "The beaker contains:
" + var/anything = 0 + for(var/datum/reagent/R in beaker.reagents.reagent_list) + anything = 1 + beaker_contents += "[R.volume] - [R.name]
" + if(!anything) + beaker_contents += "Nothing
" - var/datum/browser/popup = new(user, "reagentgrinder", "All-In-One Grinder") - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open(1) - return + + dat = {" + Processing chamber contains:
+ [processing_chamber]
+ [beaker_contents]
+ "} + if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN))) + dat += "Grind the reagents
" + dat += "Juice the reagents
" + if(holdingitems && holdingitems.len > 0) + dat += "Eject the reagents
" + if(beaker) + dat += "Detach the beaker
" + else + dat += "Please wait..." + + var/datum/browser/popup = new(user, "reagentgrinder", "All-In-One Grinder") + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open(1) + return /obj/machinery/reagentgrinder/Topic(href, href_list) if(..()) @@ -293,223 +294,228 @@ updateUsrDialog() return switch(href_list["action"]) - if ("grind") + if("grind") grind() if("juice") juice() if("eject") eject() - if ("detach") + if("detach") detach() /obj/machinery/reagentgrinder/proc/detach() - - if (usr.stat != 0) - return - if (!beaker) - return - beaker.loc = src.loc - beaker = null - update_icon() - updateUsrDialog() + if(usr.stat != 0) + return + if(!beaker) + return + beaker.loc = src.loc + beaker = null + update_icon() + updateUsrDialog() /obj/machinery/reagentgrinder/proc/eject() + if(usr.stat != 0) + return + if(holdingitems && holdingitems.len == 0) + return - if (usr.stat != 0) - return - if (holdingitems && holdingitems.len == 0) - return - - for(var/obj/item/O in holdingitems) - O.loc = src.loc - holdingitems -= O - holdingitems = list() - updateUsrDialog() + for(var/obj/item/O in holdingitems) + O.loc = src.loc + holdingitems -= O + holdingitems = list() + updateUsrDialog() /obj/machinery/reagentgrinder/proc/is_allowed(obj/item/reagent_containers/O) - for (var/i in blend_items) - if(istype(O, i)) - return TRUE - return FALSE + for (var/i in blend_items) + if(istype(O, i)) + return TRUE + return FALSE /obj/machinery/reagentgrinder/proc/get_allowed_by_id(obj/item/O) - for (var/i in blend_items) - if (istype(O, i)) - return blend_items[i] + for (var/i in blend_items) + if(istype(O, i)) + return blend_items[i] /obj/machinery/reagentgrinder/proc/get_allowed_snack_by_id(obj/item/reagent_containers/food/snacks/O) - for(var/i in blend_items) - if(istype(O, i)) - return blend_items[i] + for(var/i in blend_items) + if(istype(O, i)) + return blend_items[i] /obj/machinery/reagentgrinder/proc/get_allowed_juice_by_id(obj/item/reagent_containers/food/snacks/O) - for(var/i in juice_items) - if(istype(O, i)) - return juice_items[i] + for(var/i in juice_items) + if(istype(O, i)) + return juice_items[i] /obj/machinery/reagentgrinder/proc/get_grownweapon_amount(obj/item/grown/O) - if (!istype(O) || !O.seed) - return 5 - else if (O.seed.potency == -1) - return 5 - else - return round(O.seed.potency) + if(!istype(O) || !O.seed) + return 5 + else if(O.seed.potency == -1) + return 5 + else + return round(O.seed.potency) /obj/machinery/reagentgrinder/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O) - if (!istype(O) || !O.seed) - return 5 - else if (O.seed.potency == -1) - return 5 - else - return round(5*sqrt(O.seed.potency)) + if(!istype(O) || !O.seed) + return 5 + else if(O.seed.potency == -1) + return 5 + else + return round(5*sqrt(O.seed.potency)) /obj/machinery/reagentgrinder/proc/remove_object(obj/item/O) - holdingitems -= O - qdel(O) + holdingitems -= O + qdel(O) /obj/machinery/reagentgrinder/proc/juice() - power_change() - if(stat & (NOPOWER|BROKEN)) - return - if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume)) - return - playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1) - var/offset = prob(50) ? -2 : 2 - animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking - operating = 1 + power_change() + if(stat & (NOPOWER|BROKEN)) + return + if(!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume)) + return + playsound(src.loc, 'sound/machines/juicer.ogg', 20, 1) + var/offset = prob(50) ? -2 : 2 + animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking + operating = 1 + updateUsrDialog() + spawn(50) + pixel_x = initial(pixel_x) //return to its spot after shaking + operating = 0 updateUsrDialog() - spawn(50) - pixel_x = initial(pixel_x) //return to its spot after shaking - operating = 0 - updateUsrDialog() - //Snacks - for (var/obj/item/reagent_containers/food/snacks/O in holdingitems) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break + //Snacks + for (var/obj/item/reagent_containers/food/snacks/O in holdingitems) + if(beaker.reagents.holder_full()) + break - var/allowed = get_allowed_juice_by_id(O) - if(isnull(allowed)) - break + var/allowed = get_allowed_juice_by_id(O) + if(isnull(allowed)) + break - for (var/r_id in allowed) + for (var/r_id in allowed) - var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume - var/amount = get_juice_amount(O) + var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume + var/amount = get_juice_amount(O) - beaker.reagents.add_reagent(r_id, min(amount*efficiency, space)) + beaker.reagents.add_reagent(r_id, min(amount * efficiency, space)) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break + if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume) + break - remove_object(O) + remove_object(O) /obj/machinery/reagentgrinder/proc/grind() - power_change() - if(stat & (NOPOWER|BROKEN)) - return - if (!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume)) - return - playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) - var/offset = prob(50) ? -2 : 2 - animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking - operating = 1 + power_change() + if(stat & (NOPOWER|BROKEN)) + return + if(!beaker || (beaker && beaker.reagents.holder_full())) + return + playsound(src.loc, 'sound/machines/blender.ogg', 50, 1) + var/offset = prob(50) ? -2 : 2 + animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 250) //start shaking + operating = 1 + updateUsrDialog() + spawn(60) + pixel_x = initial(pixel_x) //return to its spot after shaking + operating = 0 updateUsrDialog() - spawn(60) - pixel_x = initial(pixel_x) //return to its spot after shaking - operating = 0 - updateUsrDialog() - //Snacks and Plants - for (var/obj/item/reagent_containers/food/snacks/O in holdingitems) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break + //Snacks and Plants + for (var/obj/item/reagent_containers/food/snacks/O in holdingitems) + if(beaker.reagents.holder_full()) + break - var/allowed = get_allowed_snack_by_id(O) - if(isnull(allowed)) - break + var/allowed = get_allowed_snack_by_id(O) + if(isnull(allowed)) + break - for (var/r_id in allowed) + for (var/r_id in allowed) - var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume - var/amount = allowed[r_id] - if(amount <= 0) - if(amount == 0) - if (O.reagents != null && O.reagents.has_reagent("nutriment")) - beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment")*efficiency, space)) - O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space)) - if (O.reagents != null && O.reagents.has_reagent("plantmatter")) - beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("plantmatter")*efficiency, space)) - O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space)) - else - if (O.reagents != null && O.reagents.has_reagent("nutriment")) - beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment")*abs(amount)*efficiency), space)) - O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space)) - if (O.reagents != null && O.reagents.has_reagent("plantmatter")) - beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("plantmatter")*abs(amount)*efficiency), space)) - O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space)) + var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume + var/amount = allowed[r_id] + if(amount <= 0) + if(amount == 0) + if(O.reagents != null && O.reagents.has_reagent("nutriment")) + beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("nutriment") * efficiency, space)) + O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space)) + if(O.reagents != null && O.reagents.has_reagent("plantmatter")) + beaker.reagents.add_reagent(r_id, min(O.reagents.get_reagent_amount("plantmatter") * efficiency, space)) + O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space)) + else + if(O.reagents != null && O.reagents.has_reagent("nutriment")) + beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("nutriment") * abs(amount) * efficiency), space)) + O.reagents.remove_reagent("nutriment", min(O.reagents.get_reagent_amount("nutriment"), space)) + if(O.reagents != null && O.reagents.has_reagent("plantmatter")) + beaker.reagents.add_reagent(r_id, min(round(O.reagents.get_reagent_amount("plantmatter") * abs(amount) * efficiency), space)) + O.reagents.remove_reagent("plantmatter", min(O.reagents.get_reagent_amount("plantmatter"), space)) - else - O.reagents.trans_id_to(beaker, r_id, min(amount, space)) + else + O.reagents.trans_id_to(beaker, r_id, min(amount, space)) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break + if(beaker.reagents.holder_full()) + break - if(O.reagents.reagent_list.len == 0) - remove_object(O) + if(O.reagents.reagent_list.len == 0) + remove_object(O) - //Sheets - for (var/obj/item/stack/sheet/O in holdingitems) - var/allowed = get_allowed_by_id(O) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break - for(var/i = 1; i <= round(O.amount, 1); i++) - for (var/r_id in allowed) - var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume - var/amount = allowed[r_id] - beaker.reagents.add_reagent(r_id,min(amount*efficiency, space)) - if (space < amount) - break - if (i == round(O.amount, 1)) - remove_object(O) - break - //Plants - for (var/obj/item/grown/O in holdingitems) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break - var/allowed = get_allowed_by_id(O) - for (var/r_id in allowed) - var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume - var/amount = allowed[r_id] - if (amount == 0) - if (O.reagents != null && O.reagents.has_reagent(r_id)) - beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id)*efficiency, space)) - else - beaker.reagents.add_reagent(r_id,min(amount*efficiency, space)) + //Sheets and rods(!) + for (var/obj/item/stack/O in holdingitems) + if(beaker.reagents.holder_full()) + break - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break + var/allowed = get_allowed_by_id(O) + if(isnull(allowed)) + break + + var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume + while(O.amount) //Grind until there's no more reagents + if(!space) //if no free space - exit + break + O.amount -= 1 //remove one from stack + for (var/r_id in allowed) + var/spaceused = min(allowed[r_id] * efficiency, space) + space -= spaceused + beaker.reagents.add_reagent(r_id, spaceused) + if(O.amount < 1) //if leftover small - destroy remove_object(O) + break - //Slime Extractis - for (var/obj/item/slime_extract/O in holdingitems) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break - var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume - if (O.reagents != null) - var/amount = O.reagents.total_volume - O.reagents.trans_to(beaker, min(amount, space)) - if (O.Uses > 0) - beaker.reagents.add_reagent("slimejelly",min(20*efficiency, space)) - remove_object(O) + //Plants + for (var/obj/item/grown/O in holdingitems) + if(beaker.reagents.holder_full()) + break + var/allowed = get_allowed_by_id(O) + for (var/r_id in allowed) + var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume + var/amount = allowed[r_id] + if(amount == 0) + if(O.reagents != null && O.reagents.has_reagent(r_id)) + beaker.reagents.add_reagent(r_id,min(O.reagents.get_reagent_amount(r_id) * efficiency, space)) + else + beaker.reagents.add_reagent(r_id,min(amount * efficiency, space)) - //Everything else - Transfers reagents from it into beaker - for (var/obj/item/reagent_containers/O in holdingitems) - if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) - break - var/amount = O.reagents.total_volume - O.reagents.trans_to(beaker, amount) - if(!O.reagents.total_volume) - remove_object(O) + if(beaker.reagents.holder_full()) + break + remove_object(O) + + //Slime Extractis + for (var/obj/item/slime_extract/O in holdingitems) + if(beaker.reagents.holder_full()) + break + var/space = beaker.reagents.maximum_volume - beaker.reagents.total_volume + if(O.reagents != null) + var/amount = O.reagents.total_volume + O.reagents.trans_to(beaker, min(amount, space)) + if(O.Uses > 0) + beaker.reagents.add_reagent("slimejelly",min(20 * efficiency, space)) + remove_object(O) + + //Everything else - Transfers reagents from it into beaker + for (var/obj/item/reagent_containers/O in holdingitems) + if(beaker.reagents.holder_full()) + break + var/amount = O.reagents.total_volume + O.reagents.trans_to(beaker, amount) + if(!O.reagents.total_volume) + remove_object(O) diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 89362dc9166..760b2a7bc01 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -568,21 +568,21 @@ /datum/reagent/fliptonium/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(current_cycle == 5) - M.SpinAnimation(speed = 11, loops = -1) + M.SpinAnimation(speed = 11, loops = -1, parallel = FALSE) if(current_cycle == 10) - M.SpinAnimation(speed = 10, loops = -1) + M.SpinAnimation(speed = 10, loops = -1, parallel = FALSE) if(current_cycle == 15) - M.SpinAnimation(speed = 9, loops = -1) + M.SpinAnimation(speed = 9, loops = -1, parallel = FALSE) if(current_cycle == 20) - M.SpinAnimation(speed = 8, loops = -1) + M.SpinAnimation(speed = 8, loops = -1, parallel = FALSE) if(current_cycle == 25) - M.SpinAnimation(speed = 7, loops = -1) + M.SpinAnimation(speed = 7, loops = -1, parallel = FALSE) if(current_cycle == 30) - M.SpinAnimation(speed = 6, loops = -1) + M.SpinAnimation(speed = 6, loops = -1, parallel = FALSE) if(current_cycle == 40) - M.SpinAnimation(speed = 5, loops = -1) + M.SpinAnimation(speed = 5, loops = -1, parallel = FALSE) if(current_cycle == 50) - M.SpinAnimation(speed = 4, loops = -1) + M.SpinAnimation(speed = 4, loops = -1, parallel = FALSE) M.AdjustDrowsy(-6) update_flags |= M.AdjustParalysis(-1.5, FALSE) @@ -594,11 +594,11 @@ /datum/reagent/fliptonium/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST || method == REAGENT_TOUCH) - M.SpinAnimation(speed = 12, loops = -1) + M.SpinAnimation(speed = 12, loops = -1, parallel = FALSE) ..() /datum/reagent/fliptonium/on_mob_delete(mob/living/M) - M.SpinAnimation(speed = 12, loops = -1) + M.SpinAnimation(speed = 12, loops = -1, parallel = FALSE) /datum/reagent/fliptonium/overdose_process(mob/living/M, severity) var/list/overdose_info = ..() diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 2b6910f5523..add53ff04a9 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -155,7 +155,7 @@ current_potion = O to_chat(user, "You load [O] in the console's potion slot[replaced ? ", replacing the one that was there before" : ""].") return - else if(istype(O, /obj/item/storage/bag)) + else if(istype(O, /obj/item/storage/bag) || istype(O, /obj/item/storage/box)) var/obj/item/storage/P = O var/loaded = 0 for(var/obj/item/reagent_containers/food/snacks/monkeycube/MC in P.contents) @@ -191,7 +191,10 @@ var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = target - if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) + if(iswallturf(remote_eye.loc)) + to_chat(owner, "You can't place slime here.") + return + else if(GLOB.cameranet.checkTurfVis(remote_eye.loc)) for(var/mob/living/simple_animal/slime/S in X.stored_slimes) S.forceMove(remote_eye.loc) S.visible_message("[S] warps in!") @@ -238,6 +241,12 @@ if(LAZYLEN(SSmobs.cubemonkeys) >= GLOB.configuration.general.monkey_cube_cap) to_chat(owner, "Bluespace harmonics prevent the spawning of more than [GLOB.configuration.general.monkey_cube_cap] monkeys on the station at one time!") return + else if(iswallturf(remote_eye.loc)) + to_chat(owner, "You can't place monkey here.") + return + else if(!X.monkeys) + to_chat(owner, "[X] doesn't have monkeys.") + return else if(X.monkeys >= 1) var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(remote_eye.loc) SSmobs.cubemonkeys += food @@ -323,6 +332,8 @@ to_chat(owner, "Ctrl-click a slime to scan it.") to_chat(owner, "Alt-click a slime to feed it a potion.") to_chat(owner, "Ctrl-click or a dead monkey to recycle it, or the floor to place a new monkey.") + var/obj/machinery/computer/camera_advanced/xenobio/X = owner.machine + to_chat(owner, "[X] now has [X.monkeys] monkeys left.") // // Alternate clicks for slime, monkey and open turf if using a xenobio console @@ -415,7 +426,10 @@ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/turfarea = get_area(T) - if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) + if(iswallturf(T)) + to_chat(user, "You can't place slime here.") + return + else if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) for(var/mob/living/simple_animal/slime/S in X.stored_slimes) S.forceMove(T) S.visible_message("[S] warps in!") @@ -430,8 +444,10 @@ var/mob/camera/aiEye/remote/xenobio/E = C.remote_control var/obj/machinery/computer/camera_advanced/xenobio/X = E.origin var/area/turfarea = get_area(T) - - if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) + if(iswallturf(T)) + to_chat(user, "You can't place monkey here.") + return + else if(turfarea.name == E.allowed_area || turfarea.xenobiology_compatible) if(X.monkeys >= 1) var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(T) food.LAssailant = C diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 8a6c5b159a4..bf87fcb685a 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -521,6 +521,14 @@ visible_message("[src]'s monitor flashes, \"[world.time - reqtime] seconds remaining until another requisition form may be printed.\"") return + var/datum/supply_packs/P = locateUID(params["crate"]) + if(!istype(P)) + return + + if(P.times_ordered >= P.order_limit && P.order_limit != -1) //If the crate has reached the limit, do not allow it to be ordered. + to_chat(usr, "[P.name] is out of stock, and can no longer be ordered.") + return + var/amount = 1 if(params["multiple"] == "1") // 1 is a string here. DO NOT MAKE THIS A BOOLEAN YOU DORK var/num_input = input(usr, "Amount", "How many crates? (20 Max)") as null|num @@ -528,11 +536,6 @@ return amount = clamp(round(num_input), 1, 20) - - var/datum/supply_packs/P = locateUID(params["crate"]) - if(!istype(P)) - return - var/timeout = world.time + 600 // If you dont type the reason within a minute, theres bigger problems here var/reason = input(usr, "Reason", "Why do you require this item?","") as null|text if(world.time > timeout || !reason || (!is_public && !is_authorized(usr)) || ..()) @@ -573,10 +576,13 @@ if(SO.ordernum == ordernum) O = SO P = O.object - if(SSshuttle.points >= P.cost) + if(P.times_ordered >= P.order_limit && P.order_limit != -1) //If this order would put it over the limit, deny it + to_chat(usr, "[P.name] is out of stock, and can no longer be ordered.") + else if(SSshuttle.points >= P.cost) SSshuttle.requestlist.Cut(i,i+1) SSshuttle.points -= P.cost SSshuttle.shoppinglist += O + P.times_ordered += 1 investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [SSshuttle.points].", "cargo") else to_chat(usr, "There are insufficient supply points for this request.") diff --git a/config/example/config.toml b/config/example/config.toml index 834a4915941..4a338053796 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -719,6 +719,9 @@ shutdown_on_reboot = false #_2fa_auth_host = "http://127.0.0.1:8080" # List of IP addresses to be ignored by the world/Topic rate limiting. Useful if you have other services topic_ip_ratelimit_bypass = ["127.0.0.1"] +# Turn this to true if you are running a production server +is_production = false + ################################################################ diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png index d118a027d12..00a2e16a290 100644 Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ diff --git a/icons/mob/human_races/r_cloth_golem.dmi b/icons/mob/human_races/r_cloth_golem.dmi new file mode 100644 index 00000000000..06d829c6e5f Binary files /dev/null and b/icons/mob/human_races/r_cloth_golem.dmi differ diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 6e0e68794f9..5277d574f1a 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/mob/robot_items.dmi b/icons/mob/robot_items.dmi index d84a6c291c1..aada2e5c8b7 100644 Binary files a/icons/mob/robot_items.dmi and b/icons/mob/robot_items.dmi differ diff --git a/icons/obj/food/seafood.dmi b/icons/obj/food/seafood.dmi index 636639f7d3e..aa052f929d6 100644 Binary files a/icons/obj/food/seafood.dmi and b/icons/obj/food/seafood.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 42e1f9fec25..b8d614af470 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/interface/skin.dmf b/interface/skin.dmf index 5ef2a56e492..e4850ea368a 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -287,6 +287,15 @@ window "rpane" is-checked = true group = "rpanemode" button-type = pushbox + elem "webmap" + type = BUTTON + pos = 358,7 + size = 50x16 + anchor1 = none + anchor2 = none + saved-params = "is-checked" + text = "Map" + command = "webmap" elem "infob" type = BUTTON pos = 64,7 @@ -301,8 +310,8 @@ window "rpane" button-type = pushbox elem "wikib" type = BUTTON - pos = 155,7 - size = 60x16 + pos = 150,7 + size = 50x16 anchor1 = none anchor2 = none saved-params = "is-checked" @@ -310,8 +319,8 @@ window "rpane" command = "wiki" elem "forumb" type = BUTTON - pos = 220,7 - size = 60x16 + pos = 202,7 + size = 50x16 anchor1 = none anchor2 = none saved-params = "is-checked" @@ -319,8 +328,8 @@ window "rpane" command = "forum" elem "rulesb" type = BUTTON - pos = 285,7 - size = 60x16 + pos = 254,7 + size = 50x16 anchor1 = none anchor2 = none saved-params = "is-checked" @@ -328,8 +337,8 @@ window "rpane" command = "rules" elem "githubb" type = BUTTON - pos = 350,7 - size = 60x16 + pos = 306,7 + size = 50x16 anchor1 = none anchor2 = none saved-params = "is-checked" diff --git a/paradise.dme b/paradise.dme index a491d9c3e4c..a009d5838e9 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1162,6 +1162,7 @@ #include "code\game\verbs\ooc.dm" #include "code\game\verbs\randomtip.dm" #include "code\game\verbs\suicide.dm" +#include "code\game\verbs\webmap.dm" #include "code\game\verbs\who.dm" #include "code\modules\admin\admin.dm" #include "code\modules\admin\admin_investigate.dm" @@ -1377,6 +1378,17 @@ #include "code\modules\client\client_procs.dm" #include "code\modules\client\message.dm" #include "code\modules\client\view.dm" +#include "code\modules\client\login_processing\10-load_preferences.dm" +#include "code\modules\client\login_processing\20-load_characters.dm" +#include "code\modules\client\login_processing\30-tos_consent.dm" +#include "code\modules\client\login_processing\35-donator_check.dm" +#include "code\modules\client\login_processing\36-watchlist.dm" +#include "code\modules\client\login_processing\37-alts_ip.dm" +#include "code\modules\client\login_processing\38-alts_cid.dm" +#include "code\modules\client\login_processing\39-cid_count.dm" +#include "code\modules\client\login_processing\__client_login_processor.dm" +#include "code\modules\client\preference\character.dm" +#include "code\modules\client\preference\link_processing.dm" #include "code\modules\client\preference\preferences.dm" #include "code\modules\client\preference\preferences_mysql.dm" #include "code\modules\client\preference\preferences_spawnpoints.dm" @@ -2092,7 +2104,6 @@ #include "code\modules\mob\new_player\login.dm" #include "code\modules\mob\new_player\logout.dm" #include "code\modules\mob\new_player\new_player.dm" -#include "code\modules\mob\new_player\preferences_setup.dm" #include "code\modules\mob\new_player\sprite_accessories\sprite_accessories.dm" #include "code\modules\mob\new_player\sprite_accessories\diona\diona_hair.dm" #include "code\modules\mob\new_player\sprite_accessories\drask\drask_body_markings.dm"