cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin

Browse Source
This commit is contained in:
Heroman3003
2019-10-29 09:33:48 +10:00
parent b17718ea6c 59fa7c2899
commit a3fb3e3950
1698 changed files with 269984 additions and 473924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/modules/client/preference_setup/general/03_body.dm
View File

@@ -139,7 +139,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else
O.robotize()
for(var/name in list(O_HEART,O_EYES,O_LUNGS,O_LIVER,O_KIDNEYS,O_BRAIN))
for(var/name in list(O_HEART,O_EYES,O_VOICE,O_LUNGS,O_LIVER,O_KIDNEYS,O_SPLEEN,O_STOMACH,O_INTESTINE,O_BRAIN))
var/status = pref.organ_data[name]
if(!status)
continue
@@ -237,6 +237,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
organ_name = "heart"
if(O_EYES)
organ_name = "eyes"
if(O_VOICE)
organ_name = "larynx"
if(O_BRAIN)
organ_name = "brain"
if(O_LUNGS)
@@ -245,6 +247,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
organ_name = "liver"
if(O_KIDNEYS)
organ_name = "kidneys"
if(O_SPLEEN)
organ_name = "spleen"
if(O_STOMACH)
organ_name = "stomach"
if(O_INTESTINE)
organ_name = "intestines"
if(status == "cyborg")
++ind
@@ -383,6 +391,16 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(!pref.species_preview || !(pref.species_preview in all_species))
return TOPIC_NOACTION
var/datum/species/setting_species
if(all_species[href_list["set_species"]])
setting_species = all_species[href_list["set_species"]]
else
return TOPIC_NOACTION
if(((!(setting_species.spawn_flags & SPECIES_CAN_JOIN)) || (!is_alien_whitelisted(preference_mob(),setting_species))) && !check_rights(R_ADMIN, 0) && !(setting_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE)) //VOREStation Edit: selectability
return TOPIC_NOACTION
var/prev_species = pref.species
pref.species = href_list["set_species"]
if(prev_species != pref.species)
@@ -698,7 +716,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["organs"])
var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes", "Lungs", "Liver", "Kidneys", "Brain")
var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes","Larynx", "Lungs", "Liver", "Kidneys", "Spleen", "Intestines", "Stomach", "Brain")
if(!organ_name) return
var/organ = null
@@ -707,12 +725,20 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
organ = O_HEART
if("Eyes")
organ = O_EYES
if("Larynx")
organ = O_VOICE
if("Lungs")
organ = O_LUNGS
if("Liver")
organ = O_LIVER
if("Kidneys")
organ = O_KIDNEYS
if("Spleen")
organ = O_SPLEEN
if("Intestines")
organ = O_INTESTINE
if("Stomach")
organ = O_STOMACH
if("Brain")
if(pref.organ_data[BP_HEAD] != "cyborg")
user << "<span class='warning'>You may only select a cybernetic or synthetic brain if you have a full prosthetic body.</span>"
@@ -808,7 +834,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "<center><h2>[current_species.name] \[<a href='?src=\ref[src];show_species=1'>change</a>\]</h2></center><hr/>"
dat += "<table padding='8px'>"
dat += "<tr>"
dat += "<td width = 400>[current_species.blurb]</td>"
//vorestation edit begin
if(current_species.wikilink)
dat += "<td width = 400>[current_species.blurb]<br><br>See <a href=[current_species.wikilink]>the wiki</a> for more details.</td>"
else
dat += "<td width = 400>[current_species.blurb]</td>"
//vorestation edit end
dat += "<td width = 200 align='center'>"
if("preview" in icon_states(current_species.icobase))
usr << browse_rsc(icon(current_species.icobase,"preview"), "species_preview_[current_species.name].png")
@@ -868,12 +899,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "<font color='red'><b>You cannot play as this species.</br><small>If you wish to be whitelisted, you can make an application post on <a href='?src=\ref[user];preference=open_whitelist_forum'>the forums</a>.</small></b></font></br>"
else if(restricted == 2)
dat += "<font color='red'><b>You cannot play as this species.</br><small>This species is not available for play as a station race..</small></b></font></br>"
//VOREStation Addition begin
else if(restricted == 3)
dat += "<font color='red'><b>You cannot play as this species.</br><small>You can however select it and set it up in case admin approves spawning you in.</small></b></font></br>"
restricted = 0
//VOREStation Addition end
if(!restricted || check_rights(R_ADMIN, 0))
if(!restricted || check_rights(R_ADMIN, 0) || current_species.spawn_flags & SPECIES_WHITELIST_SELECTABLE) //VOREStation Edit: selectability
dat += "\[<a href='?src=\ref[src];set_species=[pref.species_preview]'>select</a>\]"
dat += "</center></body>"

2
code/modules/client/preference_setup/general/06_flavor.dm
View File

@@ -59,7 +59,7 @@
switch(href_list["flavor_text"])
if("open")
if("general")
var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothing, and may include OOC notes and preferences.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0)
var/msg = sanitize(input(usr,"Give a general description of your character. This will be shown regardless of clothings.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0) //VOREStation Edit: separating out OOC notes
if(CanUseTopic(user))
pref.flavor_texts[href_list["flavor_text"]] = msg
else

299
code/modules/client/preference_setup/loadout/gear_tweaks.dm
View File

@@ -140,3 +140,302 @@
else
. = valid_reagents[metadata]
I.reagents.add_reagent(., I.reagents.get_free_space())
/datum/gear_tweak/tablet
var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small)
var/list/ValidBatteries = list(/obj/item/weapon/computer_hardware/battery_module/nano, /obj/item/weapon/computer_hardware/battery_module/micro, /obj/item/weapon/computer_hardware/battery_module)
var/list/ValidHardDrives = list(/obj/item/weapon/computer_hardware/hard_drive/micro, /obj/item/weapon/computer_hardware/hard_drive/small, /obj/item/weapon/computer_hardware/hard_drive)
var/list/ValidNetworkCards = list(/obj/item/weapon/computer_hardware/network_card, /obj/item/weapon/computer_hardware/network_card/advanced)
var/list/ValidNanoPrinters = list(null, /obj/item/weapon/computer_hardware/nano_printer)
var/list/ValidCardSlots = list(null, /obj/item/weapon/computer_hardware/card_slot)
var/list/ValidTeslaLinks = list(null, /obj/item/weapon/computer_hardware/tesla_link)
/datum/gear_tweak/tablet/get_contents(var/list/metadata)
var/list/names = list()
var/obj/O = ValidProcessors[metadata[1]]
if(O)
names += initial(O.name)
O = ValidBatteries[metadata[2]]
if(O)
names += initial(O.name)
O = ValidHardDrives[metadata[3]]
if(O)
names += initial(O.name)
O = ValidNetworkCards[metadata[4]]
if(O)
names += initial(O.name)
O = ValidNanoPrinters[metadata[5]]
if(O)
names += initial(O.name)
O = ValidCardSlots[metadata[6]]
if(O)
names += initial(O.name)
O = ValidTeslaLinks[metadata[7]]
if(O)
names += initial(O.name)
return "[english_list(names, and_text = ", ")]"
/datum/gear_tweak/tablet/get_metadata(var/user, var/metadata)
. = list()
var/list/names = list()
var/counter = 1
for(var/i in ValidProcessors)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
var/entry = input(user, "Choose a processor.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidBatteries)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a battery.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidHardDrives)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a hard drive.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidNetworkCards)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a network card.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidNanoPrinters)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a nanoprinter.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidCardSlots)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a card slot.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidTeslaLinks)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a tesla link.", "Character Preference") in names
. += names[entry]
/datum/gear_tweak/tablet/get_default()
return list(1, 1, 1, 1, 1, 1, 1)
/datum/gear_tweak/tablet/tweak_item(var/obj/item/modular_computer/tablet/I, var/list/metadata)
if(ValidProcessors[metadata[1]])
var/t = ValidProcessors[metadata[1]]
I.processor_unit = new t(I)
if(ValidBatteries[metadata[2]])
var/t = ValidBatteries[metadata[2]]
I.battery_module = new t(I)
I.battery_module.charge_to_full()
if(ValidHardDrives[metadata[3]])
var/t = ValidHardDrives[metadata[3]]
I.hard_drive = new t(I)
if(ValidNetworkCards[metadata[4]])
var/t = ValidNetworkCards[metadata[4]]
I.network_card = new t(I)
if(ValidNanoPrinters[metadata[5]])
var/t = ValidNanoPrinters[metadata[5]]
I.nano_printer = new t(I)
if(ValidCardSlots[metadata[6]])
var/t = ValidCardSlots[metadata[6]]
I.card_slot = new t(I)
if(ValidTeslaLinks[metadata[7]])
var/t = ValidTeslaLinks[metadata[7]]
I.tesla_link = new t(I)
I.update_verbs()
/datum/gear_tweak/laptop
var/list/ValidProcessors = list(/obj/item/weapon/computer_hardware/processor_unit/small, /obj/item/weapon/computer_hardware/processor_unit)
var/list/ValidBatteries = list(/obj/item/weapon/computer_hardware/battery_module, /obj/item/weapon/computer_hardware/battery_module/advanced, /obj/item/weapon/computer_hardware/battery_module/super)
var/list/ValidHardDrives = list(/obj/item/weapon/computer_hardware/hard_drive, /obj/item/weapon/computer_hardware/hard_drive/advanced, /obj/item/weapon/computer_hardware/hard_drive/super)
var/list/ValidNetworkCards = list(/obj/item/weapon/computer_hardware/network_card, /obj/item/weapon/computer_hardware/network_card/advanced)
var/list/ValidNanoPrinters = list(null, /obj/item/weapon/computer_hardware/nano_printer)
var/list/ValidCardSlots = list(null, /obj/item/weapon/computer_hardware/card_slot)
var/list/ValidTeslaLinks = list(null, /obj/item/weapon/computer_hardware/tesla_link)
/datum/gear_tweak/laptop/get_contents(var/list/metadata)
var/list/names = list()
var/obj/O = ValidProcessors[metadata[1]]
if(O)
names += initial(O.name)
O = ValidBatteries[metadata[2]]
if(O)
names += initial(O.name)
O = ValidHardDrives[metadata[3]]
if(O)
names += initial(O.name)
O = ValidNetworkCards[metadata[4]]
if(O)
names += initial(O.name)
O = ValidNanoPrinters[metadata[5]]
if(O)
names += initial(O.name)
O = ValidCardSlots[metadata[6]]
if(O)
names += initial(O.name)
O = ValidTeslaLinks[metadata[7]]
if(O)
names += initial(O.name)
return "[english_list(names, and_text = ", ")]"
/datum/gear_tweak/laptop/get_metadata(var/user, var/metadata)
. = list()
var/list/names = list()
var/counter = 1
for(var/i in ValidProcessors)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
var/entry = input(user, "Choose a processor.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidBatteries)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a battery.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidHardDrives)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a hard drive.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidNetworkCards)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a network card.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidNanoPrinters)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a nanoprinter.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidCardSlots)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a card slot.", "Character Preference") in names
. += names[entry]
names = list()
counter = 1
for(var/i in ValidTeslaLinks)
if(i)
var/obj/O = i
names[initial(O.name)] = counter++
else
names["None"] = counter++
entry = input(user, "Choose a tesla link.", "Character Preference") in names
. += names[entry]
/datum/gear_tweak/laptop/get_default()
return list(1, 1, 1, 1, 1, 1, 1)
/datum/gear_tweak/laptop/tweak_item(var/obj/item/modular_computer/laptop/preset/I, var/list/metadata)
if(ValidProcessors[metadata[1]])
var/t = ValidProcessors[metadata[1]]
I.processor_unit = new t(I)
if(ValidBatteries[metadata[2]])
var/t = ValidBatteries[metadata[2]]
I.battery_module = new t(I)
I.battery_module.charge_to_full()
if(ValidHardDrives[metadata[3]])
var/t = ValidHardDrives[metadata[3]]
I.hard_drive = new t(I)
if(ValidNetworkCards[metadata[4]])
var/t = ValidNetworkCards[metadata[4]]
I.network_card = new t(I)
if(ValidNanoPrinters[metadata[5]])
var/t = ValidNanoPrinters[metadata[5]]
I.nano_printer = new t(I)
if(ValidCardSlots[metadata[6]])
var/t = ValidCardSlots[metadata[6]]
I.card_slot = new t(I)
if(ValidTeslaLinks[metadata[7]])
var/t = ValidTeslaLinks[metadata[7]]
I.tesla_link = new t(I)
I.update_verbs()

11
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -70,6 +70,10 @@ var/list/gear_datums = list()
continue
if(max_cost && G.cost > max_cost)
continue
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
continue //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
continue //Vorestation Edit
. += gear_name
/datum/category_item/player_setup_item/loadout/sanitize_character()
@@ -88,7 +92,7 @@ var/list/gear_datums = list()
preference_mob << "<span class='warning'>You cannot have more than one of the \the [gear_name]</span>"
pref.gear -= gear_name
else if(!(gear_name in valid_gear_choices()))
preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species.</span>"
preference_mob << "<span class='warning'>You cannot take \the [gear_name] as you are not whitelisted for the species or item.</span>" //Vorestation Edit
pref.gear -= gear_name
else
var/datum/gear/G = gear_datums[gear_name]
@@ -100,6 +104,7 @@ var/list/gear_datums = list()
/datum/category_item/player_setup_item/loadout/content()
. = list()
var/mob/preference_mob = preference_mob() //Vorestation Edit
var/total_cost = 0
if(pref.gear && pref.gear.len)
for(var/i = 1; i <= pref.gear.len; i++)
@@ -145,6 +150,10 @@ var/list/gear_datums = list()
. += "<tr><td colspan=3><hr></td></tr>"
for(var/gear_name in LC.gear)
var/datum/gear/G = LC.gear[gear_name]
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
continue //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
continue //Vorestation Edit
var/ticked = (G.display_name in pref.gear)
. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"

4
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -34,7 +34,7 @@
display_name = "wallet, polychromic"
path = /obj/item/weapon/storage/wallet/poly
cost = 0 //VOREStation Edit
/datum/gear/accessory/wallet/womens
display_name = "wallet, womens"
@@ -209,6 +209,8 @@
..()
var/list/sweaters = list()
for(var/sweater in typesof(/obj/item/clothing/accessory/sweater))
if(sweater in typesof(/obj/item/clothing/accessory/sweater/fluff)) //VOREStation addition
continue //VOREStation addition
var/obj/item/clothing/suit/sweater_type = sweater
sweaters[initial(sweater_type.name)] = sweater_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(sweaters))

44
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -30,34 +30,42 @@
display_name = "collar, holo"
path = /obj/item/clothing/accessory/collar/holo
//TFF 17/6/19 - public loadout addition: Indigestible Holocollar
/datum/gear/collar/holo/indigestible
display_name = "collar, holo (indigestible)"
path = /obj/item/clothing/accessory/collar/holo/indigestible
/datum/gear/accessory/holster
display_name = "holster selection (Security, CD, HoP, Exploration)"
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder")
/datum/gear/accessory/brown_vest
display_name = "webbing, brown"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner")
/datum/gear/accessory/black_vest
display_name = "webbing, black"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner")
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner")
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder")
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner")
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic")
/datum/gear/accessory/webbing
cost = 1
/datum/gear/accessory/stethoscope
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
@@ -67,15 +75,21 @@
description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it."
/datum/gear/accessory/tronket
display_name = "metal necklace"
description = "A shiny steel chain with a vague metallic object dangling off it."
path = /obj/item/clothing/accessory/tronket
display_name = "metal necklace"
description = "A shiny steel chain with a vague metallic object dangling off it."
path = /obj/item/clothing/accessory/tronket
/datum/gear/accessory/pilotpin
display_name = "pilot qualification pin"
description = "An iron pin denoting the qualification to fly SCG spacecraft."
path = /obj/item/clothing/accessory/solgov/specialty/pilot
allowed_roles = list("Pathfinder", "Pilot", "Field Medic")
/datum/gear/accessory/flops
display_name = "drop straps"
description = "Wearing suspenders over shoulders? That's been so out for centuries and you know better."
path = /obj/item/clothing/accessory/flops
display_name = "drop straps"
description = "Wearing suspenders over shoulders? That's been so out for centuries and you know better."
path = /obj/item/clothing/accessory/flops
/datum/gear/accessory/flops/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
gear_tweaks = list(gear_tweak_free_color_choice)

30
code/modules/client/preference_setup/loadout/loadout_ears.dm
View File

@@ -11,4 +11,32 @@
/datum/gear/ears/circuitry
display_name = "earwear, circuitry (empty)"
path = /obj/item/clothing/ears/circuitry
path = /obj/item/clothing/ears/circuitry
/datum/gear/ears/earrings
display_name = "earring selection"
description = "A selection of eye-catching earrings."
path = /obj/item/clothing/ears/earring
/datum/gear/ears/earrings/New()
..()
var/earrings = list()
earrings["stud, pearl"] = /obj/item/clothing/ears/earring/stud
earrings["stud, glass"] = /obj/item/clothing/ears/earring/stud/glass
earrings["stud, wood"] = /obj/item/clothing/ears/earring/stud/wood
earrings["stud, iron"] = /obj/item/clothing/ears/earring/stud/iron
earrings["stud, steel"] = /obj/item/clothing/ears/earring/stud/steel
earrings["stud, silver"] = /obj/item/clothing/ears/earring/stud/silver
earrings["stud, gold"] = /obj/item/clothing/ears/earring/stud/gold
earrings["stud, platinum"] = /obj/item/clothing/ears/earring/stud/platinum
earrings["stud, diamond"] = /obj/item/clothing/ears/earring/stud/diamond
earrings["dangle, glass"] = /obj/item/clothing/ears/earring/dangle/glass
earrings["dangle, wood"] = /obj/item/clothing/ears/earring/dangle/wood
earrings["dangle, iron"] = /obj/item/clothing/ears/earring/dangle/iron
earrings["dangle, steel"] = /obj/item/clothing/ears/earring/dangle/steel
earrings["dangle, silver"] = /obj/item/clothing/ears/earring/dangle/silver
earrings["dangle, gold"] = /obj/item/clothing/ears/earring/dangle/gold
earrings["dangle, platinum"] = /obj/item/clothing/ears/earring/dangle/platinum
earrings["dangle, diamond"] = /obj/item/clothing/ears/earring/dangle/diamond
gear_tweaks += new/datum/gear_tweak/path(earrings)

899
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm Normal file
View File

@@ -0,0 +1,899 @@
/datum/gear/fluff
path = /obj/item
sort_category = "Fluff Items"
display_name = "If this item can be chosen or seen, ping a coder immediately!"
ckeywhitelist = list("This entry should never be choosable with this variable set.") //If it does, then that means somebody fucked up the whitelist system pretty hard
character_name = list("This entry should never be choosable with this variable set.")
cost = 0
/*
/datum/gear/fluff/testhorn
path = /obj/item/weapon/bikehorn
display_name = "Airhorn - Example Item"
description = "An example item that you probably shouldn't see!"
ckeywhitelist = list("mewchild")
allowed_roles = list("Station Engineer")
*/
// 0-9 CKEYS
/datum/gear/fluff/malady_crop
path = /obj/item/weapon/material/twohanded/fluff/riding_crop/malady
display_name = "Malady's Crop"
ckeywhitelist = list("1r1s")
character_name = list("Malady Blanche")
// A CKEYS
/datum/gear/fluff/lethe_helmet
path = /obj/item/clothing/head/helmet/hos/fluff/lethe
display_name = "Lethe's Helmet"
ckeywhitelist = list("adk09")
character_name = list("Lethe")
/datum/gear/fluff/xander_bracer
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
display_name = "Xander's Bracer"
ckeywhitelist = list("aegisoa")
character_name = list("Xander Bevin")
/datum/gear/fluff/lynn_penlight
path = /obj/item/device/flashlight/pen/fluff/lynn
display_name = "Lynn's Penlight"
ckeywhitelist = list("argobargsoup")
character_name = list("Lynn Shady")
/datum/gear/fluff/aronai_ccmeduniform
path = /obj/item/clothing/under/solgov/utility/sifguard/officer/medical
display_name = "centcom medical uniform"
description = "A medical uniform straight from Central Command."
ckeywhitelist = list("arokha")
character_name = list("Aronai Kadigan")
/datum/gear/fluff/aronai_ccmedjacket
path = /obj/item/clothing/suit/storage/service/sifguard/medical/command
display_name = "centcom medical jacket"
description = "A medical jacket straight from Central Command."
ckeywhitelist = list("arokha")
character_name = list("Aronai Kadigan")
// B CKEYS
/datum/gear/fluff/yuuko_kimono
path = /obj/item/clothing/under/fluff/sakura_hokkaido_kimono
display_name = "Yuuko's Kimono"
ckeywhitelist = list("benemuel")
character_name = list("Yuuko Shimmerpond")
/datum/gear/fluff/cassandra_box
path = /obj/item/weapon/storage/box/fluff/cassandra
display_name = "Cassandra's Box"
ckeywhitelist = list("beyondmylife")
character_name = list("Cassandra Selone")
/datum/gear/fluff/kilano_dress
path = /obj/item/clothing/under/dress/fluff/kilano
display_name = "Kilano's Dress"
ckeywhitelist = list("beyondmylife")
character_name = list("Kilano Soryu")
/datum/gear/fluff/kilano_gloves
path = /obj/item/clothing/gloves/fluff/kilano
display_name = "Kilano's Gloves"
ckeywhitelist = list("beyondmylife")
character_name = list("Kilano Soryu")
/datum/gear/fluff/netra_box
path = /obj/item/weapon/storage/box/fluff/kilano
display_name = "Ne'tra's Box"
ckeywhitelist = list("beyondmylife")
character_name = list("Ne'tra Ky'ram")
/datum/gear/fluff/xin_sovietuniform
path = /obj/item/clothing/under/soviet
display_name = "Xin's Soviet Uniform"
ckeywhitelist = list("britishrabbit")
character_name = list("Xin Xiao")
description = "This soviet uniform has seen considerable use over the years, it's rather worn in some places, frayed in others and the stomach region has signs of being stretched out repeatedly."
/datum/gear/fluff/tasald_box
path = /obj/item/weapon/storage/box/fluff/tasald
display_name = "Tasald's Box"
ckeywhitelist = list("bwoincognito")
character_name = list("Tasald Corlethian")
/datum/gear/fluff/octavius_box
path = /obj/item/weapon/storage/box/fluff/octavious
display_name = "Octavious' Box"
ckeywhitelist = list("bwoincognito")
character_name = list("Octavious Ward")
/datum/gear/fluff/jayda_meduniform
path = /obj/item/clothing/under/solgov/utility/sifguard/medical/fluff
display_name = "Jayda's Uniform"
ckeywhitelist = list("burritojustice")
character_name = list("Jayda Wilson")
// C CKEYS
/datum/gear/fluff/james_disk
path = /obj/item/weapon/disk/data
display_name = "James' Disk"
ckeywhitelist = list("cockatricexl")
character_name = list("James Holder")
/datum/gear/fluff/jasmine_implant
path = /obj/item/weapon/implanter/reagent_generator/jasmine
display_name = "Jasmine's Implant"
ckeywhitelist = list("cameron653")
character_name = list("Jasmine Lizden")
/datum/gear/fluff/diana_robe
path = /obj/item/clothing/suit/fluff/purp_robes
display_name = "Diana's Robes"
ckeywhitelist = list("cameron653")
character_name = list("Diana Kuznetsova")
/datum/gear/fluff/diana_tiara
path = /obj/item/clothing/head/fluff/pink_tiara
display_name = "Diana's Tiara"
ckeywhitelist = list("cameron653")
character_name = list("Diana Kuznetsova")
/datum/gear/fluff/aika_coat
path = /obj/item/clothing/suit/fluff/blue_trimmed_coat
display_name = "Aika's Coat"
ckeywhitelist = list("chaoko99")
character_name = list("Aika Hisakawa")
/datum/gear/fluff/sariU_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Sari-U's Eggnerd Disk"
ckeywhitelist = list("crossexonar")
character_name = list("Sari-U")
/datum/gear/fluff/sariE_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Sari-E's Eggnerd Disk"
ckeywhitelist = list("crossexonar")
character_name = list("Sari-E")
// D CKEYS
/datum/gear/fluff/dhaeleena_medal
path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael
display_name = "Dhaeleena's Medal"
ckeywhitelist = list("dhaeleena")
character_name = list("Dhaeleena M'iar")
/datum/gear/fluff/elliot_belt
path = /obj/item/weapon/storage/belt/champion
display_name = "Elliot's Belt"
ckeywhitelist = list("dickfreedomjohnson")
character_name = list("Elliot Richards")
/datum/gear/fluff/drake_box
path = /obj/item/weapon/storage/box/fluff/drake
display_name = "Drake's Box"
ckeywhitelist = list("drakefrostpaw")
character_name = list("Drake Frostpaw")
/datum/gear/fluff/theseus_coin
path = /obj/item/weapon/coin/diamond
display_name = "Theseus' Diamond coin"
ckeywhitelist = list("draycu")
character_name = list("Theseus")
description = "An engraved coin made of diamond. On the side for heads is printed the year 2541, along with the letter T. On the side for tails, the letter Y can be seen."
/datum/gear/fluff/yonra_box
path = /obj/item/weapon/storage/box/fluff/yonra
display_name = "Yonra's Box"
ckeywhitelist = list("draycu")
character_name = list("Schae Yonra")
// E CKEYS
/datum/gear/fluff/serkii_slippers
path = /obj/item/clothing/shoes/slippers
display_name = "Serkii's Slippers"
ckeywhitelist = list("eekasqueak")
character_name = list("Serkii Miishy")
/datum/gear/fluff/serkii_skirt
path = /obj/item/clothing/under/skirt/fluff/serkii
display_name = "Serkii's Skirt"
ckeywhitelist = list("eekasqueak")
character_name = list("Serkii Miishy")
/datum/gear/fluff/jessie_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/jessie
display_name = "Jessie's Coat"
ckeywhitelist = list("epiccharger")
character_name = list("Jessie Mare")
/datum/gear/fluff/verd_medal
path = /obj/item/clothing/accessory/medal/bronze_heart
display_name = "Verd's Medal"
ckeywhitelist = list("epigraphzero")
character_name = list("Verd Woodrow")
// F CKEYS
// G CKEYS
/datum/gear/fluff/eldi_implant
path = /obj/item/weapon/implanter/reagent_generator/eldi
display_name = "Eldi's Implant"
ckeywhitelist = list("gowst")
character_name = list("Eldi Moljir")
// H CKEYS
/datum/gear/fluff/lauren_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Lauren's Medal"
ckeywhitelist = list("heroman3003")
character_name = list("Lauren Zackson")
/datum/gear/fluff/lauren_string
path = /obj/item/clothing/accessory/collar/fluff/goldenstring
display_name = "Lauren's String"
ckeywhitelist = list("heroman3003")
character_name = list("Lauren Zackson")
/datum/gear/fluff/belle_sizegun
path = /obj/item/weapon/gun/energy/sizegun
display_name = "Belle's Sizegun"
ckeywhitelist = list("hottokeeki")
character_name = list("Belle Day")
/datum/gear/fluff/belle_implant
path = /obj/item/weapon/implanter/reagent_generator/belle
display_name = "Belle's Implant"
ckeywhitelist = list("hottokeeki")
character_name = list("Belle Day")
// I CKEYS
/datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda
display_name = "Ruda's Detective Badge"
ckeywhitelist = list("interrolouis")
character_name = list("Ruda Lizden")
/datum/gear/fluff/kai_modkit
path = /obj/item/borg/upgrade/modkit/chassis_mod/kai
display_name = "Kai's Modkit"
ckeywhitelist = list("interrolouis")
character_name = list("Kai Highlands")
/datum/gear/fluff/ivy_backpack
path = /obj/item/weapon/storage/backpack/messenger/sec/fluff/ivymoomoo
display_name = "Ivy's Backpack"
ckeywhitelist = list("ivymoomoo")
character_name = list("Ivy Baladeva")
// J CKEYS
/datum/gear/fluff/mor_box
path = /obj/item/weapon/storage/box/fluff/morxaina
display_name = "Mor's Box"
ckeywhitelist = list("jacknoir413")
character_name = list("Mor Xaina")
/datum/gear/fluff/areax_staff
path = /obj/item/weapon/storage/backpack/fluff/stunstaff
display_name = "Areax's Stun Staff"
ckeywhitelist = list("jacknoir413")
character_name = list("Areax Third")
allowed_roles = list("Security Officer, Warden, Head of Security")
/datum/gear/fluff/earthen_uniform
path = /obj/item/clothing/under/fluff/earthenbreath
display_name = "Earthen's Uniform"
ckeywhitelist = list("jacobdragon")
character_name = list("Earthen Breath")
/datum/gear/fluff/earthen_hairpin
path = /obj/item/clothing/head/fluff/hairflowerpin
display_name = "Earthen's Flower Pin"
ckeywhitelist = list("jacobdragon")
character_name = list("Earthen Breath")
/datum/gear/fluff/cirra_box
path = /obj/item/weapon/storage/box/fluff/cirra
display_name = "Cirra's Box"
ckeywhitelist = list("jemli")
character_name = list("Cirra Mayhem")
/datum/gear/fluff/jemli_fedora
path = /obj/item/clothing/head/fedora/fluff/jemli
display_name = "Jemli's Fedora"
ckeywhitelist = list("jemli")
character_name = list("Jemli")
/datum/gear/fluff/jeremiah_permit
path = /obj/item/clothing/accessory/permit/gun/fluff/ace
display_name = "Ace's Gun Permit"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_gun
path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp
display_name = "Ace's Gun"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_ammo
path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo
display_name = "Ace's Spare Ammo"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_holster
path = /obj/item/clothing/accessory/holster/armpit
display_name = "Ace's Holster"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_boots
path = /obj/item/clothing/shoes/boots/combat
display_name = "Ace's Boots"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
/datum/gear/fluff/jeremiah_combatuniform
path = /obj/item/clothing/under/syndicate/combat
display_name = "Ace's Combat Uniform"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
/datum/gear/fluff/joan_backpack
path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/joanrisu
display_name = "Joan's backpack"
ckeywhitelist = list("joanrisu")
character_name = list("Joan Risu")
/datum/gear/fluff/katarina_backpack
path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina
display_name = "Katarina's Backpack"
ckeywhitelist = list("joanrisu")
character_name = list("Katarina Eine")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/emoticon_box
path = /obj/item/weapon/storage/box/fluff/emoticon
display_name = "Emoticon's Box"
ckeywhitelist = list("joey4298")
character_name = list("Emoticon")
/datum/gear/fluff/emoticon_mimeuniform
path = /obj/item/clothing/under/sexymime
display_name = "Emoticon's Mime Uniform"
ckeywhitelist = list("joey4298")
character_name = list("Emoticon")
/datum/gear/fluff/emoticon_mimemask
path = /obj/item/clothing/mask/gas/sexymime
display_name = "Emoticon's Mime Mask"
ckeywhitelist = list("joey4298")
character_name = list("Emoticon")
/datum/gear/fluff/harmony_medal
path = /obj/item/clothing/accessory/medal/gold/heroism
display_name = "Harmony's Heroism Medal"
ckeywhitelist = list("john.wayne9392")
character_name = list("Harmony Pretchl")
/datum/gear/fluff/harmony_modkit
path = /obj/item/device/modkit_conversion/fluff/harmonysuit
display_name = "Harmony's Modkit"
ckeywhitelist = list("john.wayne9392")
character_name = list("Harmony Pretchl")
/datum/gear/fluff/harmony_spacemodkit
path = /obj/item/device/modkit_conversion/fluff/harmonyspace
display_name = "Harmony's Modkit 2"
ckeywhitelist = list("john.wayne9392")
character_name = list("Harmony Pretchl")
/datum/gear/fluff/koyo_box
path = /obj/item/weapon/storage/box/fluff/koyoakimomi
display_name = "Koyo's Box"
ckeywhitelist = list("jwguy")
character_name = list("Koyo Akimomi")
// K CKEYS
/datum/gear/fluff/smu_medal
path = /obj/item/clothing/accessory/medal/nobel_science
display_name = "SMU's Nobel Science Award"
ckeywhitelist = list("keekenox")
character_name = list("SMU-453")
/datum/gear/fluff/ketrai_hat
path = /obj/item/clothing/head/fluff/ketrai
display_name = "Ketrai's Hat"
ckeywhitelist = list("ketrai")
character_name = list("Ketrai")
/datum/gear/fluff/amaya_id
path = /obj/item/weapon/card/id/fluff/amaya
display_name = "Amaya's ID"
ckeywhitelist = list("kiraalitruss")
character_name = list("Amaya Rahl")
/datum/gear/fluff/kisuke_glasses
path = /obj/item/clothing/glasses/omnihud/kamina
display_name = "Kisuke's Kamina Glasses"
ckeywhitelist = list("kisukegema")
character_name = list("Kisuke Gema")
/datum/gear/fluff/lassara_sheath
path = /obj/item/clothing/accessory/storage/knifeharness
display_name = "Lassara's Knife Harness"
ckeywhitelist = list("killjaden")
character_name = list("Lassara Faaira'Nrezi")
/datum/gear/fluff/rana_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Rana's Unity Medal"
ckeywhitelist = list("kitchifox")
character_name = list("Rana Uma")
/datum/gear/fluff/taiga_uniform
path = /obj/item/clothing/under/fluff/taiga
display_name = "Taifa's Uniform"
ckeywhitelist = list("kiwidaninja")
character_name = list("Chakat Taiga")
/datum/gear/fluff/rischi_implant
path = /obj/item/weapon/implanter/reagent_generator/rischi
display_name = "Rischi's Implant"
ckeywhitelist = list("konabird")
character_name = list("Rischi")
/datum/gear/fluff/ashley_medal
path = /obj/item/clothing/accessory/medal/nobel_science/fluff/ashley
display_name = "Ashley's Medal"
ckeywhitelist = list("knightfall5")
character_name = list("Ashley Kifer")
// L CKEYS
/datum/gear/fluff/kenzie_hypospray
path = /obj/item/weapon/reagent_containers/hypospray/vial/kenzie
display_name = "Kenzie's Hypospray"
ckeywhitelist = list("lm40")
character_name = list("Kenzie Houser")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/fluff/brianna_backpack
path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana
display_name = "Briana's Backpack"
ckeywhitelist = list("luminescentring")
character_name = list("Briana Moore")
/datum/gear/fluff/savannah_implant
path = /obj/item/weapon/implanter/reagent_generator/savannah
display_name = "Savannah's Implant"
ckeywhitelist = list("lycanthorph")
character_name = list("Savannah Dixon")
// M CKEYS
/datum/gear/fluff/phi_box
path = /obj/item/weapon/storage/box/fluff/phi
display_name = "Phi's Box"
ckeywhitelist = list("mewchild")
character_name = list("Phi Vietsi")
/datum/gear/fluff/giliana_labcoat
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/molenar
display_name = "Giliana's Labcoat"
ckeywhitelist = list("molenar")
character_name = list("Giliana Gamish")
/datum/gear/fluff/myryan_belt
path = /obj/item/weapon/storage/belt/utility/fluff/vulpine
display_name = "Myryan's Belt"
ckeywhitelist = list("myryan")
character_name = list("Myryan Karnage-Cunningham")
/datum/gear/fluff/resh_uniform
path = /obj/item/clothing/suit/security/navyhos
display_name = "Resh's HoS Uniform"
ckeywhitelist = list("mrsignmeup")
character_name = list("Reshskakskakss Seekiseekis")
allowed_roles = list("Head of Security")
/datum/gear/fluff/daniel_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Daniel's Conduct Medal"
ckeywhitelist = list("mrsignmeup")
character_name = list("Daniel Fisher")
// N CKEYS
/datum/gear/fluff/awen_hat
path = /obj/item/clothing/head/fluff/wolfgirl
display_name = "Awen's Hat"
ckeywhitelist = list("natje")
character_name = list("Awen Henry")
/datum/gear/fluff/awen_shoes
path = /obj/item/clothing/shoes/fluff/wolfgirl
ckeywhitelist = list("natje")
character_name = list("Awen Henry")
/datum/gear/fluff/awen_uniform
path = /obj/item/clothing/under/fluff/wolfgirl
display_name = "Awen's Uniform"
ckeywhitelist = list("natje")
character_name = list("Awen Henry")
/datum/gear/fluff/pumila_vines
path = /obj/item/clothing/under/fluff/aluranevines
display_name = "Pumila's Vines"
ckeywhitelist = list("natje")
character_name = list("Pumila")
/datum/gear/fluff/annie_sweater
path = /obj/item/clothing/accessory/sweater/fluff/annie
display_name = "Annie's Sweater"
ckeywhitelist = list("nepox")
character_name = list("Annie Rose")
// O CKEYS
/datum/gear/fluff/richard_chain
path = /obj/item/weapon/melee/fluff/holochain
display_name = "Richard's Holochain"
ckeywhitelist = list("orbisa")
character_name = list("Richard D'angelo")
// P CKEYS
/datum/gear/fluff/lily_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Lily's Unity Medal"
ckeywhitelist = list("phoaly")
character_name = list("Lily Maximus")
/datum/gear/fluff/lucuis_battery
path = /obj/item/weapon/fluff/dragor_dot
display_name = "Lucuis' Spare Battery"
ckeywhitelist = list("pontifexminimus")
character_name = list("Lucius Null")
/datum/gear/fluff/lucia_battery
path = /obj/item/weapon/fluff/dragor_dot
display_name = "Lucia's Spare Battery"
ckeywhitelist = list("pontifexminimus")
character_name = list("Lucia Null")
// Q CKEYS
// R CKEYS
/datum/gear/fluff/tiemli_weldinggoggles
path = /obj/item/clothing/glasses/welding/tiemgogs
display_name = "Tiemli's Welding Goggles"
ckeywhitelist = list("radiantaurora")
character_name = list("Tiemli Kroto")
allowed_roles = list("Roboticist")
// S CKEYS
/datum/gear/fluff/kateryna_voidsuit
path = /obj/item/clothing/suit/space/void/engineering/kate
display_name = "Kateryna's Voidsuit"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
/datum/gear/fluff/katerina_spacesuit
path = /obj/item/clothing/head/helmet/space/fluff/kate
display_name = "Kateryna's Helmet"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician")
/datum/gear/fluff/kateryna_armorvest
path = /obj/item/clothing/suit/armor/vest/wolftaur/kate
display_name = "Kateryna's Armor Vest"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Security Officer", "Warden", "Head of Security", "Colony Director", "Head of Personnel")
/datum/gear/fluff/viktor_flask
path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor
display_name = "Viktor's Flask"
ckeywhitelist = list("semaun")
character_name = list("Viktor Solothurn")
/datum/gear/fluff/scree_modkit
path = /obj/item/device/modkit_conversion/fluff/screekit
display_name = "Scree's Modkit"
ckeywhitelist = list("scree")
character_name = list("Scree")
/datum/gear/fluff/scree_pompom
path = /obj/item/clothing/head/fluff/pompom
display_name = "Scree's Weird PopPom thing"
ckeywhitelist = list("scree")
character_name = list("Scree")
/datum/gear/fluff/alfonso_sunglasses
path = /obj/item/clothing/glasses/sunglasses/fluff/alfonso
display_name = "Alfonso's Sunglasses"
ckeywhitelist = list("seiga")
character_name = list("Alfonso Oak Telanor")
/datum/gear/fluff/nthasd_modkit //Converts a Security suit's sprite
path = /obj/item/device/modkit_conversion/hasd
display_name = "NT-HASD #556's Modkit"
ckeywhitelist = list("silencedmp5a5")
character_name = list("NT-HASD #556")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
/datum/gear/fluff/tasy_clownuniform
path = /obj/item/clothing/under/sexyclown
display_name = "Tasy's Clown Uniform"
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/tasy_clownmask
path = /obj/item/clothing/mask/gas/sexyclown
display_name = "Tasy's Clownmask"
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/tasy_clownPDA
path = /obj/item/device/pda/clown
display_name = "Tasy's Clown PDA"
ckeywhitelist = list("silvertalismen")
character_name = list("Tasy Ruffles")
/datum/gear/fluff/evian_implant
path = /obj/item/weapon/implanter/reagent_generator/evian
display_name = "Evian's Implant"
ckeywhitelist = list("silvertalismen")
character_name = list("Evian")
/datum/gear/fluff/fortune_backpack
path = /obj/item/weapon/storage/backpack/satchel/fluff/swat43bag
display_name = "Fortune's Backpack"
ckeywhitelist = list("swat43")
character_name = list("Fortune Bloise")
/datum/gear/fluff/alexis_cane
path = /obj/item/weapon/cane/wand
display_name = "Alexis' Cane"
ckeywhitelist = list("stobarico")
character_name = list("Alexis Bloise")
/datum/gear/fluff/roiz_implant
path = /obj/item/weapon/implanter/reagent_generator/roiz
display_name = "Roiz's Implant"
ckeywhitelist = list("spoopylizz")
character_name = list("Roiz Lizden")
/datum/gear/fluff/roiz_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/roiz
display_name = "Roiz's Coat"
ckeywhitelist = list("spoopylizz")
character_name = list("Roiz Lizden")
/datum/gear/fluff/silent_mimemask
path = /obj/item/clothing/mask/gas/sexymime
display_name = "Silent Stripe's Mime Mask"
ckeywhitelist = list("suicidalpickles")
character_name = list("Silent Stripes")
/datum/gear/fluff/silent_mimeuniform
path = /obj/item/clothing/under/sexymime
display_name = "Silent Stripe's Mime Uniform"
ckeywhitelist = list("suicidalpickles")
character_name = list("Silent Stripes")
// T CKEYS
/datum/gear/fluff/ascian_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Ascian's Unity Medal"
ckeywhitelist = list("tabiranth")
character_name = list("Ascian")
/datum/gear/fluff/ascian_spiritspawner
path = /obj/item/weapon/grenade/spawnergrenade/spirit
display_name = "The Best Kitten"
ckeywhitelist = list("tabiranth")
character_name = list("Ascian")
/datum/gear/fluff/ascian_shelterpod
path = /obj/item/device/survivalcapsule/tabiranth
display_name = "Ascian's Shelterpod"
ckeywhitelist = list("tabiranth")
character_name = list("Ascian")
/datum/gear/fluff/lasshseeki_ealimplant
path = /obj/item/weapon/implant/language/eal
display_name = "Lasshseeki's EAL Implant"
ckeywhitelist = list("techtypes")
character_name = list("Lasshseeki Korss")
/datum/gear/fluff/konor_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Konor's Unity Medal"
ckeywhitelist = list("tinydude16")
character_name = list("Konor Foxe")
// U CKEYS
// V CKEYS
/datum/gear/fluff/vakashi_permit
path = /obj/item/clothing/accessory/permit/gun/fluff/Vakashi
display_name = "Vakashi's Pepperspray Permit"
ckeywhitelist = list("vailthewolf")
character_name = list("Vakashi")
/datum/gear/fluff/vakashi_pepperspray
path = /obj/item/weapon/reagent_containers/spray/pepper
display_name = "Vakashi's Pepperspray"
ckeywhitelist = list("vailthewolf")
character_name = list("Vakashi")
/datum/gear/fluff/cameron_glasses
path = /obj/item/clothing/glasses/fluff/science_proper
display_name = "Cameron's Science Glasses"
ckeywhitelist = list("verkister")
character_name = list("Cameron Eggbert")
/datum/gear/fluff/cameron_disk
path = /obj/item/weapon/disk/limb/eggnerdltd
display_name = "Cameron's Eggnerd Disk"
ckeywhitelist = list("verkister")
character_name = list("Cameron Eggbert")
/datum/gear/fluff/opie_glasses
path = /obj/item/clothing/glasses/fluff/spiffygogs
display_name = "Opie's Goggles"
ckeywhitelist = list("verkister")
character_name = list("Opie Eggbert")
/datum/gear/fluff/verin_hazardvest
path = /obj/item/clothing/suit/storage/hazardvest/fluff/verin
display_name = "Verin's Hazard Vest"
ckeywhitelist = list("virgo113")
character_name = list("Verin Raharra")
/datum/gear/fluff/lucina_pda
path = /obj/item/device/pda/heads/cmo/fluff/lucinapda
display_name = "Lucina's PDA"
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/lucina_medal
path = /obj/item/clothing/accessory/medal/gold/fluff/lucina
display_name = "Lucina's Gold Medal"
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/lucina_dress
path = /obj/item/clothing/under/dress/fluff/lucinadress
display_name = "Lucina's Dress"
ckeywhitelist = list("vorrarkul")
character_name = list("Lucina Dakarim")
/datum/gear/fluff/melanie_skeleton
path = /obj/item/clothing/under/fluff/slime_skeleton
display_name = "Melanie's Skeleton"
ckeywhitelist = list("vorrarkul")
character_name = list("Melanie Farmer")
/datum/gear/fluff/nyssa_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
display_name = "Nyssa's Coat"
ckeywhitelist = list("vorrarkul")
character_name = list("Nyssa Brennan")
/datum/gear/fluff/theodora_suit
path = /obj/item/clothing/suit/chococoat
display_name = "Theodora's Coat"
ckeywhitelist = list("vorrarkul")
character_name = list("Theodora Lindt")
/datum/gear/fluff/theodora_implant
path = /obj/item/weapon/implanter/reagent_generator/vorrarkul
display_name = "Theodora's Implant"
ckeywhitelist = list("vorrarkul")
character_name = list("Theodora Lindt")
/datum/gear/fluff/kaitlyn_plush
path = /obj/item/toy/plushie/mouse/fluff
display_name = "Kaitlyn's Mouse Plush"
ckeywhitelist = list("vorrarkul")
character_name = list("Kaitlyn Fiasco")
/datum/gear/fluff/keturah_maiddress
path = /obj/item/clothing/under/dress/maid/
display_name = "Keturah's Maid Dress"
ckeywhitelist = list("viveret")
character_name = list("Keturah")
/datum/gear/fluff/silentio_mimeuniform
path = /obj/item/clothing/under/sexymime
display_name = "Silentio's Mime Uniform"
ckeywhitelist = list("viveret")
character_name = list("Silentio")
/datum/gear/fluff/silentio_mimemask
path = /obj/item/clothing/mask/gas/sexymime
display_name = "Silentio's Mime Mask"
ckeywhitelist = list("Viveret")
character_name = list("Silentio")
// W CKEYS
/datum/gear/fluff/sthasha_bracer
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
display_name = "S'thasha's Bracer"
ckeywhitelist = list("wanderingdeviant")
character_name = list("S'thasha Tavakdavi")
/datum/gear/fluff/silas_glasses
path = /obj/item/clothing/glasses/threedglasses
display_name = "Silas' 3-D Glasses"
ckeywhitelist = list("werebear")
character_name = list("Silas Newton")
/datum/gear/fluff/vinjj_weldingmask
path = /obj/item/clothing/head/welding/fluff/vinjj
display_name = "Vinjj's Welding Mask"
ckeywhitelist = list("whiskyrose")
character_name = list("Vinjj")
/datum/gear/fluff/tempest_hudglases
path = /obj/item/clothing/glasses/omnihud/med/fluff/wickedtemphud
display_name = "Tempest's Medical Hud"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/fluff/tempest_hypospray
path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
display_name = "Tempest's Hypospray"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/fluff/tempest_backpack
path = /obj/item/weapon/storage/backpack/saddlebag/tempest
display_name = "Tempest's Saddlebag"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
/datum/gear/fluff/tempest_implant
path = /obj/item/weapon/implanter/reagent_generator/tempest
display_name = "Tempest's Implant"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
// X CKEYS
/datum/gear/fluff/penelope_box
path = /obj/item/weapon/storage/box/fluff/penelope
display_name = "Penelope's Box"
ckeywhitelist = list("xsdew")
character_name = list("Penelope Allen")
/datum/gear/fluff/ali_medal
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Ali's Unity Medal"
ckeywhitelist = list("xonkon")
character_name = list("Ali")
// Y CKEYS
// Z CKEYS
/datum/gear/fluff/tachika_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Tachika's Conduct Medal"
ckeywhitelist = list("zammyman")
character_name = list("Tachika")
/datum/gear/fluff/zaoozaoo_hat
path = /obj/item/clothing/head/fluff/zao
display_name = "Zaoozaoo's Hat"
ckeywhitelist = list("zigfe")
character_name = list("Zaoozaoo Xrimxuqmqixzix")
/datum/gear/fluff/nehi_radio
path = /obj/item/device/radio/headset/fluff/zodiacshadow
display_name = "Nehi's Radio"
ckeywhitelist = list("zodiacshadow")
character_name = list("Nehi Maximus")

2
code/modules/client/preference_setup/loadout/loadout_smoking.dm
View File

@@ -27,6 +27,8 @@
..()
var/list/zippos = list()
for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo))
if(zippo in typesof(/obj/item/weapon/flame/lighter/zippo/fluff)) //VOREStation addition
continue //VOREStation addition
var/obj/item/weapon/flame/lighter/zippo/zippo_type = zippo
zippos[initial(zippo_type.name)] = zippo_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(zippos))

10
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -106,6 +106,8 @@ datum/gear/suit/duster
..()
var/list/hazards = list()
for(var/hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest))
if(hazard_style in typesof(/obj/item/clothing/suit/storage/hazardvest/fluff)) //VOREStation addition
continue //VOREStation addition
var/obj/item/clothing/suit/storage/hazardvest/hazardvest = hazard_style
hazards[initial(hazardvest.name)] = hazardvest
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hazards))
@@ -493,3 +495,11 @@ datum/gear/suit/duster
display_name = "snowsuit, supply"
path = /obj/item/clothing/suit/storage/snowsuit/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
/datum/gear/suit/miscellaneous/cardigan
display_name = "cardigan"
path = /obj/item/clothing/suit/storage/toggle/cardigan
/datum/gear/suit/miscellaneous/cardigan/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)

6
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -1,9 +1,3 @@
/datum/gear/suit/roles/poncho/cloak/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Explorer", "Pathfinder")
/datum/gear/suit/roles/poncho/cloak/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/suit/wintercoat/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")

15
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -65,6 +65,8 @@
..()
var/list/skirts = list()
for(var/skirt in (typesof(/obj/item/clothing/under/skirt)))
if(skirt in typesof(/obj/item/clothing/under/skirt/fluff)) //VOREStation addition
continue //VOREStation addition
var/obj/item/clothing/under/skirt/skirt_type = skirt
skirts[initial(skirt_type.name)] = skirt_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(skirts))
@@ -223,6 +225,8 @@
..()
var/list/msuits = list()
for(var/msuit in typesof(/obj/item/clothing/under/suit_jacket))
if(msuit in typesof(/obj/item/clothing/under/suit_jacket/female/fluff)) //VOREStation addition
continue //VOREStation addition
var/obj/item/clothing/suit/msuit_type = msuit
msuits[initial(msuit_type.name)] = msuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(msuits))
@@ -502,3 +506,14 @@
display_name = "plain ascetic garb"
path = /obj/item/clothing/under/ascetic
/datum/gear/uniform/pleated
display_name = "pleated skirt"
path = /obj/item/clothing/under/skirt/pleated
/datum/gear/uniform/pleated/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/uniform/lilacdress
display_name = "lilac dress"
path = /obj/item/clothing/under/dress/lilacdress

10
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -3,9 +3,9 @@
path = /obj/item/clothing/under/permit
//Polaris overrides
/datum/gear/uniform/pt/sifguard
/datum/gear/uniform/solgov/pt/sifguard
display_name = "pt uniform, planetside sec"
path = /obj/item/clothing/under/pt/sifguard
path = /obj/item/clothing/under/solgov/pt/sifguard
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
@@ -168,4 +168,8 @@ Swimsuits
//Tron Siren outfit
/datum/gear/uniform/siren
display_name = "jumpsuit, Siren"
path = /obj/item/clothing/under/fluff/siren
path = /obj/item/clothing/under/fluff/siren
/datum/gear/uniform/suit/v_nanovest
display_name = "Varmacorp nanovest"
path = /obj/item/clothing/under/fluff/v_nanovest

67
code/modules/client/preference_setup/loadout/loadout_utility.dm
View File

@@ -123,7 +123,25 @@
display_name = "implant, tracking"
path = /obj/item/weapon/implant/tracking/weak
cost = 0 //VOREStation Edit. Changed cost to 0
/* VOREStation Edit - Make languages great again
/datum/gear/utility/implant/neural
display_name = "implant, neural assistance web"
description = "A complex web implanted into the subject, medically in order to compensate for neurological disease."
path = /obj/item/weapon/implant/neural/roundstart
cost = 6
/datum/gear/utility/implant/dud1
display_name = "implant, head"
description = "An implant with no obvious purpose."
path = /obj/item/weapon/implant/dud
cost = 1
/datum/gear/utility/implant/dud2
display_name = "implant, torso"
description = "An implant with no obvious purpose."
path = /obj/item/weapon/implant/dud/torso
cost = 1
/datum/gear/utility/implant/language
cost = 2
exploitable = 0
@@ -137,7 +155,7 @@
display_name = "vocal synthesizer, Skrellian"
description = "A surgically implanted vocal synthesizer which allows the owner to speak Common Skrellian, if they know it."
path = /obj/item/weapon/implant/language/skrellian
*/
/datum/gear/utility/pen
display_name = "Fountain Pen"
path = /obj/item/weapon/pen/fountain
@@ -159,3 +177,48 @@
/datum/gear/utility/umbrella/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/****************
modular computers
****************/
/datum/gear/utility/cheaptablet
display_name = "tablet computer: cheap"
display_name = "tablet computer, cheap"
path = /obj/item/modular_computer/tablet/preset/custom_loadout/cheap
cost = 3
/datum/gear/utility/normaltablet
display_name = "tablet computer: advanced"
display_name = "tablet computer, advanced"
path = /obj/item/modular_computer/tablet/preset/custom_loadout/advanced
cost = 4
/datum/gear/utility/customtablet
display_name = "tablet computer: custom"
display_name = "tablet computer, custom"
path = /obj/item/modular_computer/tablet
cost = 4
/datum/gear/utility/customtablet/New()
..()
gear_tweaks += new /datum/gear_tweak/tablet()
/datum/gear/utility/cheaplaptop
display_name = "laptop computer, cheap"
path = /obj/item/modular_computer/laptop/preset/custom_loadout/cheap
cost = 4
/datum/gear/utility/normallaptop
display_name = "laptop computer, advanced"
path = /obj/item/modular_computer/laptop/preset/custom_loadout/advanced
cost = 5
/datum/gear/utility/customlaptop
display_name = "laptop computer, custom"
path = /obj/item/modular_computer/laptop/preset/
cost = 6 //VOREStation Edit
/datum/gear/utility/customlaptop/New()
..()
gear_tweaks += new /datum/gear_tweak/laptop()

3
code/modules/client/preference_setup/loadout/loadout_vr.dm Normal file
View File

@@ -0,0 +1,3 @@
/datum/gear
var/list/ckeywhitelist
var/list/character_name

2
code/modules/client/preference_setup/occupation/occupation.dm
View File

@@ -54,7 +54,7 @@
if(alt_title && !(alt_title in job.alt_titles))
pref.player_alt_titles -= job.title
/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 19, list/splitJobs = list("Chief Engineer")) //VOREStation Edit
/datum/category_item/player_setup_item/occupation/content(mob/user, limit = 20, list/splitJobs = list("Pathfinder")) //VOREStation Edit
if(!job_master)
return

52
code/modules/client/preference_setup/traits/trait_defines.dm
View File

@@ -72,25 +72,45 @@
Regardless, you find it quite difficult to land shots where you wanted them to go."
modifier_type = /datum/modifier/trait/inaccurate
/datum/trait/modifier/physical/smaller
name = "Smaller"
modifier_type = /datum/modifier/trait/smaller
mutually_exclusive = list(/datum/trait/modifier/physical/small, /datum/trait/modifier/physical/large, /datum/trait/modifier/physical/larger)
/datum/trait/modifier/physical/shorter
name = "Shorter"
modifier_type = /datum/modifier/trait/shorter
mutually_exclusive = list(/datum/trait/modifier/physical/short, /datum/trait/modifier/physical/tall, /datum/trait/modifier/physical/taller)
/datum/trait/modifier/physical/small
name = "Small"
modifier_type = /datum/modifier/trait/small
mutually_exclusive = list(/datum/trait/modifier/physical/smaller, /datum/trait/modifier/physical/large, /datum/trait/modifier/physical/larger)
/datum/trait/modifier/physical/short
name = "Short"
modifier_type = /datum/modifier/trait/short
mutually_exclusive = list(/datum/trait/modifier/physical/shorter, /datum/trait/modifier/physical/tall, /datum/trait/modifier/physical/taller)
/datum/trait/modifier/physical/large
name = "Large"
modifier_type = /datum/modifier/trait/large
mutually_exclusive = list(/datum/trait/modifier/physical/smaller, /datum/trait/modifier/physical/small, /datum/trait/modifier/physical/larger)
/datum/trait/modifier/physical/tall
name = "Tall"
modifier_type = /datum/modifier/trait/tall
mutually_exclusive = list(/datum/trait/modifier/physical/shorter, /datum/trait/modifier/physical/short, /datum/trait/modifier/physical/taller)
/datum/trait/modifier/physical/larger
name = "Larger"
modifier_type = /datum/modifier/trait/larger
mutually_exclusive = list(/datum/trait/modifier/physical/smaller, /datum/trait/modifier/physical/small, /datum/trait/modifier/physical/large)
/datum/trait/modifier/physical/taller
name = "Taller"
modifier_type = /datum/modifier/trait/taller
mutually_exclusive = list(/datum/trait/modifier/physical/shorter, /datum/trait/modifier/physical/short, /datum/trait/modifier/physical/tall)
/datum/trait/modifier/physical/thin
name = "Thin"
modifier_type = /datum/modifier/trait/thin
mutually_exclusive = list(/datum/trait/modifier/physical/fat, /datum/trait/modifier/physical/obese, /datum/trait/modifier/physical/thinner)
/datum/trait/modifier/physical/thinner
name = "Rail Thin"
modifier_type = /datum/modifier/trait/thinner
mutually_exclusive = list(/datum/trait/modifier/physical/fat, /datum/trait/modifier/physical/obese, /datum/trait/modifier/physical/thin)
/datum/trait/modifier/physical/fat
name = "Broad-Shouldered"
modifier_type = /datum/modifier/trait/fat
mutually_exclusive = list(/datum/trait/modifier/physical/thin, /datum/trait/modifier/physical/obese, /datum/trait/modifier/physical/thinner)
/datum/trait/modifier/physical/obese
name = "Heavily Built"
modifier_type = /datum/modifier/trait/obese
mutually_exclusive = list(/datum/trait/modifier/physical/fat, /datum/trait/modifier/physical/thinner, /datum/trait/modifier/physical/thin)
/datum/trait/modifier/physical/colorblind_protanopia
name = "Protanopia"

2
code/modules/client/preference_setup/vore/06_vantag.dm
View File

@@ -27,7 +27,7 @@
/datum/category_item/player_setup_item/vore/vantag/content(var/mob/user)
. += "<br>"
. += "<b>Event Volunteer:</b> <a href='?src=\ref[src];toggle_vantag_volunteer=1'><b>[pref.vantag_volunteer ? "Yes" : "No"]</b></a><br>"
. += "<b>Event Volunteer:</b> <a [pref.vantag_volunteer ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_vantag_volunteer=1'><b>[pref.vantag_volunteer ? "Yes" : "No"]</b></a><br>"
. += "<b>Event Pref:</b> <a href='?src=\ref[src];change_vantag=1'><b>[vantag_choices_list[pref.vantag_preference]]</b></a><br>"
/datum/category_item/player_setup_item/vore/vantag/OnTopic(var/href, var/list/href_list, var/mob/user)

2
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -96,7 +96,7 @@
log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet
/datum/category_item/player_setup_item/vore/traits/content(var/mob/user)
. += "<b>Custom Species</b> "
. += "<b>Custom Species Name:</b> "
. += "<a href='?src=\ref[src];custom_species=1'>[pref.custom_species ? pref.custom_species : "-Input Name-"]</a><br>"
var/datum/species/selected_species = all_species[pref.species]

20
code/modules/client/preference_setup/vore/09_misc.dm
View File

@@ -1,5 +1,4 @@
/datum/preferences
var/show_in_directory = TRUE
//TFF 5/8/19 - moved /datum/preferences to preferences_vr.dm
/datum/category_item/player_setup_item/vore/misc
name = "Misc Settings"
@@ -7,20 +6,35 @@
/datum/category_item/player_setup_item/vore/misc/load_character(var/savefile/S)
S["show_in_directory"] >> pref.show_in_directory
S["sensorpref"] >> pref.sensorpref //TFF 5/8/19 - add sensor pref setting to load after saved
/datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S)
S["show_in_directory"] << pref.show_in_directory
S["sensorpref"] << pref.sensorpref //TFF 5/8/19 - add sensor pref setting to be saveable
//TFF 5/8/19 - add new datum category to allow for setting multiple settings when this is selected in the loadout.
/datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character)
if(pref.sensorpref > 5 || pref.sensorpref < 1)
pref.sensorpref = 5
character.sensorpref = pref.sensorpref
/datum/category_item/player_setup_item/vore/misc/sanitize_character()
pref.show_in_directory = sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory))
pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) //TFF - 5/8/19 - add santisation for sensor prefs
/datum/category_item/player_setup_item/vore/misc/content(var/mob/user)
. += "<br>"
. += "<b>Appear in Character Directory:</b> <a [pref.show_in_directory ? "class='linkOn'" : ""] href='?src=\ref[src];toggle_show_in_directory=1'><b>[pref.show_in_directory ? "Yes" : "No"]</b></a><br>"
. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>" //TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random
/datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user)
if(href_list["toggle_show_in_directory"])
pref.show_in_directory = pref.show_in_directory ? 0 : 1;
return TOPIC_REFRESH
//TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get.
else if(href_list["toggle_sensor_setting"])
var/new_sensorpref = input(user, "Choose your character's sensor preferences:", "Character Preferences", sensorpreflist[pref.sensorpref]) as null|anything in sensorpreflist
if (!isnull(new_sensorpref) && CanUseTopic(user))
pref.sensorpref = sensorpreflist.Find(new_sensorpref)
return TOPIC_REFRESH
return ..();

40
code/modules/client/preferences_toggle_procs.dm
View File

@@ -10,7 +10,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear all mob speech as a ghost.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TGEars") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -25,7 +25,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] see all emotes as a ghost.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TGVision") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -40,7 +40,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear all radios as a ghost.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TGRadio") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -55,7 +55,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear dead chat as a ghost.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TDeadChat") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -70,7 +70,7 @@
to_chat(src,"You will [ (is_preference_enabled(/datum/client_preference/show_ooc)) ? "now" : "no longer"] hear global out of character chat.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -85,7 +85,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear local out of character chat.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -100,7 +100,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] have the speech indicator.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TTIND") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -115,7 +115,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] receive noise from admin messages.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TAHelp") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -130,7 +130,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear music in the lobby.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TLobMusic") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -145,7 +145,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear MIDIs from admins.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TAMidis") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -160,7 +160,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear ambient noise.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TAmbience") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -175,7 +175,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear weather sounds.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TWeatherSounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -190,7 +190,7 @@
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear a hum from the supermatter.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TSupermatterHum") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -205,7 +205,7 @@
src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear jukebox music."
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TJukebox") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -218,7 +218,7 @@
if(!role_flag) return
prefs.be_special ^= role_flag
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
to_chat(src,"You will [(prefs.be_special & role_flag) ? "now" : "no longer"] be considered for [role] events (where possible).")
@@ -231,7 +231,7 @@
var/pref_path = /datum/client_preference/safefiring
toggle_preference(pref_path)
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
to_chat(src,"You will now use [(is_preference_enabled(/datum/client_preference/safefiring)) ? "safe" : "dangerous"] firearms firing.")
@@ -244,7 +244,7 @@
var/pref_path = /datum/client_preference/mob_tooltips
toggle_preference(pref_path)
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
to_chat(src,"You will now [(is_preference_enabled(/datum/client_preference/mob_tooltips)) ? "see" : "not see"] mob tooltips.")
@@ -257,7 +257,7 @@
var/pref_path = /datum/client_preference/instrument_toggle
toggle_preference(pref_path)
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
to_chat(src, "You will now [(is_preference_enabled(/datum/client_preference/instrument_toggle)) ? "hear" : "not hear"] instruments being played.")
@@ -276,7 +276,7 @@
if(check_rights(R_ADMIN|R_DEBUG))
toggle_preference(pref_path)
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] receive debug logs.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -291,6 +291,6 @@
if(check_rights(R_ADMIN|R_MOD))
toggle_preference(pref_path)
to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] receive attack logs.")
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

37
code/modules/client/preferences_vr.dm
View File

@@ -1 +1,36 @@
//File isn't currently being used.
//TFF 5/8/19 - minor refactoring of this thing from 09_misc.dm to call this for preferences.
datum/preferences
var/show_in_directory = 1 //TFF 5/8/19 - show in Character Directory
var/sensorpref = 5 //TFF 5/8/19 - set character's suit sensor level
//Why weren't these in game toggles already?
/client/verb/toggle_eating_noises()
set name = "Eating Noises"
set category = "Preferences"
set desc = "Toggles Vore Eating noises."
var/pref_path = /datum/client_preference/eating_noises
toggle_preference(pref_path)
src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear eating related vore noises."
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TEatNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/toggle_digestion_noises()
set name = "Digestion Noises"
set category = "Preferences"
set desc = "Toggles Vore Digestion noises."
var/pref_path = /datum/client_preference/digestion_noises
toggle_preference(pref_path)
src << "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear digestion related vore noises."
SScharacter_setup.queue_preferences_save(prefs)
feedback_add_details("admin_verb","TDigestNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

2
code/modules/client/ui_style.dm
View File

@@ -77,5 +77,5 @@ var/global/list/all_tooltip_styles = list(
prefs.UI_style = UI_style_new
prefs.UI_style_alpha = UI_style_alpha_new
prefs.UI_style_color = UI_style_color_new
prefs.save_preferences()
SScharacter_setup.queue_preferences_save(prefs)
usr << "UI was saved"