cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 13:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing conflicts

Browse Source
This commit is contained in:
Cadyn
2020-10-05 18:10:53 -07:00
parent 7b44df4701 2a79ecfdad
commit 07775449d7
2080 changed files with 1768339 additions and 30848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/01_basic.dm
+1 -1
View File
@@ -140,7 +140,7 @@ datum/preferences/proc/set_biological_gender(var/gender)
return TOPIC_REFRESH
else if(href_list["metadata"])
var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, extra = 0) //VOREStation Edit
var/new_metadata = sanitize(input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , html_decode(pref.metadata)) as message, MAX_RECORD_LENGTH, extra = 0) //VOREStation Edit
if(new_metadata && CanUseTopic(user))
pref.metadata = new_metadata
return TOPIC_REFRESH
code/modules/client/preference_setup/general/03_body.dm
+89 -3
View File
@@ -15,6 +15,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["hair_red"] >> pref.r_hair
S["hair_green"] >> pref.g_hair
S["hair_blue"] >> pref.b_hair
S["grad_red"] >> pref.r_grad
S["grad_green"] >> pref.g_grad
S["grad_blue"] >> pref.b_grad
S["facial_red"] >> pref.r_facial
S["grad_red"] >> pref.r_grad
S["grad_green"] >> pref.g_grad
@@ -26,6 +29,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["skin_green"] >> pref.g_skin
S["skin_blue"] >> pref.b_skin
S["hair_style_name"] >> pref.h_style
S["grad_style_name"] >> pref.grad_style
S["facial_style_name"] >> pref.f_style
S["grad_style_name"] >> pref.grad_style
S["eyes_red"] >> pref.r_eyes
@@ -43,6 +47,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_markings"] >> pref.synth_markings
S["bgstate"] >> pref.bgstate
S["body_descriptors"] >> pref.body_descriptors
S["Wingdings"] >> pref.wingdings //YWadd start
S["colorblind_mono"] >> pref.colorblind_mono
S["colorblind_vulp"] >> pref.colorblind_vulp
S["colorblind_taj"] >> pref.colorblind_taj
S["haemophilia"] >> pref.haemophilia //YWadd end
/datum/category_item/player_setup_item/general/body/save_character(var/savefile/S)
S["species"] << pref.species
@@ -60,6 +69,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["skin_green"] << pref.g_skin
S["skin_blue"] << pref.b_skin
S["hair_style_name"] << pref.h_style
S["grad_style_name"] << pref.grad_style
S["facial_style_name"] << pref.f_style
S["grad_style_name"] << pref.grad_style
S["eyes_red"] << pref.r_eyes
@@ -77,6 +87,11 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
S["synth_markings"] << pref.synth_markings
S["bgstate"] << pref.bgstate
S["body_descriptors"] << pref.body_descriptors
S["Wingdings"] << pref.wingdings //YWadd start
S["colorblind_mono"] << pref.colorblind_mono
S["colorblind_vulp"] << pref.colorblind_vulp
S["colorblind_taj"] << pref.colorblind_taj
S["haemophilia"] << pref.haemophilia //YWadd end
/datum/category_item/player_setup_item/general/body/sanitize_character(var/savefile/S)
if(!pref.species || !(pref.species in GLOB.playable_species))
@@ -95,6 +110,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.g_skin = sanitize_integer(pref.g_skin, 0, 255, initial(pref.g_skin))
pref.b_skin = sanitize_integer(pref.b_skin, 0, 255, initial(pref.b_skin))
pref.h_style = sanitize_inlist(pref.h_style, hair_styles_list, initial(pref.h_style))
pref.grad_style = sanitize_inlist(pref.grad_style, GLOB.hair_gradients, initial(pref.grad_style))
pref.f_style = sanitize_inlist(pref.f_style, facial_hair_styles_list, initial(pref.f_style))
pref.grad_style = sanitize_inlist(pref.grad_style, GLOB.hair_gradients, initial(pref.grad_style))
pref.r_eyes = sanitize_integer(pref.r_eyes, 0, 255, initial(pref.r_eyes))
@@ -132,6 +148,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
character.b_skin = pref.b_skin
character.s_tone = pref.s_tone
character.h_style = pref.h_style
character.grad_style= pref.grad_style
character.f_style = pref.f_style
character.grad_style= pref.grad_style
character.b_type = pref.b_type
@@ -140,6 +157,21 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
character.g_synth = pref.g_synth
character.b_synth = pref.b_synth
character.synth_markings = pref.synth_markings
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.
for(var/name in list(BP_HEAD, BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM, BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG, BP_GROIN, BP_TORSO))
@@ -212,10 +244,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
. += "Blood Type: <a href='?src=\ref[src];blood_type=1'>[pref.b_type]</a><br>"
if(has_flag(mob_species, HAS_SKIN_TONE))
. += "Skin Tone: <a href='?src=\ref[src];skin_tone=1'>[-pref.s_tone + 35]/220</a><br>"
. += "Needs Glasses: <a href='?src=\ref[src];disabilities=[NEARSIGHTED]'><b>[pref.disabilities & NEARSIGHTED ? "Yes" : "No"]</b></a><br>"
. += "<b>Disabilities</b><br> <a href='?src=\ref[src];disabilities_yw=1'>Adjust</a><br>" // YWadd
//YWcommented moved onto disabilities. += "Needs Glasses: <a href='?src=\ref[src];disabilities=[NEARSIGHTED]'><b>[pref.disabilities & NEARSIGHTED ? "Yes" : "No"]</b></a><br>"
. += "Limbs: <a href='?src=\ref[src];limbs=1'>Adjust</a> <a href='?src=\ref[src];reset_limbs=1'>Reset</a><br>"
. += "Internal Organs: <a href='?src=\ref[src];organs=1'>Adjust</a><br>"
//display limbs below
var/ind = 0
for(var/name in pref.organ_data)
@@ -401,6 +433,9 @@ 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(usr)
else if(href_list["set_species"])
user << browse(null, "window=species")
if(!pref.species_preview || !(pref.species_preview in GLOB.all_species))
@@ -464,6 +499,16 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.g_hair = hex2num(copytext(new_hair, 4, 6))
pref.b_hair = hex2num(copytext(new_hair, 6, 8))
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["grad_color"])
if(!has_flag(mob_species, HAS_HAIR_COLOR))
return TOPIC_NOACTION
var/new_grad = input(user, "Choose your character's secondary hair color:", "Character Preference", rgb(pref.r_grad, pref.g_grad, pref.b_grad)) as color|null
if(new_grad && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user))
pref.r_grad = hex2num(copytext(new_grad, 2, 4))
pref.g_grad = hex2num(copytext(new_grad, 4, 6))
pref.b_grad = hex2num(copytext(new_grad, 6, 8))
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["grad_color"])
if(!has_flag(mob_species, HAS_HAIR_COLOR))
@@ -482,6 +527,14 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
if(new_h_style && CanUseTopic(user))
pref.h_style = new_h_style
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["grad_style"])
var/list/valid_gradients = GLOB.hair_gradients
var/new_grad_style = input(user, "Choose a color pattern for your hair:", "Character Preference", pref.grad_style) as null|anything in valid_gradients
if(new_grad_style && CanUseTopic(user))
pref.grad_style = new_grad_style
return TOPIC_REFRESH_UPDATE_PREVIEW
else if(href_list["grad_style"])
var/list/valid_gradients = GLOB.hair_gradients
@@ -834,7 +887,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
else if(href_list["disabilities"])
var/disability_flag = text2num(href_list["disabilities"])
pref.disabilities ^= disability_flag
return TOPIC_REFRESH_UPDATE_PREVIEW
Disabilities_YW(usr) //YW Edit
else if(href_list["toggle_preview_value"])
pref.equip_preview_mob ^= text2num(href_list["toggle_preview_value"])
@@ -860,6 +913,38 @@ 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(usr)
else if(href_list["colorblind_mono"])
pref.colorblind_mono = !pref.colorblind_mono
Disabilities_YW(usr)
else if(href_list["colorblind_vulp"])
pref.colorblind_vulp = !pref.colorblind_vulp
Disabilities_YW(usr)
else if(href_list["colorblind_taj"])
pref.colorblind_taj = !pref.colorblind_taj
Disabilities_YW(usr)
else if(href_list["haemophilia"])
pref.haemophilia = !pref.haemophilia
Disabilities_YW(usr)
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(usr)
//YW Add End
return ..()
/datum/category_item/player_setup_item/general/body/proc/reset_limbs()
@@ -954,3 +1039,4 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
dat += "</center></body>"
user << browse(dat, "window=species;size=700x400")
code/modules/client/preference_setup/general/04_equipment.dm
+8
View File
@@ -12,6 +12,7 @@
S["backbag"] >> pref.backbag
S["pdachoice"] >> pref.pdachoice
S["communicator_visibility"] >> pref.communicator_visibility
S["ttone"] >> pref.ttone //YW Edit
/datum/category_item/player_setup_item/general/equipment/save_character(var/savefile/S)
S["all_underwear"] << pref.all_underwear
@@ -19,6 +20,7 @@
S["backbag"] << pref.backbag
S["pdachoice"] << pref.pdachoice
S["communicator_visibility"] << pref.communicator_visibility
S["ttone"] << pref.ttone // YW EDIT
// Moved from /datum/preferences/proc/copy_to()
/datum/category_item/player_setup_item/general/equipment/copy_to_mob(var/mob/living/carbon/human/character)
@@ -73,6 +75,7 @@
pref.all_underwear_metadata -= underwear_metadata
pref.backbag = sanitize_integer(pref.backbag, 1, backbaglist.len, initial(pref.backbag))
pref.pdachoice = sanitize_integer(pref.pdachoice, 1, pdachoicelist.len, initial(pref.pdachoice))
pref.ttone = sanitize(pref.ttone, 20)//YW Edit
/datum/category_item/player_setup_item/general/equipment/content()
. = list()
@@ -89,6 +92,7 @@
. += "Backpack Type: <a href='?src=\ref[src];change_backpack=1'><b>[backbaglist[pref.backbag]]</b></a><br>"
. += "PDA Type: <a href='?src=\ref[src];change_pda=1'><b>[pdachoicelist[pref.pdachoice]]</b></a><br>"
. += "Communicator Visibility: <a href='?src=\ref[src];toggle_comm_visibility=1'><b>[(pref.communicator_visibility) ? "Yes" : "No"]</b></a><br>"
. += "Ringtone (leave blank for job default): <a href='?src=\ref[src];set_ttone=1'><b>[pref.ttone]</b></a><br>" //YW EDIT
return jointext(.,null)
@@ -146,6 +150,10 @@
if(CanUseTopic(user))
pref.communicator_visibility = !pref.communicator_visibility
return TOPIC_REFRESH
else if(href_list["set_ttone"]) //Start of YW EDIT
if(CanUseTopic(user))
pref.ttone = sanitize(input(user, "Please enter a new ringtone.", "Character Preference") as null|text, 20)
return TOPIC_REFRESH //End of YW EDIT
return ..()
code/modules/client/preference_setup/general/06_flavor.dm
+1 -1
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 clothings.","Flavor Text",html_decode(pref.flavor_texts[href_list["flavor_text"]])) as message, extra = 0) //VOREStation Edit: separating out OOC notes
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, MAX_RECORD_LENGTH, extra = 0) //VOREStation Edit: separating out OOC notes
if(CanUseTopic(user))
pref.flavor_texts[href_list["flavor_text"]] = msg
else
code/modules/client/preference_setup/global/setting_datums.dm
+2 -2
View File
@@ -156,8 +156,8 @@ var/list/_client_preferences_by_type
/datum/client_preference/old_door_sounds
description ="Old Door Sounds"
key = "SOUND_OLDDOORS"
enabled_description = "Old"
disabled_description = "New"
enabled_description = "New" //CHOMP Edit
disabled_description = "Old" //CHOMP Edit
/datum/client_preference/department_door_sounds
description ="Department-Specific Door Sounds"
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+7 -7
View File
@@ -79,7 +79,7 @@
/datum/gear/accessory/holster
display_name = "holster selection (Security, CD, HoP)"
path = /obj/item/clothing/accessory/holster
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/holster/New()
..()
@@ -144,32 +144,32 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, brown"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black"
path = /obj/item/clothing/accessory/storage/black_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown"
path = /obj/item/clothing/accessory/storage/brown_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black"
path = /obj/item/clothing/accessory/storage/black_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white"
path = /obj/item/clothing/accessory/storage/white_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/fannypack
display_name = "fannypack selection"
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+8 -8
View File
@@ -51,15 +51,15 @@
/datum/gear/accessory/holster
display_name = "holster selection (Security, SM, HoP, Exploration)"
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder")
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/brown_vest
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","Explorer","Pathfinder","Shaft 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","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
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","Explorer","Pathfinder","Shaft 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","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
@@ -67,11 +67,11 @@
/datum/gear/accessory/brown_drop_pouches
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","Explorer","Pathfinder","Shaft 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","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
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","Explorer","Pathfinder","Shaft 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","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
@@ -84,7 +84,7 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
/datum/gear/accessory/khcrystal
display_name = "KH Life Crystal"
display_name = "Life Crystal"
path = /obj/item/weapon/storage/box/khcrystal
description = "A small necklace device that will notify an offsite cloning facility should you expire after activating it."
@@ -95,9 +95,9 @@
/datum/gear/accessory/pilotpin
display_name = "pilot qualification pin"
description = "An iron pin denoting the qualification to fly SCG spacecraft."
description = "An iron pin denoting the qualification to fly USG spacecraft."
path = /obj/item/clothing/accessory/solgov/specialty/pilot
allowed_roles = list("Pathfinder", "Pilot", "Field Medic")
allowed_roles = list("Pathfinder", "Pilot", "Field Medic","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/flops
display_name = "drop straps"
code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm
+9
View File
@@ -0,0 +1,9 @@
/datum/gear/accessory/pilot_webbing1
path = /obj/item/clothing/accessory/storage/webbing/pilot1
display_name = "harness and webbing (Sec, Exploration)"
allowed_roles = list("Security Officer","Detective","Head of Security","Warden","Explorer","Pathfinder","Blueshield Guard","Pilot","Security Pilot")
/datum/gear/accessory/pilot_webbing2
path = /obj/item/clothing/accessory/storage/webbing/pilot2
display_name = "harness and webbing, alt. (Sec, Exploration)"
allowed_roles = list("Security Officer","Detective","Head of Security","Warden","Explorer","Pathfinder","Blueshield Guard","Pilot","Security Pilot")
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+2 -2
View File
@@ -46,7 +46,7 @@
/datum/gear/eyes/security
display_name = "Security HUD (Security)"
path = /obj/item/clothing/glasses/hud/security
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/eyes/security/prescriptionsec
display_name = "Security HUD, prescription (Security)"
@@ -118,7 +118,7 @@
/datum/gear/eyes/sun
display_name = "Sunglasses (Security/Command)"
path = /obj/item/clothing/glasses/sunglasses
allowed_roles = list("Security Officer","Head of Security","Warden","Site Manager","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
allowed_roles = list("Security Officer","Head of Security","Warden","Site Manager","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/eyes/sun/shades
display_name = "Sunglasses, fat (Security/Command)"
code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm
+20
View File
@@ -0,0 +1,20 @@
/datum/gear/eyes/arglasses/sec
display_name = "AR-S glasses (Sec, BSG)"
path = /obj/item/clothing/glasses/omnihud/sec
allowed_roles = list("Security Officer","Head of Security","Warden","Detective","Blueshield Guard","Security Pilot")
/datum/gear/eyes/arglasses/eng
display_name = "AR-E glasses (Eng)"
path = /obj/item/clothing/glasses/omnihud/eng
allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician")
/datum/gear/eyes/arglasses/med
display_name = "AR-M glasses (Medical)"
path = /obj/item/clothing/glasses/omnihud/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
/datum/gear/eyes/arglasses/all
display_name = "AR-B glasses (CD, HoP, BSG)"
path = /obj/item/clothing/glasses/omnihud/all
cost = 2
allowed_roles = list("Colony Director","Head of Personnel","Blueshield Guard")
code/modules/client/preference_setup/loadout/loadout_fluffitems.dm
+16
View File
@@ -0,0 +1,16 @@
/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")
*/
//The above is a direct copy of the core info from the _vr file
code/modules/client/preference_setup/loadout/loadout_fluffitems_ch.dm
+90
View File
@@ -0,0 +1,90 @@
/*Chomp uses custom_items.txt on the server because it's faster and easier.
Example of how it works here in the never case we need to know:
/datum/gear/fluff/ckey/medal1
ckeywhitelist = list("ckey(no spaces, lower case)")
character_name = list("Character Name (spaces and capital letters included)")
description = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew."
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Character's Medal"
*/
//////////////////ALPHABETISED BY CKEY
//0
//1
//2
//3
//4
//5
//6
//7
//8
//9
//A
//B
//C
//D
//E
//F
//G
//H
//I
//J
//K
//L
//M
//N
//O
//P
//Q
//R
//S
//T
/datum/gear/fluff/thefurryfeline/medal1
ckeywhitelist = list("thefurryfeline")
character_name = list("Samantha Janice Softfur")
path = /obj/item/clothing/accessory/medal/gold/heroism
display_name = "Samantha Janice Softfur's Medal"
description = "An extremely rare golden medal awarded only by high ranking officials. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but distinguished veteran staff."
//U
//V
//W
//X
//Y
//Z
code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+1000
View File
File diff suppressed because it is too large Load Diff
code/modules/client/preference_setup/loadout/loadout_head.dm
+5 -5
View File
@@ -19,7 +19,7 @@
/datum/gear/head/beret/bsec
display_name = "beret, navy (officer)"
path = /obj/item/clothing/head/beret/sec/navy/officer
allowed_roles = list("Security Officer","Head of Security","Warden")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/beret/bsec_warden
display_name = "beret, navy (warden)"
@@ -34,7 +34,7 @@
/datum/gear/head/beret/csec
display_name = "beret, corporate (officer)"
path = /obj/item/clothing/head/beret/sec/corporate/officer
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/beret/csec_warden
display_name = "beret, corporate (warden)"
@@ -57,7 +57,7 @@
/datum/gear/head/beret/sec
display_name = "beret, red (security)"
path = /obj/item/clothing/head/beret/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap
display_name = "cap, black"
@@ -78,7 +78,7 @@
/datum/gear/head/cap/corp
display_name = "cap, corporate (Security)"
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/green
display_name = "cap, green"
@@ -107,7 +107,7 @@
/datum/gear/head/cap/sec
display_name = "cap, security (Security)"
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/yellow
display_name = "cap, yellow"
code/modules/client/preference_setup/loadout/loadout_head_yw.dm
+4
View File
@@ -0,0 +1,4 @@
/datum/gear/head/beret/blueshield
display_name = "beret, blueshield"
path = /obj/item/clothing/head/beret/blueshield
allowed_roles = list("Blueshield Guard")
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+1 -1
View File
@@ -170,7 +170,7 @@
/datum/gear/shoes/boots/winter/security
display_name = "security winter boots"
path = /obj/item/clothing/shoes/boots/winter/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/shoes/boots/winter/science
display_name = "science winter boots"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+13 -10
View File
@@ -74,6 +74,7 @@
display_name = "leather vest, corporate, brown"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
//YW EDIT BEGINS
/datum/gear/suit/mil
display_name = "military jacket selection"
path = /obj/item/clothing/suit/storage/miljacket
@@ -85,6 +86,7 @@
var/obj/item/clothing/suit/storage/miljacket/miljacket = military_style
mil_jackets[initial(miljacket.name)] = miljacket
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(mil_jackets))
//YW EDIT ENDS
/datum/gear/suit/greyjacket
display_name = "grey jacket"
@@ -263,6 +265,7 @@ datum/gear/suit/duster
/datum/gear/suit/roles/poncho/cloak/security
display_name = "cloak, security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/security
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/suit/roles/poncho/cloak/service
display_name = "cloak, service"
@@ -345,7 +348,7 @@ datum/gear/suit/duster
/datum/gear/suit/wintercoat/security
display_name = "winter coat, security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/suit/wintercoat/medical
display_name = "winter coat, medical"
@@ -473,36 +476,36 @@ datum/gear/suit/duster
/datum/gear/suit/snowsuit
display_name = "snowsuit"
path = /obj/item/clothing/suit/storage/snowsuit
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit
/datum/gear/suit/snowsuit/command
display_name = "snowsuit, command"
path = /obj/item/clothing/suit/storage/snowsuit/command
allowed_roles = list("Site Manager","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary")
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/command
allowed_roles = list("Site Manager","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary","Blueshield Guard") //YW ADDITIONS
/datum/gear/suit/snowsuit/security
display_name = "snowsuit, security"
path = /obj/item/clothing/suit/storage/snowsuit/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective")
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot")
/datum/gear/suit/snowsuit/medical
display_name = "snowsuit, medical"
path = /obj/item/clothing/suit/storage/snowsuit/medical
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Search and Rescue")
/datum/gear/suit/snowsuit/science
display_name = "snowsuit, science"
path = /obj/item/clothing/suit/storage/snowsuit/science
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
/datum/gear/suit/snowsuit/engineering
display_name = "snowsuit, engineering"
path = /obj/item/clothing/suit/storage/snowsuit/engineering
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer")
/datum/gear/suit/snowsuit/cargo
display_name = "snowsuit, supply"
path = /obj/item/clothing/suit/storage/snowsuit/cargo
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
/datum/gear/suit/miscellaneous/cardigan
code/modules/client/preference_setup/loadout/loadout_suit_yw.dm
+25
View File
@@ -0,0 +1,25 @@
/datum/gear/suit/roles/poncho/cloak/blueshield
display_name = "cloak, blueshield"
path = /obj/item/clothing/accessory/poncho/roles/cloak/blueshield
allowed_roles = list("Blueshield Guard")
/datum/gear/suit/victailcoat
display_name = "Victorian tailcoat"
path = /obj/item/clothing/suit/storage/tailcoat
/datum/gear/suit/victdress
display_name = "Victorian ladiescoat, Black"
path = /obj/item/clothing/suit/storage/victcoat
/datum/gear/suit/victdress/red
display_name = "Victorian ladiescoat, Red"
path = /obj/item/clothing/suit/storage/victcoat/red
/datum/gear/suit/roles/medical/ems_jacket
display_name = "first responder jacket"
path = /obj/item/clothing/suit/storage/toggle/fr_jacket
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor")
/datum/gear/suit/roles/medical/ems_jacket/alt
display_name = "first responder jacket, alt."
path = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+5 -5
View File
@@ -158,7 +158,7 @@
/datum/gear/uniform/job_skirt/security
display_name = "skirt, security"
path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_skirt/head_of_security
display_name = "skirt, hos"
@@ -173,7 +173,7 @@
/datum/gear/uniform/job_turtle/security
display_name = "turtleneck, security"
path = /obj/item/clothing/under/rank/security/turtleneck
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_turtle/engineering
display_name = "turtleneck, engineering"
@@ -307,7 +307,7 @@
/datum/gear/uniform/corpsecsuit
display_name = "uniform, corporate (Security)"
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Security Officer","Head of Security","Warden")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/corpwarsuit
display_name = "uniform, corporate (Warden)"
@@ -333,7 +333,7 @@
/datum/gear/uniform/navysecsuit
display_name = "uniform, navy blue (Security)"
path = /obj/item/clothing/under/rank/security/navyblue
allowed_roles = list("Security Officer","Head of Security","Warden")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/navywarsuit
display_name = "uniform, navy blue (Warden)"
@@ -432,7 +432,7 @@
/datum/gear/uniform/pcrc
display_name = "uniform, PCRC (Security)"
path = /obj/item/clothing/under/pcrc
allowed_roles = list("Security Officer","Head of Security","Warden")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/brandsuit/grayson
display_name = "outfit, grayson"
code/modules/client/preference_setup/loadout/loadout_uniform_ch.dm
+98
View File
@@ -0,0 +1,98 @@
/datum/gear/uniform/job_sec/flightsuit
display_name = "security flight suit"
path = /obj/item/clothing/under/sec_flight_suit
allowed_roles = list("Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
// Trekie things
//TOS
/datum/gear/uniform/job_trek/sec/tos
display_name = "TOS uniform, sec"
path = /obj/item/clothing/under/rank/trek/sec
allowed_roles = list("Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
//TNG
/datum/gear/uniform/job_trek/sec/tng
display_name = "TNG uniform, sec"
path = /obj/item/clothing/under/rank/trek/sec/next
allowed_roles = list("Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
//VOY
/datum/gear/uniform/job_trek/sec/voy
display_name = "VOY uniform, sec"
path = /obj/item/clothing/under/rank/trek/sec/voy
allowed_roles = list("Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
//DS9
/datum/gear/uniform/job_trek/sec/ds9
display_name = "DS9 uniform, sec"
path = /obj/item/clothing/under/rank/trek/sec/ds9
allowed_roles = list("Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
//ENT
/datum/gear/uniform/job_trek/sec/ent
display_name = "ENT uniform, sec"
path = /obj/item/clothing/under/rank/trek/sec/ent
allowed_roles = list("Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
//Nullsuits (Zero Suits)
/datum/gear/uniform/job_nullsuit/civ
display_name = "nullsuit, civilian"
path = /obj/item/clothing/under/rank/nullsuit/civ
/datum/gear/uniform/job_nullsuit/cmd
display_name = "nullsuit, cmd"
path = /obj/item/clothing/under/rank/nullsuit/cmd
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
/datum/gear/uniform/job_nullsuit/sec
display_name = "nullsuit, sec"
path = /obj/item/clothing/under/rank/nullsuit/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard")
/datum/gear/uniform/job_nullsuit/sec/hos
display_name = "nullsuit, head of security"
path = /obj/item/clothing/under/rank/nullsuit/sec/hos
allowed_roles = list("Head of Security")
/datum/gear/uniform/job_nullsuit/med
display_name = "nullsuit, med"
path = /obj/item/clothing/under/rank/nullsuit/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic")
/datum/gear/uniform/job_nullsuit/med/cmo
display_name = "nullsuit, chief medical officer"
path = /obj/item/clothing/under/rank/nullsuit/med/cmo
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/job_nullsuit/eng
display_name = "nullsuit, eng"
path = /obj/item/clothing/under/rank/nullsuit/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer")
/datum/gear/uniform/job_nullsuit/eng/ce
display_name = "nullsuit, chief engineer"
path = /obj/item/clothing/under/rank/nullsuit/eng/ce
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/job_nullsuit/sci
display_name = "nullsuit, sci"
path = /obj/item/clothing/under/rank/nullsuit/sci
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Pathfinder", "Explorer")
/datum/gear/uniform/job_nullsuit/sci/rd
display_name = "nullsuit, research director"
path = /obj/item/clothing/under/rank/nullsuit/sci/rd
allowed_roles = list("Research Director")
/datum/gear/uniform/job_nullsuit/cargo
display_name = "nullsuit, cargo"
path = /obj/item/clothing/under/rank/nullsuit/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
//VR Suit
/datum/gear/uniform/vrsuit //Pathname of this particular item in the menu.
display_name = "vr suit" //The name of the suit as shown in the loadout menu
path = /obj/item/clothing/under/vrsuit //Pathname of the suit which is found in custom_clothes_ch.dm
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+36 -24
View File
@@ -18,12 +18,12 @@
/datum/gear/uniform/job_khi/cmd
display_name = "khi uniform, cmd"
path = /obj/item/clothing/under/rank/khi/cmd
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_khi/sec
display_name = "khi uniform, sec"
path = /obj/item/clothing/under/rank/khi/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_khi/med
display_name = "khi uniform, med"
@@ -44,7 +44,7 @@
/datum/gear/suit/job_fed/sec
display_name = "fed uniform, sec"
path = /obj/item/clothing/suit/storage/fluff/fedcoat
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/suit/job_fed/medsci
display_name = "fed uniform, med/sci"
@@ -61,7 +61,7 @@
/datum/gear/uniform/job_trek/cmd/tos
display_name = "TOS uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
@@ -69,15 +69,18 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//TNG
/datum/gear/uniform/job_trek/cmd/tng
display_name = "TNG uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/next
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
@@ -85,15 +88,17 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/next
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/next //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//VOY
/datum/gear/uniform/job_trek/cmd/voy
display_name = "VOY uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/voy
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
@@ -101,9 +106,12 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/voy
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/voy //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//DS9
@@ -113,13 +121,13 @@
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director",
"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic")
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_trek/cmd/ds9
display_name = "DS9 uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ds9
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
@@ -127,16 +135,17 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ds9
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ds9 //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//ENT
/datum/gear/uniform/job_trek/cmd/ent
display_name = "ENT uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ent
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer")
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
@@ -144,9 +153,12 @@
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Pathfinder", "Explorer", "Field Medic")
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ent
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security")
display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ent //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
/*
Swimsuits
*/
code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm
+42
View File
@@ -0,0 +1,42 @@
/datum/gear/uniform/victsuit
description = "A victorian style suit, fancy!"
display_name = "Victorian suit selection"
/datum/gear/uniform/victsuit/New()
..()
var/list/victsuits = list()
for(var/suitvict in (typesof(/obj/item/clothing/under/yw/victsuit) - typesof(/obj/item/clothing/under/yw/victsuit/victdress)))
var/obj/item/clothing/under/yw/victsuit/suitvict_type = suitvict
victsuits[initial(suitvict_type.name)] = suitvict_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(victsuits))
/datum/gear/uniform/victdress
description = "A victorian style dress, fancy!"
display_name = "Victorian dress, Black"
path = /obj/item/clothing/under/yw/victsuit/victdress
/datum/gear/uniform/redvictdress
description = "A victorian style dress, fancy!"
display_name = "Victorian Dress, Red"
path = /obj/item/clothing/under/yw/victsuit/victdress/red
/datum/gear/uniform/pilot1
display_name = "NT Pilot Uniform"
description = "A blue and grey NanoTrasen flight suit. Warm and practical, it feels cozy. Includes harness and webbing."
path = /obj/item/clothing/under/rank/pilot1
cost = 2 //base cost 1 + accessory 1
allowed_roles = list("Pilot","Security Pilot")
/datum/gear/uniform/pilot2
display_name = "NT Pilot Uniform, Alt."
description = "A dark blue NanoTrasen flight suit. Warm and practical, several patches are scattered across it. Includes harness and webbing."
path = /obj/item/clothing/under/rank/pilot2
cost = 2 //base cost 1 + accessory 1
allowed_roles = list("Pilot","Security Pilot")
/datum/gear/uniform/combatpilot
display_name = "Security Pilot Uniform"
description = "A lightweight uniform intended for vehicle and powersuit operators, designed to allow free movement and maximum comfort in hot, cramped cockpits. Comes prefitted with a harness and webbing for gear."
path = /obj/item/clothing/under/rank/khi/sec/pilot
cost = 2 //base cost 1 + accessory 1
allowed_roles = list("Security Pilot")
code/modules/client/preference_setup/loadout/loadout_utility.dm
+1 -1
View File
@@ -31,7 +31,7 @@
path = /obj/item/device/camera
/datum/gear/utility/codex
display_name = "the traveler's guide to vir"
display_name = "the traveler's guide to borealis" //YW Edit
path = /obj/item/weapon/book/codex //VOREStation Edit
cost = 0
code/modules/client/preference_setup/loadout/loadout_utility_ch.dm
+5
View File
@@ -0,0 +1,5 @@
/datum/gear/utility/news_ch
display_name = "starcaster"
path = /obj/item/device/starcaster_news
cost = 0
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+3 -3
View File
@@ -42,9 +42,9 @@
path = /obj/item/weapon/storage/backpack/dufflebag/emt
/datum/gear/utility/dufflebag/sec
display_name = "security Dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/sec
allowed_roles = list("Head of Security","Warden","Detective","Security Officer")
display_name = "security Dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/sec
allowed_roles = list("Head of Security","Warden","Detective","Security Officer","Blueshield Guard","Security Pilot")//YW ADDITIONS
/datum/gear/utility/dufflebag/eng
display_name = "engineering dufflebag"
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+2 -2
View File
@@ -209,7 +209,7 @@
/datum/gear/uniform/dept/undercoat/security
display_name = "security undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
/datum/gear/uniform/dept/undercoat/service
display_name = "service undercoat (Teshari)"
@@ -298,7 +298,7 @@
/datum/gear/suit/dept/cloak/security
display_name = "security cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
/datum/gear/suit/dept/cloak/service
display_name = "service cloak (Teshari)"
code/modules/client/preference_setup/loadout/loadout_xeno_ch.dm
+14
View File
@@ -0,0 +1,14 @@
/datum/gear/suit/hood
display_name = "hooded cloak selection (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/standard
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/hood/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard))
var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm
+219
View File
@@ -0,0 +1,219 @@
/datum/gear/suit/zaddat
sort_category = "Xenowear"
whitelisted = SPECIES_ZADDAT
/datum/gear/suit/zaddat/security
display_name = "Zaddat security shroud"
description = "A zaddat shroud with a layer of armor, for security officers"
sort_category = "Xenowear"
whitelisted = SPECIES_ZADDAT
path = /obj/item/clothing/suit/space/void/zaddat/security
allowed_roles = list("Head of Security","Detective","Warden","Security Officer")
/datum/gear/suit/zaddat/engineer
display_name = "Zaddat engineer shroud"
description = "A zaddat shroud with a extra layer of rad-shielding, for engineers"
path = /obj/item/clothing/suit/space/void/zaddat/engineer
sort_category = "Xenowear"
whitelisted = SPECIES_ZADDAT
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer")
//Added from CHOMP
/datum/gear/suit/hood
display_name = "hooded cloak selection (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/standard
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/hood/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard))
var/obj/item/clothing/suit/storage/seromi/cloak/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/beltcloak
display_name = "belted cloak selection (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/beltcloak/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/beltcloak/standard))
var/obj/item/clothing/suit/storage/seromi/beltcloak/standard/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/uniform/beltcloakcolor/New()
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/cloakcolor
display_name = "belted cloak, recolorable (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/standard/white_grey
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/dept/beltcloak/
whitelisted = SPECIES_TESHARI
sort_category = "Xenowear"
/datum/gear/suit/dept/beltcloak/wrdn
display_name = "warden belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/wrdn
allowed_roles = list("Head of Security","Warden")
/datum/gear/suit/dept/beltcloak/hos
display_name = "Chief of Security belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/hos
allowed_roles = list("Head of Security")
/datum/gear/suit/dept/beltcloak/jani
display_name = "janitor belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/beltcloak/jobs/jani
allowed_roles = list("Janitor")
/datum/gear/suit/dept/cloak/command/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/command,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/command))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/cargo/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cargo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cargo))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/mining/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/mining,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/mining))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/qm/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/qm,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/qm))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/security/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sec,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sec))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/service/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/service,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/service))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/ce/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/ce,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/ce))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/engineer/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/eningeer,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/eningeer))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/atmos/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/atmos,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/atmos))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/research/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/sci,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/sci))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/robo/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/robo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/robo))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/cmo/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/cmo,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cmo))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/medical/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/medical,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/medical))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/chemistry/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/chemistry))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/virology/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/viro,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/viro))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/paramedic/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/para,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/para))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/suit/dept/cloak/iaa/New()
..()
var/list/cloaks = list()
for(var/cloak in typesof(/obj/item/clothing/suit/storage/seromi/cloak/jobs/iaa,/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/iaa))
var/obj/item/clothing/suit/storage/seromi/beltcloak/jobs/cloak_type = cloak
cloaks[initial(cloak_type.name)] = cloak_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks))
/datum/gear/uniform/harness_white
display_name = "white gear harness (Full Body Prosthetic, Diona)"
path = /obj/item/clothing/under/harness_white
sort_category = "Xenowear"
code/modules/client/preference_setup/occupation/occupation.dm
+8 -14
View File
@@ -138,8 +138,12 @@
lastJob = job
. += "<a href='?src=\ref[src];job_info=[rank]'>"
if(jobban_isbanned(user, rank))
. += "<del>[rank]</del></td></a><td><b> \[BANNED]</b></td></tr>"
continue
if(config.usewhitelist && !check_whitelist(user))
. += "<del>[rank]</del></td><td><b> \[WHITELISTED]</b></td></tr>"
continue
else
. += "<del>[rank]</del></td><td><b> \[BANNED]</b></td></tr>"
continue
if(!job.player_old_enough(user.client))
var/available_in_days = job.available_in_days(user.client)
. += "<del>[rank]</del></td></a><td> \[IN [(available_in_days)] DAYS]</td></tr>"
@@ -358,7 +362,7 @@
pref.job_engsec_med |= job.flag
if(3)
pref.job_engsec_low |= job.flag
//VOREStation Add
/*/VOREStation Add //YW COMMENT OUT
if(TALON)
pref.job_talon_low &= ~job.flag
pref.job_talon_med &= ~job.flag
@@ -371,7 +375,7 @@
pref.job_talon_med |= job.flag
if(3)
pref.job_talon_low |= job.flag
//VOREStation Add End
VOREStation Add End*/
return 1
@@ -426,14 +430,4 @@
return job_engsec_med
if(3)
return job_engsec_low
//VOREStation Add
if(TALON)
switch(level)
if(1)
return job_talon_high
if(2)
return job_talon_med
if(3)
return job_talon_low
//VOREStation Add End
return 0