| [block-1] | "
- bname = assigned_blocks[block]
+ // Traitgenes more reliable way to check gene states
+ if(gene)
+ bname = gene.name
+ else
+ bname = ""
body += ""
if(bname)
- var/bstate=M.dna.GetSEState(block)
+ var/bstate=(bname in M.active_genes) // Traitgenes more reliable way to check gene states
+ // Traitgenes show trait linked names on mouseover
+ var/tname = bname
+ if(istype(gene,/datum/gene/trait))
+ var/datum/gene/trait/T = gene
+ tname = T.get_name()
var/bcolor="[(bstate)?"#006600":"#ff0000"]"
- body += "[bname][block]"
+ if(!bstate && M.dna.GetSEState(block)) // Gene isn't active, but the dna says it is... Was blocked by another gene!
+ bcolor="#d88d00"
+ body += "[bname][block]" // Traitgenes edit - show trait linked names on mouseover
else
body += "[block]"
body+=" | "
@@ -627,7 +645,7 @@ var/global/floorIsLava = 0
if(!check_rights(R_SERVER,0))
message = sanitize(message, 500, extra = 0)
message = replacetext(message, "\n", "
") // required since we're putting it in a tag
- send_ooc_announcement(message, "From [usr.client.holder.fakekey ? "Administrator" : usr.key]") // CHOMPEdit
+ send_ooc_announcement(message, "From [usr.client.holder.fakekey ? "Administrator" : usr.key]")
log_admin("Announce: [key_name(usr)] : [message]")
feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -903,12 +921,6 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc="Whether persistent data will be saved from now on."
set name="Toggle Persistent Data"
CONFIG_SET(flag/persistence_disabled, !CONFIG_GET(flag/persistence_disabled))
- /* CHOMP Edit: the entire world doesn't need to know.
- if(!CONFIG_GET(flag/persistence_disabled))
- to_world(span_world("Persistence is now enabled."))
- else
- to_world(span_world("Persistence is no longer enabled."))
- */
message_admins(span_blue("[key_name_admin(usr)] toggled persistence to [CONFIG_GET(flag/persistence_disabled) ? "Off" : "On"]."), 1)
log_admin("[key_name(usr)] toggled persistence to [CONFIG_GET(flag/persistence_disabled) ? "Off" : "On"].")
world.update_status()
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 2a94edde18..77b933d70d 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -617,7 +617,7 @@
if(istype(M, /mob/living/carbon))
M.dna.SetSEState(block,!M.dna.GetSEState(block))
domutcheck(M,null,MUTCHK_FORCED)
- M.update_mutations()
+ M.UpdateAppearance()
var/state="[M.dna.GetSEState(block)?"on":"off"]"
var/blockname=assigned_blocks[block]
message_admins("[key_name_admin(src)] has toggled [M.key]'s [blockname] block [state]!")
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 615c7677fd..2dc8c6578e 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -9,8 +9,8 @@
return
for(var/obj/item/W in M)
- if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) //VOREStation Edit - There's basically no reason to remove either of these
- continue //VOREStation Edit
+ if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) //There's basically no reason to remove either of these
+ continue
M.drop_from_inventory(W)
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
@@ -432,8 +432,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
if(samejob == "Yes")
charjob = record_found.fields["real_rank"]
- else if(samejob == JOB_ALT_VISITOR) //VOREStation Edit - Visitor not Assistant
- charjob = JOB_ALT_VISITOR //VOREStation Edit - Visitor not Assistant
+ else if(samejob == JOB_ALT_VISITOR)
+ charjob = JOB_ALT_VISITOR
else
records = tgui_alert(src,"No data core entry detected. Would you like add them to the manifest, and sec/med/HR records?","Records",list("No", "Yes", "Cancel"))
if(!records || records == "Cancel")
@@ -465,10 +465,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
//For logging later
var/admin = key_name_admin(src)
var/player_key = picked_client.key
- //VOREStation Add - Needed for persistence
var/picked_ckey = picked_client.ckey
var/picked_slot = picked_client.prefs.default_slot
- //VOREStation Add End
var/mob/living/carbon/human/new_character
var/spawnloc
@@ -517,7 +515,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
picked_client.prefs.copy_to(new_character)
if(new_character.dna)
new_character.dna.ResetUIFrom(new_character)
+ new_character.sync_dna_traits(TRUE) // Traitgenes Sync traits to genetics if needed
new_character.sync_organ_dna()
+ new_character.initialize_vessel()
if(inhabit)
new_character.key = player_key
//Were they any particular special role? If so, copy.
@@ -527,11 +527,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
antag_data.add_antagonist(new_character.mind)
antag_data.place_mob(new_character)
- //VOREStation Add - Required for persistence
if(new_character.mind)
new_character.mind.loaded_from_ckey = picked_ckey
new_character.mind.loaded_from_slot = picked_slot
- //VOREStation Add End
for(var/lang in picked_client.prefs.alternate_languages)
var/datum/language/chosen_language = GLOB.all_languages[lang]
@@ -555,7 +553,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
//A redraw for good measure
new_character.regenerate_icons()
- new_character.update_transform() //VOREStation Edit
+ new_character.update_transform()
//If we're announcing their arrival
if(announce)
@@ -700,7 +698,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Fun.Do Not"
set name = "Explosion"
- if(!check_rights(R_DEBUG|R_FUN)) return //VOREStation Edit
+ if(!check_rights(R_DEBUG|R_FUN)) return
var/devastation = tgui_input_number(usr, "Range of total devastation. -1 to none", text("Input"), min_value=-1)
if(devastation == null) return
@@ -728,7 +726,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Fun.Do Not"
set name = "EM Pulse"
- if(!check_rights(R_DEBUG|R_FUN)) return //VOREStation Edit
+ if(!check_rights(R_DEBUG|R_FUN)) return
var/heavy = tgui_input_number(usr, "Range of heavy pulse.", text("Input"))
if(heavy == null) return
@@ -754,7 +752,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Fun.Do Not"
set name = "Gib"
- if(!check_rights(R_ADMIN|R_FUN)) return //VOREStation Edit
+ if(!check_rights(R_ADMIN|R_FUN)) return
var/confirm = tgui_alert(src, "You sure?", "Confirm", list("Yes", "No"))
if(confirm != "Yes") return
@@ -855,7 +853,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/client/proc/cmd_admin_check_contents(mob/living/M as mob in mob_list)
set category = "Admin.Investigate"
set name = "Check Contents"
- set popup_menu = FALSE //VOREStation Edit - Declutter.
+ set popup_menu = FALSE
if(!holder)
return
@@ -912,7 +910,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
mob.set_viewsize(view)
log_admin("[key_name(usr)] changed their view range to [view].")
- message_admins("[key_name_admin(usr)] changed their view range to [view].", 1) //CHOMPEdit - Uncommented this.
+ message_admins("[key_name_admin(usr)] changed their view range to [view].", 1)
feedback_add_details("admin_verb","CVRA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -923,7 +921,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if ((!( ticker ) || !emergency_shuttle.location()))
return
- if(!check_rights(R_ADMIN)) return //VOREStation Edit
+ if(!check_rights(R_ADMIN)) return
var/confirm = tgui_alert(src, "You sure?", "Confirm", list("Yes", "No"))
if(confirm != "Yes") return
@@ -952,7 +950,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Admin.Events"
set name = "Cancel Shuttle"
- if(!check_rights(R_ADMIN|R_FUN)) return // CHOMPstation edit: Lets anyone cancel the shuttle.
+ if(!check_rights(R_ADMIN|R_FUN)) return
if(tgui_alert(src, "You sure?", "Confirm", list("Yes", "No")) != "Yes") return
@@ -973,7 +971,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if (!ticker)
return
- if(!check_rights(R_ADMIN)) return //VOREStation Edit
+ if(!check_rights(R_ADMIN)) return
emergency_shuttle.deny_shuttle = !emergency_shuttle.deny_shuttle
@@ -1029,7 +1027,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Toggle random events on/off"
set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
- if(!check_rights(R_SERVER)) return //VOREStation Edit
+ if(!check_rights(R_SERVER)) return
if(!CONFIG_GET(flag/allow_random_events))
CONFIG_SET(flag/allow_random_events, TRUE)
diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm
index 21bb2de1af..fa5a489ed1 100644
--- a/code/modules/casino/casino_prize_vendor.dm
+++ b/code/modules/casino/casino_prize_vendor.dm
@@ -221,12 +221,12 @@
CASINO_PRIZE("Implant: Restraining bolt", /obj/item/implantcase/restrainingbolt, 1, 1000, "implants"),
CASINO_PRIZE("Implant: Surge", /obj/item/implantcase/surge, 1, 500, "implants"),
CASINO_PRIZE("Implant: Wrist sword", /obj/item/implantcase/sword, 1, 1000, "implants"),
- CASINO_PRIZE("Genemod: No breath", /obj/item/dnainjector/nobreath, 1, 1000, "implants"),
- CASINO_PRIZE("Genemod: Regenerate", /obj/item/dnainjector/regenerate, 1, 1000, "implants"),
- CASINO_PRIZE("Genemod: Remote view", /obj/item/dnainjector/remoteview, 1, 1000, "implants"),
- CASINO_PRIZE("Genemod: Sprinter", /obj/item/dnainjector/runfast, 1, 1000, "implants"),
- CASINO_PRIZE("Genemod: Telekinesis", /obj/item/dnainjector/telemut, 1, 1000, "implants"),
- CASINO_PRIZE("Genemod: X-ray", /obj/item/dnainjector/xraymut, 1, 1000, "implants"),
+ CASINO_PRIZE("Genemod: No breath", /obj/item/dnainjector/set_trait/nobreathe, 1, 1000, "implants"),
+ CASINO_PRIZE("Genemod: Regenerate", /obj/item/dnainjector/set_trait/regenerate, 1, 1000, "implants"),
+ CASINO_PRIZE("Genemod: Remote view", /obj/item/dnainjector/set_trait/remoteview, 1, 1000, "implants"),
+ CASINO_PRIZE("Genemod: Sprinter", /obj/item/dnainjector/set_trait/haste, 1, 1000, "implants"),
+ CASINO_PRIZE("Genemod: Telekinesis", /obj/item/dnainjector/set_trait/tk, 1, 1000, "implants"),
+ CASINO_PRIZE("Genemod: X-ray", /obj/item/dnainjector/set_trait/xray, 1, 1000, "implants"),
)
item_list["Event"] = list(
diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index deb4c31150..af656eef26 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -56,9 +56,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/datum/sprite_accessory/instance = style_list[path]
if(!istype(instance))
continue
+ if(instance.name == DEVELOPER_WARNING_NAME)
+ continue
if(instance.ckeys_allowed && (!client || !(client.ckey in instance.ckeys_allowed)))
continue
- if(instance.species_allowed && (!species || !(species in instance.species_allowed)) && (!client || !check_rights(R_ADMIN | R_EVENT | R_FUN, 0, client)) && (!custom_base || !(custom_base in instance.species_allowed))) //VOREStation Edit: Custom Species
+ if(instance.species_allowed && (!species || !(species in instance.species_allowed)) && (!client || !check_rights(R_ADMIN | R_EVENT | R_FUN, 0, client)) && (!custom_base || !(custom_base in instance.species_allowed)))
continue
.[instance.name] = instance
@@ -83,7 +85,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.f_style = save_data["facial_style_name"]
pref.grad_style = save_data["grad_style_name"]
pref.b_type = save_data["b_type"]
- pref.disabilities = save_data["disabilities"]
pref.organ_data = check_list_copy(save_data["organ_data"])
pref.rlimb_data = check_list_copy(save_data["rlimb_data"])
pref.body_markings = check_list_copy(save_data["body_markings"])
@@ -95,13 +96,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.synth_markings = save_data["synth_markings"]
pref.bgstate = save_data["bgstate"]
pref.body_descriptors = check_list_copy(save_data["body_descriptors"])
- //YWadd start
- pref.wingdings = save_data["Wingdings"]
- pref.colorblind_mono = save_data["colorblind_mono"]
- pref.colorblind_vulp = save_data["colorblind_vulp"]
- pref.colorblind_taj = save_data["colorblind_taj"]
- pref.haemophilia = save_data["haemophilia"]
- //YWadd end
pref.ear_style = save_data["ear_style"]
pref.ear_secondary_style = save_data["ear_secondary_style"]
pref.ear_secondary_colors = save_data["ear_secondary_colors"]
@@ -116,7 +110,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
save_data["facial_style_name"] = pref.f_style
save_data["grad_style_name"] = pref.grad_style
save_data["b_type"] = pref.b_type
- save_data["disabilities"] = pref.disabilities
save_data["organ_data"] = check_list_copy(pref.organ_data)
save_data["rlimb_data"] = check_list_copy(pref.rlimb_data)
var/list/body_markings = check_list_copy(pref.body_markings)
@@ -129,13 +122,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
save_data["synth_markings"] = pref.synth_markings
save_data["bgstate"] = pref.bgstate
save_data["body_descriptors"] = check_list_copy(pref.body_descriptors)
- //YWadd start
- save_data["Wingdings"] = pref.wingdings
- save_data["colorblind_mono"] = pref.colorblind_mono
- save_data["colorblind_vulp"] = pref.colorblind_vulp
- save_data["colorblind_taj"] = pref.colorblind_taj
- save_data["haemophilia"] = pref.haemophilia
- //YWadd end
save_data["ear_style"] = pref.ear_style
save_data["ear_secondary_style"] = pref.ear_secondary_style
save_data["ear_secondary_colors"] = pref.ear_secondary_colors
@@ -153,12 +139,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.grad_style = sanitize_inlist(pref.grad_style, GLOB.hair_gradients, initial(pref.grad_style))
pref.b_type = sanitize_text(pref.b_type, initial(pref.b_type))
- pref.disabilities = sanitize_integer(pref.disabilities, 0, 65535, initial(pref.disabilities))
if(!pref.organ_data) pref.organ_data = list()
if(!pref.rlimb_data) pref.rlimb_data = list()
if(!pref.body_markings) pref.body_markings = list()
else pref.body_markings &= body_marking_styles_list
- for (var/M in pref.body_markings) //VOREStation Edit
+ for (var/M in pref.body_markings)
if (!islist(pref.body_markings[M]))
var/col = istext(pref.body_markings[M]) ? pref.body_markings[M] : "#000000"
pref.body_markings[M] = pref.mass_edit_marking_list(M,color=col)
@@ -214,24 +199,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
character.set_gender(pref.biological_gender)
- if(pref.species == "Grey")//YWadd START
- character.wingdings = pref.wingdings
-
- if(pref.colorblind_mono == 1)
- character.add_modifier(/datum/modifier/trait/colorblind_monochrome)
-
- else if(pref.colorblind_vulp == 1)
- character.add_modifier(/datum/modifier/trait/colorblind_vulp)
-
- else if(pref.colorblind_taj == 1)
- character.add_modifier(/datum/modifier/trait/colorblind_taj)
-
- if(pref.haemophilia == 1)
- character.add_modifier(/datum/modifier/trait/haemophilia)
- //YWadd END
-
// Destroy/cyborgize organs and limbs.
- //VOREStation Edit
character.synthetic = pref.species == "Protean" ? all_robolimbs["protean"] : null //Clear the existing var. (unless protean, then switch it to the normal protean limb)
var/list/organs_to_edit = list()
for (var/name in list(BP_TORSO, BP_HEAD, BP_GROIN, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT))
@@ -242,7 +210,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
organs_to_edit += name
else
organs_to_edit.Insert(x+(O.robotic == ORGAN_NANOFORM ? 1 : 0), name)
- for(var/name in organs_to_edit) //VOREStation edit end
+ for(var/name in organs_to_edit)
var/status = pref.organ_data[name]
var/obj/item/organ/external/O = character.organs_by_name[name]
if(O)
@@ -279,7 +247,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
for(var/M in pref.body_markings)
priority += 1
var/datum/sprite_accessory/marking/mark_datum = body_marking_styles_list[M]
- //var/mark_color = "[pref.body_markings[M]]" //VOREStation Edit
for(var/BP in mark_datum.body_parts)
var/obj/item/organ/external/O = character.organs_by_name[BP]
@@ -307,14 +274,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/datum/species/mob_species = GLOB.all_species[pref.species]
. += "
Body "
- . += "(®)"
+ . += "(®)"
. += "
"
. += "Species: [pref.species]
"
. += "Blood Type: [pref.b_type]
"
if(has_flag(mob_species, HAS_SKIN_TONE))
. += "Skin Tone: [-pref.s_tone + 35]/220
"
- . += "Disabilities
Adjust
" // YWadd
- //YWcommented moved onto disabilities. += "Needs Glasses: [pref.disabilities & NEARSIGHTED ? "Yes" : "No"]
"
. += "Limbs: Adjust Reset
"
. += "Internal Organs: Adjust
"
//display limbs below
@@ -565,9 +530,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.alternate_languages.Cut() // Reset their alternate languages. Todo: attempt to just fix it instead?
return TOPIC_HANDLED
- else if(href_list["disabilities_yw"])
- Disabilities_YW(user) //ChompEDIT - usr removal
-
else if(href_list["set_species"])
user << browse(null, "window=species")
if(!pref.species_preview || !(pref.species_preview in GLOB.all_species))
@@ -580,7 +542,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else
return TOPIC_NOACTION
- if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN|R_EVENT, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit: selectability
+ if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN|R_EVENT, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE))
return TOPIC_NOACTION
var/prev_species = pref.species
@@ -588,7 +550,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(prev_species != pref.species)
if(!(pref.biological_gender in mob_species.genders))
pref.set_biological_gender(mob_species.genders[1])
- pref.custom_species = null //VOREStation Edit - This is cleared on species changes
+ pref.custom_species = null
//grab one of the valid hair styles for the newly chosen species
var/list/valid_hairstyles = pref.get_valid_hairstyles(user)
@@ -621,7 +583,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
var/min_age = get_min_age()
var/max_age = get_max_age()
pref.update_preference_by_type(/datum/preference/numeric/human/age, max(min(pref.read_preference(/datum/preference/numeric/human/age), max_age), min_age))
- pref.blood_color = setting_species.blood_color // VOREstation edit
+ pref.blood_color = setting_species.blood_color
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -756,15 +718,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["marking_style"])
var/list/usable_markings = pref.body_markings.Copy() ^ body_marking_styles_list.Copy()
- /* VOREStation Removal - No markings whitelist, let people mix/match
- for(var/M in usable_markings)
- var/datum/sprite_accessory/S = usable_markings[M]
- var/datum/species/spec = GLOB.all_species[pref.species]
- if(!S.species_allowed.len)
- continue
- else if(!(pref.species in S.species_allowed) && !(pref.custom_base in S.species_allowed) && !(spec.base_species in S.species_allowed))
- usable_markings -= M
- */ //VOREStation Removal End
var/new_marking = tgui_input_list(user, "Choose a body marking:", "Character Preference", usable_markings)
if(new_marking && CanUseTopic(user))
pref.body_markings[new_marking] = pref.mass_edit_marking_list(new_marking) //New markings start black
@@ -962,10 +915,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
continue
if(tmp_species in M.species_cannot_use)
continue
- //VOREStation Add - Cyberlimb whitelisting.
if(M.whitelisted_to && !(user.ckey in M.whitelisted_to))
continue
- //VOREStation Add End
usable_manufacturers[company] = M
if(!usable_manufacturers.len)
return
@@ -1062,11 +1013,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
return TOPIC_REFRESH
- else if(href_list["disabilities"])
- var/disability_flag = text2num(href_list["disabilities"])
- pref.disabilities ^= disability_flag
- Disabilities_YW(user) //YW Edit //ChompEDIT - usr removal
-
else if(href_list["toggle_preview_value"])
pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"])
return TOPIC_REFRESH_UPDATE_PREVIEW
@@ -1093,38 +1039,6 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.bgstate = next_in_list(pref.bgstate, pref.bgstate_options)
return TOPIC_REFRESH_UPDATE_PREVIEW
- //YW Add Start
-
- else if(href_list["wingdings"])
- pref.wingdings = !pref.wingdings
- Disabilities_YW(user) //ChompEDIT - usr removal
-
- else if(href_list["colorblind_mono"])
- pref.colorblind_mono = !pref.colorblind_mono
- Disabilities_YW(user) //ChompEDIT - usr removal
-
- else if(href_list["colorblind_vulp"])
- pref.colorblind_vulp = !pref.colorblind_vulp
- Disabilities_YW(user) //ChompEDIT - usr removal
-
- else if(href_list["colorblind_taj"])
- pref.colorblind_taj = !pref.colorblind_taj
- Disabilities_YW(user) //ChompEDIT - usr removal
-
- else if(href_list["haemophilia"])
- pref.haemophilia = !pref.haemophilia
- Disabilities_YW(user) //ChompEDIT - usr removal
-
- else if(href_list["reset_disabilities"])
- pref.wingdings = 0
- pref.colorblind_mono = 0
- pref.colorblind_taj = 0
- pref.colorblind_vulp = 0
- pref.haemophilia = 0
- Disabilities_YW(user) //ChompEDIT - usr removal
-
- //YW Add End
-
else if(href_list["ear_style"])
var/new_ear_style = tgui_input_list(user, "Select an ear style for this character:", "Character Preference", pref.get_available_styles(global.ear_styles_list), pref.ear_style)
if(new_ear_style)
@@ -1260,12 +1174,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "[current_species.name] \[change\]
"
dat += ""
dat += ""
- //vorestation edit begin
if(current_species.wikilink)
dat += "[current_species.blurb]
See the wiki for more details. | "
else
dat += "[current_species.blurb] | "
- //vorestation edit end
dat += ""
if("preview" in cached_icon_states(current_species.icobase))
user << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
@@ -1322,7 +1234,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "You cannot play as this species.If you wish to be whitelisted, you can make an application post on the forums."
else if(restricted == 2)
dat += "You cannot play as this species.This species is not available for play as a station race.."
- if(!restricted || check_rights(R_ADMIN|R_EVENT, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability
+ if(!restricted || check_rights(R_ADMIN|R_EVENT, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)
dat += "\[select\]"
dat += " | |
|---|