cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 05:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Job rank and radio channel rework (#8965)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-09-17 12:24:13 -07:00
committed by GitHub
parent 6159cecfc8
commit 4153768ba1
444 changed files with 3341 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/antagonism/02_candidacy.dm
+2 -2
View File
@@ -42,14 +42,14 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
pref.be_special = sanitize_integer(pref.be_special, 0, 16777215, initial(pref.be_special)) //VOREStation Edit - 24 bits of support
/datum/category_item/player_setup_item/antagonism/candidacy/content(var/mob/user)
if(jobban_isbanned(user, "Syndicate"))
if(jobban_isbanned(user, JOB_SYNDICATE))
. += "<b>You are banned from antagonist roles.</b>"
pref.be_special = 0
else
var/n = 0
for (var/i in special_roles)
if(special_roles[i]) //if mode is available on the server
if(jobban_isbanned(user, i) || (i == "positronic brain" && jobban_isbanned(user, "AI") && jobban_isbanned(user, "Cyborg")) || (i == "pAI candidate" && jobban_isbanned(user, "pAI")))
if(jobban_isbanned(user, i) || (i == "positronic brain" && jobban_isbanned(user, JOB_AI) && jobban_isbanned(user, JOB_CYBORG)) || (i == "pAI candidate" && jobban_isbanned(user, JOB_PAI)))
. += "<b>Be [i]:</b> <font color=red><b> \[BANNED]</b></font><br>"
else
. += "<b>Be [i]:</b> <a href='?src=\ref[src];be_special=[n]'><b>[pref.be_special&(1<<n) ? "Yes" : "No"]</b></a><br>"
code/modules/client/preference_setup/general/05_background.dm
+3 -3
View File
@@ -135,19 +135,19 @@
else if(href_list["set_medical_records"])
var/new_medical = strip_html_simple(tgui_input_text(user,"Enter medical information here.","Character Preference", html_decode(pref.med_record), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH)
if(new_medical && !jobban_isbanned(user, "Records") && CanUseTopic(user))
if(new_medical && !jobban_isbanned(user, JOB_RECORDS) && CanUseTopic(user))
pref.med_record = new_medical
return TOPIC_REFRESH
else if(href_list["set_general_records"])
var/new_general = strip_html_simple(tgui_input_text(user,"Enter employment information here.","Character Preference", html_decode(pref.gen_record), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH)
if(new_general && !jobban_isbanned(user, "Records") && CanUseTopic(user))
if(new_general && !jobban_isbanned(user, JOB_RECORDS) && CanUseTopic(user))
pref.gen_record = new_general
return TOPIC_REFRESH
else if(href_list["set_security_records"])
var/sec_medical = strip_html_simple(tgui_input_text(user,"Enter security information here.","Character Preference", html_decode(pref.sec_record), MAX_RECORD_LENGTH, TRUE, prevent_enter = TRUE), MAX_RECORD_LENGTH)
if(sec_medical && !jobban_isbanned(user, "Records") && CanUseTopic(user))
if(sec_medical && !jobban_isbanned(user, JOB_RECORDS) && CanUseTopic(user))
pref.sec_record = sec_medical
return TOPIC_REFRESH
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+4 -4
View File
@@ -77,7 +77,7 @@
display_name = "holster selection"
description = "Select from a number of general-purpose handgun holsters, or a baton lanyard."
path = /obj/item/clothing/accessory/holster
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Talon Captain","Talon Guard", "Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,JOB_TALON_CAPTAIN,JOB_TALON_GUARD,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/accessory/holster/New()
..()
@@ -250,7 +250,7 @@
/datum/gear/accessory/stethoscope
display_name = "stethoscope"
path = /obj/item/clothing/accessory/stethoscope
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,JOB_TALON_DOCTOR)
/datum/gear/accessory/locket
display_name = "locket"
@@ -335,12 +335,12 @@
/datum/gear/accessory/badge
display_name = "sheriff badge (Security)"
path = /obj/item/clothing/accessory/badge/holo/sheriff
allowed_roles = list("Security Officer","Detective","Head of Security","Warden")
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN)
/datum/gear/accessory/corpbadge
display_name = "investigator holobadge (IAA)"
path = /obj/item/clothing/accessory/badge/holo/investigator
allowed_roles = list("Internal Affairs Agent")
allowed_roles = list(JOB_INTERNAL_AFFAIRS_AGENT)
/datum/gear/accessory/pressbadge
display_name = "corporate press pass"
code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm
+2 -2
View File
@@ -1,9 +1,9 @@
/datum/gear/accessory/pilot_webbing1
path = /obj/item/clothing/accessory/storage/webbing/pilot1
display_name = "harness and webbing"
allowed_roles = list("Security Officer","Detective","Head of Security","Warden","Explorer","Pathfinder","Blueshield Guard","Pilot","Security Pilot")
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_EXPLORER,JOB_PATHFINDER,JOB_BLUESHIELD_GUARD,JOB_PILOT,JOB_SECURITY_PILOT)
/datum/gear/accessory/pilot_webbing2
path = /obj/item/clothing/accessory/storage/webbing/pilot2
display_name = "harness and webbing, alt."
allowed_roles = list("Security Officer","Detective","Head of Security","Warden","Explorer","Pathfinder","Blueshield Guard","Pilot","Security Pilot")
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_DETECTIVE,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_EXPLORER,JOB_PATHFINDER,JOB_BLUESHIELD_GUARD,JOB_PILOT,JOB_SECURITY_PILOT)
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+6 -6
View File
@@ -71,7 +71,7 @@
display_name = "Security HUD selector"
description = "Select from a range of Security HUD eyepieces that can display the ID status and security records of people in line of sight."
path = /obj/item/clothing/glasses/hud/security
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN, JOB_DETECTIVE, JOB_BLUESHIELD_GUARD, JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/eyes/security/New()
..()
@@ -91,7 +91,7 @@
display_name = "Medical HUD selector"
description = "Select from a range of Medical HUD eyepieces that can display the health status of people in line of sight."
path = /obj/item/clothing/glasses/hud/health
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST)
/datum/gear/eyes/medical/New()
..()
@@ -107,7 +107,7 @@
/datum/gear/eyes/janitor
display_name = "Contaminant HUD"
path = /obj/item/clothing/glasses/hud/janitor
allowed_roles = list("Janitor")
allowed_roles = list(JOB_JANITOR)
/datum/gear/eyes/janitor/prescriptionjan
display_name = "Contaminant HUD, prescription"
@@ -117,7 +117,7 @@
display_name = "Optical Meson Scanners selection"
description = "Select from a range of meson-projection eyewear. Note: not all of these items are atmospherically sealed."
path = /obj/item/clothing/glasses/meson
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director")
allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_SCIENTIST, JOB_RESEARCH_DIRECTOR)
/datum/gear/eyes/meson/New()
..()
@@ -133,7 +133,7 @@
/datum/gear/eyes/material
display_name = "Optical Material Scanners"
path = /obj/item/clothing/glasses/material
allowed_roles = list("Shaft Miner","Quartermaster")
allowed_roles = list(JOB_SHAFT_MINER,JOB_QUARTERMASTER)
/datum/gear/eyes/glasses/fakesun
display_name = "Sunglasses, stylish"
@@ -147,7 +147,7 @@
display_name = "functional sunglasses selector"
description = "Select from a range of polarized sunglasses that can block flashes whilst still looking classy."
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", "Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_QUARTERMASTER,JOB_INTERNAL_AFFAIRS_AGENT,JOB_DETECTIVE,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/eyes/sun/New()
..()
code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm
+6 -6
View File
@@ -1,5 +1,5 @@
/datum/gear/eyes/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist","Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/eyes/arglasses
display_name = "AR glasses"
@@ -19,28 +19,28 @@
/datum/gear/eyes/arglasses/sec
display_name = "AR-Security glasses"
path = /obj/item/clothing/glasses/omnihud/sec
allowed_roles = list("Security Officer","Head of Security","Warden","Detective")
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE)
/datum/gear/eyes/arglasses/sci
display_name = "AR-Research glasses"
path = /obj/item/clothing/glasses/omnihud/rnd
allowed_roles = list("Research Director","Scientist","Xenobiologist","Xenobotanist","Roboticist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ROBOTICIST)
/datum/gear/eyes/arglasses/eng
display_name = "AR-Engineering glasses"
path = /obj/item/clothing/glasses/omnihud/eng
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician")
allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN)
/datum/gear/eyes/arglasses/med
display_name = "AR-Medical glasses"
path = /obj/item/clothing/glasses/omnihud/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/eyes/arglasses/all
display_name = "AR-Command glasses"
path = /obj/item/clothing/glasses/omnihud/all
cost = 2
allowed_roles = list("Site Manager","Head of Personnel")
allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL)
/datum/gear/eyes/spiffygogs
display_name = "slick orange goggles"
code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm
+4 -4
View File
@@ -1,20 +1,20 @@
/datum/gear/eyes/arglasses/sec
display_name = "AR-S Security glasses"
path = /obj/item/clothing/glasses/omnihud/sec
allowed_roles = list("Security Officer","Head of Security","Warden","Detective","Blueshield Guard","Security Pilot")
allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT)
/datum/gear/eyes/arglasses/eng
display_name = "AR-E Engineering glasses"
path = /obj/item/clothing/glasses/omnihud/eng
allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician") // CHOMPedit: Allows AR-E Glasses to actually be used.
allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) // CHOMPedit: Allows AR-E Glasses to actually be used.
/datum/gear/eyes/arglasses/med
display_name = "AR-M Medical glasses"
path = /obj/item/clothing/glasses/omnihud/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, JOB_FIELD_MEDIC)
/datum/gear/eyes/arglasses/all
display_name = "AR-B Command glasses"
path = /obj/item/clothing/glasses/omnihud/all
cost = 2
allowed_roles = list("Site Manager","Head of Personnel","Blueshield Guard")
allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_BLUESHIELD_GUARD)
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+20 -20
View File
@@ -17,7 +17,7 @@
display_name = "Airhorn - Example Item"
description = "An example item that you probably shouldn't see!"
ckeywhitelist = list("your_ckey_here")
allowed_roles = list("Engineer")
allowed_roles = list(JOB_ENGINEER)
*/
/datum/gear/fluff/collar //Use this as a base path for collars if you'd like to set tags in loadout. Make sure you don't use apostrophes in the display name or this breaks!
@@ -387,7 +387,7 @@
slot = slot_wear_suit
ckeywhitelist = list("flaktual")
character_name = list("Yikatihaki")
allowed_roles = list("Explorer")
allowed_roles = list(JOB_EXPLORER)
/datum/gear/fluff/suit/storage/flintlock
path = /obj/item/clothing/suit/storage/flintlock
@@ -474,7 +474,7 @@
// I CKEYS
/datum/gear/fluff/ruda_badge
path = /obj/item/clothing/accessory/badge/holo/detective/ruda
display_name = "Ruda's Detective Badge"
display_name = "Ruda's " + JOB_DETECTIVE + " Badge"
ckeywhitelist = list("interrolouis")
character_name = list("Ruda Lizden")
@@ -516,7 +516,7 @@
slot = slot_back
ckeywhitelist = list("jacknoir413")
character_name = list("Areax Third")
allowed_roles = list("Security Officer, Warden, Head of Security")
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY)
/datum/gear/fluff/earthen_uniform
path = /obj/item/clothing/under/fluff/earthenbreath
@@ -564,7 +564,7 @@
display_name = "Ace's Holster"
ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius")
allowed_roles = list("Site Manager", "Warden", "Head of Security")
allowed_roles = list(JOB_SITE_MANAGER, JOB_WARDEN, JOB_HEAD_OF_SECURITY)
/datum/gear/fluff/jeremiah_boots
path = /obj/item/clothing/shoes/boots/combat
@@ -592,7 +592,7 @@
display_name = "Katarina's Backpack"
ckeywhitelist = list("joanrisu")
character_name = list("Katarina Eine")
allowed_roles = list("Site Manager", "Warden", "Head of Security")
allowed_roles = list(JOB_SITE_MANAGER, JOB_WARDEN, JOB_HEAD_OF_SECURITY)
/datum/gear/fluff/emoticon_box
path = /obj/item/weapon/storage/box/fluff/emoticon
@@ -709,7 +709,7 @@
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") //CHOMP keep explo
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/fluff/brianna_backpack
path = /obj/item/weapon/storage/backpack/messenger/black/fluff/briana
@@ -730,7 +730,7 @@
description = "A Hull Systems Omni-Tool capable of temporarily shrinking to handheld sizes for even the most delicate work."
ckeywhitelist = list("lewzharri")
character_name = list ("Kovgam Zharri")
allowed_roles = list("Roboticist","Engineer","Scientist","Xenobiologist","Xenobotanist","Research Director")
allowed_roles = list(JOB_ROBOTICIST,JOB_ENGINEER,JOB_SCIENTIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_RESEARCH_DIRECTOR)
// M CKEYS
/datum/gear/fluff/phi_box
@@ -758,7 +758,7 @@
slot = slot_wear_suit
ckeywhitelist = list("mrsignmeup")
character_name = list("Reshskakskakss Seekiseekis")
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/fluff/daniel_medal
path = /obj/item/clothing/accessory/medal/conduct
@@ -940,7 +940,7 @@
display_name = "Tiemli's Welding Goggles"
ckeywhitelist = list("radiantaurora")
character_name = list("Tiemli Kroto")
allowed_roles = list("Roboticist")
allowed_roles = list(JOB_ROBOTICIST)
/datum/gear/fluff/clara_flask
path = /obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask
@@ -997,14 +997,14 @@
display_name = "Kateryna's Voidsuit"
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician")
allowed_roles = list(JOB_ENGINEER, JOB_CHIEF_ENGINEER, JOB_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("Engineer", "Chief Engineer", "Atmospheric Technician")
allowed_roles = list(JOB_ENGINEER, JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN)
/datum/gear/fluff/kateryna_armorvest
path = /obj/item/clothing/suit/armor/vest/wolftaur/kate
@@ -1012,7 +1012,7 @@
slot = slot_wear_suit
ckeywhitelist = list("samanthafyre")
character_name = list("Kateryna Petrovitch")
allowed_roles = list("Security Officer", "Warden", "Head of Security", "Site Manager", "Head of Personnel")
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL)
/datum/gear/fluff/viktor_flask
path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor
@@ -1059,21 +1059,21 @@
display_name = "Cerise's Champion's Belt"
ckeywhitelist = list("shalax")
character_name = list("Cerise Duelliste")
allowed_roles = list("Security Officer", "Warden", "Head of Security", "Detective")
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY, JOB_DETECTIVE)
/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("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE)
/datum/gear/fluff/serdykov_modkit //Also converts a Security suit's sprite
path = /obj/item/device/modkit_conversion/fluff/serdykit
display_name = "Serdykov Antoz's Modkit"
ckeywhitelist = list("silencedmp5a5")
character_name = list("Serdykov Antoz")
allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_HEAD_OF_SECURITY,JOB_DETECTIVE)
/datum/gear/fluff/tasy_clownuniform
path = /obj/item/clothing/under/sexyclown
@@ -1196,11 +1196,11 @@
display_name = "Lucky's amour"
ckeywhitelist = list ("thedavestdave")
character_name = list("Lucky")
allowed_roles = list("Chaplain")
allowed_roles = list(JOB_CHAPLAIN)
/datum/gear/fluff/lovec_gasmask
path = /obj/item/clothing/mask/gas/explorer
display_name = "Explorer's Gas Mask"
display_name = JOB_EXPLORER + "'s Gas Mask"
ckeywhitelist = list("thenewmeta")
character_name = list("Lovec")
@@ -1408,7 +1408,7 @@
slot = slot_glasses
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic","Off-duty Medic") //CHOMP keep explo
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,JOB_FIELD_MEDIC, JOB_OFFDUTY_MEDIC) //CHOMP keep explo
/datum/gear/fluff/tempest_hypospray
path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
@@ -1416,7 +1416,7 @@
slot = slot_belt
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic", "Off-duty Medic") //CHOMP keep explo
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,JOB_FIELD_MEDIC , JOB_OFFDUTY_MEDIC) //CHOMP keep explo
/datum/gear/fluff/tempest_backpack
path = /obj/item/weapon/storage/backpack/saddlebag/tempest
code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm
+20 -20
View File
@@ -4,7 +4,7 @@
display_name = "Airhorn - Example Item" //Don't use the same as another item
description = "An example item that you probably shouldn't see!"
ckeywhitelist = list("broman2000")
allowed_roles = list("Station Engineer") //Don't include this if the item is not role restricted
allowed_roles = list(JOB_ENGINEER) //Don't include this if the item is not role restricted
character_name = list("shitfacemcgee") //Character name. this variable is required, or the item doesn't show in loadout. Change to "character_name = null" if not character restricted.
*/
@@ -84,14 +84,14 @@
//Strix Hades
/datum/gear/fluff/strix_coat
path = /obj/item/clothing/suit/storage/teshari/cloak/fluff/strix
display_name = "Colony Director Coat"
description = "It drapes over a Avali's shoulders and closes at the neck with pockets convienently placed inside. It bears the Colony Director's colors. The name 'Strix Hades' is embroilled in gold lettering around a golden embroilled outline on the neck collar."
display_name = JOB_ALT_COLONY_DIRECTOR + " Coat"
description = "It drapes over a Avali's shoulders and closes at the neck with pockets convienently placed inside. It bears the " + JOB_ALT_COLONY_DIRECTOR + "'s colors. The name 'Strix Hades' is embroilled in gold lettering around a golden embroilled outline on the neck collar."
ckeywhitelist = list("blackangelsace")
character_name = list("Strix Hades")
/datum/gear/fluff/strix_under
path = /obj/item/clothing/under/teshari/undercoat/fluff/strix
display_name = "Colony Director Undercoat"
display_name = JOB_ALT_COLONY_DIRECTOR + " Undercoat"
description = "Made of carbon nanofiber, it is light and billowy, perfect for going fast and stylishly!"
ckeywhitelist = list("blackangelsace")
character_name = list("Strix Hades")
@@ -261,7 +261,7 @@
ckeywhitelist = list("dameonowen")
character_name = list("Dameon Owen", "Amber Owen")
*/
//CHOMP Remove end
//CHOMP Remove end
//dawidoe
//Melissa Krutz
@@ -285,7 +285,7 @@
description = "A kit containing all the needed tools and parts to modify a 45 Pistol."
ckeywhitelist = list("dawidoe")
character_name = list("Melissa Krutz")
allowed_roles = list("Security Officer")
allowed_roles = list(JOB_SECURITY_OFFICER)
//Dopiotl
//Jeanne Petite
/datum/gear/fluff/jeans_chocolates
@@ -308,7 +308,7 @@
description = "This seems to be a highly customized Medical RIG suit, coloured black and purple, and with an added extendable plating to include a pair of wings and a tail comfortably within the suits protection. There's a nametag on the chest piece, and on the control module itself, with the name 'Saur Darastrix' on it."
ckeywhitelist = list("dwaggy90")
character_name = list("Saur Darastrix")
allowed_roles = list("Chief Medical Officer", "Paramedic")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER, JOB_PARAMEDIC)
/datum/gear/fluff/saur_pccarrier
path = /obj/item/clothing/suit/armor/pcarrier/navy/fluff/saur_pccarrier
@@ -316,7 +316,7 @@
description = "A mostly black and purple striped armour carrier, geared up and ready to go. It looks well maintained, either its not seen much action yet, or any damage done is meticulously repaired, Several small blood splatters that have dried on the inside of it seem to suggest the latter. this carrier has been modified to have holes in the back for wings to slot through."
ckeywhitelist = list("dwaggy90")
character_name = list("Saur Darastrix")
allowed_roles = list("Blueshield Guard")
allowed_roles = list(JOB_BLUESHIELD_GUARD)
/datum/gear/fluff/saur_dufflebag
path = /obj/item/weapon/storage/backpack/dufflebag/fluff/saur_dufflebag
@@ -363,10 +363,10 @@
/datum/gear/fluff/sheri_rig_kit
path = /obj/item/device/modkit_conversion/fluff/sheri_rig_kit
display_name = "Sheri's modkit"
description = "A kit containing all the needed tools and parts to modify a Research Director rig suit. It has a snake painted on it."
description = "A kit containing all the needed tools and parts to modify a " + JOB_RESEARCH_DIRECTOR + " rig suit. It has a snake painted on it."
ckeywhitelist = list("esperkin")
character_name = list("Sheri Calen")
allowed_roles = list("Research Director")
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
// F CKEYS
@@ -446,7 +446,7 @@
description = "A kit containing all the needed tools and parts to modify a Head of security armored coat. It has a red wolf painted on it."
ckeywhitelist = list("generalpantsu")
character_name = list("Amara Faell")
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/fluff/amara_belt
path = /obj/item/weapon/storage/belt/security/tactical/amara_belt
@@ -454,7 +454,7 @@
description = "A sturdy military belt with a shiny buckle and a bunch of pouches."
ckeywhitelist = list("generalpantsu")
character_name = list("Amara Faell")
allowed_roles = list("Security Officer", "Head of Security", "Blueshield Guard")
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_BLUESHIELD_GUARD)
//Zara Venlee
/datum/gear/fluff/zara_leg_enhancer
@@ -557,7 +557,7 @@
description = "A typical Kentauri uniform worn by those in Command, Tactical and Security disciplines. It is crafted specifically to fit the typically overweight body of the average Kentauri, and its colours match up with those of station security."
ckeywhitelist = list("harpsong")
character_name = list("Harpsong")
allowed_roles = list("Security Officer")
allowed_roles = list(JOB_SECURITY_OFFICER)
// I CKEYS
@@ -576,7 +576,7 @@
description = "A black Dark red security uniform with a tag on it that says Ally_F"
ckeywhitelist = list("izac112")
character_name = list("Ally Faell")
allowed_roles = list("Security Officer", "Warden")
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN)
//Raja Bastet
/datum/gear/fluff/raja_belt
@@ -585,7 +585,7 @@
description = "A black-golden toolbelt with many slots to hold tools in. Also comes with a blue buckle."
ckeywhitelist = list("izac112")
character_name = list("Raja Bastet")
allowed_roles = list("Station Engineer", "Chief Engineer")
allowed_roles = list(JOB_ENGINEER, JOB_CHIEF_ENGINEER)
/datum/gear/fluff/raja_coat
path = /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/raja_coat
@@ -692,7 +692,7 @@
description = "A set of metal frame glasses that seem to be modified to fit easier on a elongated snout. On the glasses is a set of low perspiration lenses with a thin overlay for medical hub to be turned on."
ckeywhitelist = list("lukevale")
character_name = list("Mitsuko Jiao")
allowed_roles = list("Medical Doctor", "Chief Medical Officer")
allowed_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER)
/datum/gear/fluff/jiao_uniform
path = /obj/item/clothing/under/rank/medical/fluff/jiao_uniform
@@ -769,7 +769,7 @@
description = "A Greenish-white uniform for operating in hazardous environments. This one is suited for colder environments."
ckeywhitelist = list("mocatheporg1")
character_name = list("Mocha")
allowed_roles = list("Explorer", "Pathfinder")
allowed_roles = list(JOB_EXPLORER, JOB_PATHFINDER)
/datum/gear/fluff/mocha_suit_kit
path = /obj/item/device/modkit_conversion/fluff/mocha_suit_kit
@@ -777,7 +777,7 @@
description = "A kit containing all the needed tools and parts to modify a Explorer Suit"
ckeywhitelist = list("mocatheporg1")
character_name = list("Mocha")
allowed_roles = list("Explorer", "Pathfinder")
allowed_roles = list(JOB_EXPLORER, JOB_PATHFINDER)
/datum/gear/fluff/mocha_cloak
path = /obj/item/clothing/accessory/poncho/cloak/fluff/mocha
@@ -920,7 +920,7 @@
description = "A cloak denoting the rank of head of security, it's made especially for a vasilissan and smells of perfume."
ckeywhitelist = list("splintergp")
character_name = list("Aroozee Daarvoleast-Clark")
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/fluff/aroozee_valhollide_ring
path = /obj/item/clothing/accessory/collar/fluff/aroozee_valhollide_ring
@@ -991,7 +991,7 @@
description = "A somewhat outdated, lightweight security vest with inbuilt pouches to carry security equipment. It is rather bulky, but nontheless still flexible."
ckeywhitelist = list("vitorhks")
character_name = list("Jessica Mayer")
allowed_roles = list("Security Officer", "Warden")
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_WARDEN)
// W CKEYS
code/modules/client/preference_setup/loadout/loadout_gloves.dm
+1 -1
View File
@@ -54,7 +54,7 @@
/datum/gear/gloves/forensic
display_name = "gloves, forensic"
path = /obj/item/clothing/gloves/forensic
allowed_roles = list("Detective")
allowed_roles = list(JOB_DETECTIVE)
/datum/gear/gloves/fingerless
display_name = "fingerless gloves"
code/modules/client/preference_setup/loadout/loadout_head.dm
+8 -8
View File
@@ -19,22 +19,22 @@
/datum/gear/head/beret/bsec_warden
display_name = "beret, navy (warden)"
path = /obj/item/clothing/head/beret/sec/navy/warden
allowed_roles = list("Head of Security","Warden")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN)
/datum/gear/head/beret/bsec_hos
display_name = "beret, navy (hos)"
path = /obj/item/clothing/head/beret/sec/navy/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/head/beret/csec_warden
display_name = "beret, corporate (warden)"
path = /obj/item/clothing/head/beret/sec/corporate/warden
allowed_roles = list("Head of Security","Warden")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN)
/datum/gear/head/beret/csec_hos
display_name = "beret, corporate (hos)"
path = /obj/item/clothing/head/beret/sec/corporate/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/head/beret/eng
display_name = "beret, engie-orange"
@@ -293,7 +293,7 @@
description = "Select from a range of welding masks (engineering crew/roboticists only)"
path = /obj/item/clothing/head/welding
cost = 2
allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST)
/datum/gear/head/welding/New()
..()
@@ -380,7 +380,7 @@
/datum/gear/head/sec_hat_selector
display_name = "Security - Basic Headwear"
description = "Select from a range of hats available to all Security personnel."
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER)
path = /obj/item/clothing/head/soft/sec/corp
/datum/gear/head/sec_hat_selector/New()
@@ -398,7 +398,7 @@
/datum/gear/head/med_hat_selector
display_name = "Medical - Basic Headwear"
description = "Select from a range of hats available to all Medical personnel."
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC)
path = /obj/item/clothing/head/soft/med
/datum/gear/head/med_hat_selector/New()
@@ -438,7 +438,7 @@
display_name = "pilot helmets selection"
description = "Your choice of four hard-wearing head-protecting helmets for pilots."
path = /obj/item/clothing/head/pilot_vr
allowed_roles = list("Pilot", "Talon Pilot")
allowed_roles = list(JOB_PILOT, JOB_TALON_PILOT)
/datum/gear/head/pilot/New()
..()
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+1 -1
View File
@@ -25,7 +25,7 @@
/datum/gear/head/detective_alt
display_name = "cyberscope headgear, detective"
path = /obj/item/clothing/head/helmet/detective_alt
allowed_roles = list("Head of Security", "Detective")
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE)
/datum/gear/head/bearpelt
display_name = "animal pelt selection"
code/modules/client/preference_setup/loadout/loadout_head_yw.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/datum/gear/head/beret/blueshield
display_name = "beret, blueshield"
path = /obj/item/clothing/head/beret/blueshield
allowed_roles = list("Blueshield Guard")
allowed_roles = list(JOB_BLUESHIELD_GUARD)
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+3 -3
View File
@@ -206,7 +206,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","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_BLUESHIELD_GUARD, JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/shoes/boots/winter/science
display_name = "science winter boots"
@@ -215,7 +215,7 @@
/datum/gear/shoes/boots/winter/command
display_name = "site manager's winter boots"
path = /obj/item/clothing/shoes/boots/winter/command
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
/datum/gear/shoes/boots/winter/engineering
display_name = "engineering winter boots"
@@ -228,7 +228,7 @@
/datum/gear/shoes/boots/winter/medical
display_name = "medical winter boots"
path = /obj/item/clothing/shoes/boots/winter/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/shoes/boots/winter/mining
display_name = "mining winter boots"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+50 -50
View File
@@ -147,7 +147,7 @@
/datum/gear/suit/labcoat_cmo
display_name = "labcoat selection, cmo"
path = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
show_roles = FALSE
/datum/gear/suit/labcoat_cmo/New()
@@ -162,12 +162,12 @@
/datum/gear/suit/labcoat_emt
display_name = "labcoat, EMT"
path = /obj/item/clothing/suit/storage/toggle/labcoat/emt
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST)
/datum/gear/suit/labcoat_rd
display_name = "labcoat, research director"
path = /obj/item/clothing/suit/storage/toggle/labcoat/rd
allowed_roles = list("Research Director")
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
show_roles = FALSE
/datum/gear/suit/miscellaneous/labcoat
@@ -177,7 +177,7 @@
/datum/gear/suit/roles/surgical_apron
display_name = "surgical apron"
path = /obj/item/clothing/suit/surgicalapron
allowed_roles = list("Medical Doctor","Chief Medical Officer")
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER)
/datum/gear/suit/overalls
display_name = "overalls"
@@ -259,49 +259,49 @@
/datum/gear/suit/roles/cloak_hos
display_name = "cloak, head of security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
show_roles = FALSE
cost = 1
/datum/gear/suit/roles/cloak_cmo
display_name = "cloak, chief medical officer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
show_roles = FALSE
cost = 1
/datum/gear/suit/roles/cloak_ce
display_name = "cloak, chief engineer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/ce
allowed_roles = list("Chief Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER)
show_roles = FALSE
cost = 1
/datum/gear/suit/roles/cloak_rd
display_name = "cloak, research director"
path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
allowed_roles = list("Research Director")
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
show_roles = FALSE
cost = 1
/datum/gear/suit/roles/cloak_qm
display_name = "cloak, quartermaster"
path = /obj/item/clothing/accessory/poncho/roles/cloak/qm
allowed_roles = list("Quartermaster")
allowed_roles = list(JOB_QUARTERMASTER)
show_roles = FALSE
cost = 1
/datum/gear/suit/roles/cloak_captain
display_name = "cloak, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/captain
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
show_roles = FALSE
cost = 1
/datum/gear/suit/roles/cloak_hop
display_name = "cloak, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/hop
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
cost = 1
@@ -368,7 +368,7 @@
/datum/gear/suit/forensics
display_name = "forensics uniform selection"
path = /obj/item/clothing/suit/storage/forensics/red/long
allowed_roles = list("Detective")
allowed_roles = list(JOB_DETECTIVE)
/datum/gear/suit/forensics/New()
..()
@@ -383,13 +383,13 @@
/datum/gear/suit/qm_coat
display_name = "coat, quartermaster"
path = /obj/item/clothing/suit/storage/qm
allowed_roles = list("Quartermaster")
allowed_roles = list(JOB_QUARTERMASTER)
show_roles = FALSE
/datum/gear/suit/cargo_coat
display_name = "coat, cargo tech"
path = /obj/item/clothing/suit/storage/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN,JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
// winter coats go here
@@ -400,139 +400,139 @@
/datum/gear/suit/wintercoat/captain
display_name = "winter coat, site manager"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
show_roles = FALSE
/datum/gear/suit/wintercoat/hop
display_name = "winter coat, head of personnel"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/hop
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
/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","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_BLUESHIELD_GUARD, JOB_SECURITY_PILOT) //YW ADDITIONS
show_roles = FALSE
/datum/gear/suit/wintercoat/security/hos
display_name = "winter coat, head of security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/security/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
show_roles = FALSE
/datum/gear/suit/wintercoat/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, JOB_FIELD_MEDIC) //CHOMP keep explo
show_roles = FALSE
/datum/gear/suit/wintercoat/medical/alt
display_name = "winter coat, medical alt"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist","Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, JOB_FIELD_MEDIC) //CHOMP keep explo
show_roles = FALSE
/datum/gear/suit/wintercoat/medical/viro
display_name = "winter coat, virologist"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro
allowed_roles = list("Medical Doctor","Chief Medical Officer")
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER)
show_roles = FALSE
/datum/gear/suit/wintercoat/medical/para
display_name = "winter coat, paramedic"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/para
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC)
show_roles = FALSE
/datum/gear/suit/wintercoat/medical/chemist
display_name = "winter coat, chemist"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist
allowed_roles = list("Chief Medical Officer","Chemist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST)
show_roles = FALSE
/datum/gear/suit/wintercoat/medical/cmo
display_name = "winter coat, chief medical officer"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
show_roles = FALSE
/datum/gear/suit/wintercoat/medical/sar
display_name = "winter coat, search and rescue"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar
allowed_roles = list("Chief Medical Officer", "Paramedic", "Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_FIELD_MEDIC) //CHOMP keep explo
show_roles = FALSE
/datum/gear/suit/wintercoat/science
display_name = "winter coat, science"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST)
show_roles = FALSE
/datum/gear/suit/wintercoat/science/robotics
display_name = "winter coat, robotics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
allowed_roles = list("Research Director", "Roboticist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR, JOB_ROBOTICIST)
show_roles = FALSE
/datum/gear/suit/wintercoat/science/rd
display_name = "winter coat, research director"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd
allowed_roles = list("Research Director")
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
show_roles = FALSE
/datum/gear/suit/wintercoat/engineering
display_name = "winter coat, engineering"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER)
show_roles = FALSE
/datum/gear/suit/wintercoat/engineering/atmos
display_name = "winter coat, atmospherics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
allowed_roles = list("Chief Engineer", "Atmospheric Technician")
allowed_roles = list(JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN)
show_roles = FALSE
/datum/gear/suit/wintercoat/engineering/ce
display_name = "winter coat, chief engineer"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce
allowed_roles = list("Chief Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER)
show_roles = FALSE
/datum/gear/suit/wintercoat/hydro
display_name = "winter coat, hydroponics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
allowed_roles = list("Botanist", "Xenobotanist")
allowed_roles = list(JOB_BOTANIST, JOB_XENOBOTANIST)
show_roles = FALSE
/datum/gear/suit/wintercoat/cargo
display_name = "winter coat, cargo"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
allowed_roles = list("Quartermaster","Cargo Technician")
allowed_roles = list(JOB_QUARTERMASTER,JOB_CARGO_TECHNICIAN)
show_roles = FALSE
/datum/gear/suit/wintercoat/miner
display_name = "winter coat, mining"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
allowed_roles = list("Shaft Miner")
allowed_roles = list(JOB_SHAFT_MINER)
show_roles = FALSE
/datum/gear/suit/wintercoat/cargo/qm
display_name = "winter coat, quartermaster"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm
allowed_roles = list("Quartermaster")
allowed_roles = list(JOB_QUARTERMASTER)
show_roles = FALSE
/datum/gear/suit/wintercoat/bar
display_name = "winter coat, bartender"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/bar
allowed_roles = list("Bartender")
allowed_roles = list(JOB_BARTENDER)
show_roles = FALSE
/datum/gear/suit/wintercoat/janitor
display_name = "winter coat, janitor"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/janitor
allowed_roles = list("Janitor")
allowed_roles = list(JOB_JANITOR)
show_roles = FALSE
/datum/gear/suit/wintercoat/aformal
@@ -658,38 +658,38 @@
/datum/gear/suit/snowsuit/command
display_name = "snowsuit, command"
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
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/command // CHOMPEdit
allowed_roles = list(JOB_SITE_MANAGER,JOB_RESEARCH_DIRECTOR,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,JOB_CHIEF_ENGINEER,JOB_COMMAND_SECRETARY,JOB_BLUESHIELD_GUARD) //YW ADDITIONS
show_roles = FALSE
/datum/gear/suit/snowsuit/security
display_name = "snowsuit, security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/security // CHOMPEdit
allowed_roles = list(JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_BLUESHIELD_GUARD, JOB_SECURITY_PILOT) //YW ADDITIONS
show_roles = FALSE
/datum/gear/suit/snowsuit/medical
display_name = "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")
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/medical // CHOMPEdit
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, JOB_SEARCH_AND_RESCUE) // CHOMPEdit
show_roles = FALSE
/datum/gear/suit/snowsuit/science
display_name = "snowsuit, science"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/science
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/science // CHOMPEdit
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST)
show_roles = FALSE
/datum/gear/suit/snowsuit/engineering
display_name = "snowsuit, engineering"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/engineering // CHOMPEdit
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER)
show_roles = FALSE
/datum/gear/suit/snowsuit/cargo
display_name = "snowsuit, supply"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/cargo // CHOMPEdit
allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN,JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
/datum/gear/suit/miscellaneous/cardigan
@@ -703,7 +703,7 @@
/datum/gear/suit/cmddressjacket
display_name = "command dress jacket"
path = /obj/item/clothing/suit/storage/toggle/cmddressjacket
allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
allowed_roles = list(JOB_SITE_MANAGER, JOB_HEAD_OF_PERSONNEL, JOB_COMMAND_SECRETARY)
show_roles = FALSE
/datum/gear/suit/miscellaneous/kimono
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+10 -10
View File
@@ -1,5 +1,5 @@
/datum/gear/suit/snowsuit/medical
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/suit/labcoat_colorable
display_name = "labcoat, colorable"
@@ -16,7 +16,7 @@
/datum/gear/suit/labcoat_cmo_old
display_name = "labcoat, CMO, oldschool"
path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
/datum/gear/suit/roles/labcoat_old
display_name = "labcoat selection, department, oldschool"
@@ -57,7 +57,7 @@
/datum/gear/suit/detective_alt
display_name = "sleek modern coat selection"
path = /obj/item/clothing/suit/storage/det_trench/alt
allowed_roles = list("Head of Security", "Detective")
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_DETECTIVE)
/datum/gear/suit/detective_alt/New()
..()
@@ -73,7 +73,7 @@
/datum/gear/suit/paramedic_coat
display_name = "paramedic outerwear selection"
path = /obj/item/clothing/suit/storage/toggle/fr_jacket
allowed_roles = list("Chief Medical Officer","Paramedic","Medical Doctor","Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_MEDICAL_DOCTOR,JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/suit/paramedic_coat/New()
..()
@@ -112,12 +112,12 @@ Talon winter coat
/datum/gear/suit/armor/combat/crusader_explo
display_name = "knight, explo"
path = /obj/item/clothing/suit/armor/combat/crusader_explo
allowed_roles = list("Explorer","Field Medic","Pathfinder") //CHOMP keep explo
allowed_roles = list(JOB_EXPLORER,JOB_FIELD_MEDIC,JOB_PATHFINDER) //CHOMP keep explo
/datum/gear/suit/armor/combat/crusader_explo/FM
display_name = "knight, Field Medic"
path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM
allowed_roles = list ("Paramedic")
allowed_roles = list (JOB_PARAMEDIC)
//Long fur coat
/datum/gear/suit/russofurcoat
@@ -231,13 +231,13 @@ Talon winter coat
/datum/gear/suit/roles/capboatcloak
display_name = "boat cloak, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/cap
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
show_roles = FALSE
/datum/gear/suit/roles/hopboatcloak
display_name = "boat cloak, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/boat/hop
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
/datum/gear/suit/roles/boatcloaks
@@ -269,13 +269,13 @@ Talon winter coat
/datum/gear/suit/roles/capshroud
display_name = "shroud, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/cap
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
show_roles = FALSE
/datum/gear/suit/roles/hopshroud
display_name = "shroud, head of personnel"
path = /obj/item/clothing/accessory/poncho/roles/cloak/shroud/hop
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
/datum/gear/suit/roles/shrouds
code/modules/client/preference_setup/loadout/loadout_suit_yw.dm
+2 -2
View File
@@ -1,7 +1,7 @@
/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")
allowed_roles = list(JOB_BLUESHIELD_GUARD)
show_roles = FALSE
/datum/gear/suit/victailcoat
@@ -19,7 +19,7 @@
/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")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_MEDICAL_DOCTOR)
/datum/gear/suit/roles/medical/ems_jacket/alt
display_name = "first responder jacket, alt."
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+43 -43
View File
@@ -21,9 +21,9 @@
//Command/Specific
/datum/gear/uniform/site_manager_selector
display_name = "Command - Site Manager's Uniforms"
description = "Select from a range of outfits available to all Site Managers, and Talon Captains."
allowed_roles = list("Site Manager","Talon Captain")
display_name = "Command - " + JOB_SITE_MANAGER + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_SITE_MANAGER + "s, and Talon Captains."
allowed_roles = list(JOB_SITE_MANAGER,JOB_TALON_CAPTAIN)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_captain
sort_category = "Uniforms"
@@ -51,9 +51,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/head_of_personnel_selector
display_name = "Command - Head of Personnel's Uniforms"
display_name = "Command - " + JOB_HEAD_OF_PERSONNEL + "'s Uniforms"
description = "Select from a range of outfits available to all Heads of Personnel."
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_hop
sort_category = "Uniforms"
@@ -83,9 +83,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/pilot_uniform_selector
display_name = "Civilian - Pilot's Uniforms"
description = "Select from a range of outfits available to all Pilots (including those on the Talon)."
allowed_roles = list("Pilot","Talon Pilot")
display_name = "Civilian - " + JOB_PILOT+ "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_PILOT + "s (including those on the Talon)."
allowed_roles = list(JOB_PILOT,JOB_TALON_PILOT)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_pilot
sort_category = "Uniforms"
@@ -104,9 +104,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/janitor_uniform_selector
display_name = "Civilian - Janitor's Uniforms"
description = "Select from a range of outfits available to all Janitorial personnel."
allowed_roles = list("Janitor")
display_name = "Civilian - " + JOB_JANITOR + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_JANITOR + "ial personnel."
allowed_roles = list(JOB_JANITOR)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_janitor
sort_category = "Uniforms"
@@ -190,7 +190,7 @@
/datum/gear/uniform/security_selector
display_name = "Security - Basic Uniforms"
description = "Select from a range of outfits available to all Security personnel."
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Talon Guard")
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER,JOB_TALON_GUARD)
show_roles = FALSE
path = /obj/item/clothing/under/rank/security/corp
sort_category = "Uniforms"
@@ -234,9 +234,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/security_warden_selector
display_name = "Security - Warden's Uniforms"
display_name = "Security - "+ JOB_WARDEN + "'s Uniforms"
description = "Select from a range of outfits available to Wardens."
allowed_roles = list("Head of Security","Warden")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN)
show_roles = FALSE
path = /obj/item/clothing/under/rank/warden/corp
sort_category = "Uniforms"
@@ -256,9 +256,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/security_detective_selector
display_name = "Security - Detective's Uniforms"
display_name = "Security - " + JOB_DETECTIVE + "'s Uniforms"
description = "Select from a range of outfits available to all Detectives."
allowed_roles = list("Head of Security","Detective")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE)
show_roles = FALSE
path = /obj/item/clothing/under/det/corporate
sort_category = "Uniforms"
@@ -275,7 +275,7 @@
/datum/gear/uniform/security_head_selector
display_name = "Security - Head's Uniforms"
description = "Select from a range of outfits available to all Heads of Security."
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
show_roles = FALSE
path = /obj/item/clothing/under/rank/head_of_security/corp
sort_category = "Uniforms"
@@ -313,9 +313,9 @@
//Cargo
/datum/gear/uniform/quartermaster_selector
display_name = "Cargo - Quartermaster's Uniforms"
description = "Select from a range of outfits available to all Quartermasters."
allowed_roles = list("Quartermaster")
display_name = "Cargo - " + JOB_QUARTERMASTER + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_QUARTERMASTER + "s."
allowed_roles = list(JOB_QUARTERMASTER)
show_roles = FALSE
path = /obj/item/clothing/under/rank/cargo/jeans
sort_category = "Uniforms"
@@ -347,7 +347,7 @@
/datum/gear/uniform/cargo_general_selector
display_name = "Cargo - Basic Uniforms"
description = "Select from a range of outfits available to all Cargo personnel."
allowed_roles = list("Cargo Technician","Shaft Miner","Quartermaster")
allowed_roles = list(JOB_CARGO_TECHNICIAN,JOB_SHAFT_MINER,JOB_QUARTERMASTER)
show_roles = FALSE
path = /obj/item/clothing/under/rank/cargotech/jeans
sort_category = "Uniforms"
@@ -376,7 +376,7 @@
/datum/gear/uniform/cargo_miner_selector
display_name = "Cargo - Miner's Uniforms"
description = "Select from a range of outfits available to all Mining personnel."
allowed_roles = list("Shaft Miner","Quartermaster","Talon Miner")
allowed_roles = list(JOB_SHAFT_MINER,JOB_QUARTERMASTER,JOB_TALON_MINER)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_miner
sort_category = "Uniforms"
@@ -393,9 +393,9 @@
//Engineering
/datum/gear/uniform/engineering_chief_selector
display_name = "Engineering - Chief Engineer's Uniforms"
description = "Select from a range of outfits available to all Chief Engineers."
allowed_roles = list("Chief Engineer")
display_name = "Engineering - " + JOB_CHIEF_ENGINEER + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_CHIEF_ENGINEER + "s."
allowed_roles = list(JOB_CHIEF_ENGINEER)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_chiefengi
sort_category = "Uniforms"
@@ -420,7 +420,7 @@
/datum/gear/uniform/engineer_selector
display_name = "Engineering - Basic Uniforms"
description = "Select from a range of outfits available to all Engineering personnel."
allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Talon Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_TALON_ENGINEER)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_engi
sort_category = "Uniforms"
@@ -448,7 +448,7 @@
/datum/gear/uniform/engi_atmos_selector
display_name = "Engineering - Atmos Tech's Uniforms"
description = "Select from a range of outfits available to all Atmospherics Technicians."
allowed_roles = list("Chief Engineer","Atmospheric Technician")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN)
show_roles = FALSE
path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
sort_category = "Uniforms"
@@ -468,7 +468,7 @@
/datum/gear/uniform/medical_selector
display_name = "Medical - Basic Uniforms"
description = "Select from a range of outfits available to all Medical personnel."
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Talon Doctor")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PSYCHIATRIST,JOB_PARAMEDIC,JOB_TALON_DOCTOR)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_med
sort_category = "Uniforms"
@@ -499,9 +499,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/chemist_selector
display_name = "Medical - Chemist's Uniforms"
display_name = "Medical - " + JOB_CHEMIST + "'s Uniforms"
description = "Select from a range of outfits available to all Chemists."
allowed_roles = list("Chief Medical Officer","Chemist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_chem
sort_category = "Uniforms"
@@ -519,9 +519,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/paramedic_selector
display_name = "Medical - Paramedic's Uniforms"
description = "Select from a range of outfits available to all Paramedics."
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic","Talon Doctor")
display_name = "Medical - " + JOB_PARAMEDIC + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_PARAMEDIC + "s."
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_TALON_DOCTOR)
show_roles = FALSE
path = /obj/item/clothing/under/rank/paramedunidark
sort_category = "Uniforms"
@@ -542,9 +542,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/chief_medical_selector
display_name = "Medical - Chief Medical Officer's Uniforms"
description = "Select from a range of outfits available to all Chief Medical Officers."
allowed_roles = list("Chief Medical Officer")
display_name = "Medical - " + JOB_CHIEF_MEDICAL_OFFICER + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_CHIEF_MEDICAL_OFFICER + "."
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_cmo
sort_category = "Uniforms"
@@ -571,9 +571,9 @@
//Science
/datum/gear/uniform/research_director_selector
display_name = "Science - Research Director's Uniforms"
description = "Select from a range of outfits available to all Research Directors."
allowed_roles = list("Research Director")
display_name = "Science - " + JOB_RESEARCH_DIRECTOR + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_RESEARCH_DIRECTOR + "s."
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_rd_suit
sort_category = "Uniforms"
@@ -599,7 +599,7 @@
/datum/gear/uniform/science_dept_selector
display_name = "Science - Basic Uniforms"
description = "Select from a range of outfits available to all Science personnel."
allowed_roles = list("Scientist","Research Director","Roboticist","Xenobiologist","Xenobotanist")
allowed_roles = list(JOB_SCIENTIST,JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_science
sort_category = "Uniforms"
@@ -622,9 +622,9 @@
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/uniform/science_robotics_selector
display_name = "Science - Roboticist's Uniforms"
description = "Select from a range of outfits available to all Roboticists."
allowed_roles = list("Research Director","Roboticist")
display_name = "Science - " + JOB_ROBOTICIST + "'s Uniforms"
description = "Select from a range of outfits available to all " + JOB_ROBOTICIST + "s."
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST)
show_roles = FALSE
path = /obj/item/clothing/under/rank/neo_robo
sort_category = "Uniforms"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+3 -3
View File
@@ -152,14 +152,14 @@
path = /obj/item/clothing/under/scratch/skirt
/datum/gear/uniform/suit/detectiveskirt
display_name = "suit, detective skirt (Detective)"
display_name = "suit, detective skirt (" + JOB_DETECTIVE + ")"
path = /obj/item/clothing/under/det/skirt
allowed_roles = list("Detective")
allowed_roles = list(JOB_DETECTIVE)
/datum/gear/uniform/suit/iaskirt
display_name = "suit, Internal Affairs skirt (Internal Affairs)"
path = /obj/item/clothing/under/rank/internalaffairs/skirt
allowed_roles = list("Internal Affairs Agent")
allowed_roles = list(JOB_INTERNAL_AFFAIRS_AGENT)
/datum/gear/uniform/suit/bartenderskirt
display_name = "suit, bartender skirt"
code/modules/client/preference_setup/loadout/loadout_uniform_ch.dm
+17 -17
View File
@@ -1,7 +1,7 @@
/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")
allowed_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_BLUESHIELD_GUARD)
// Trekie things
@@ -9,31 +9,31 @@
/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")
allowed_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_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")
allowed_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_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")
allowed_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_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")
allowed_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_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")
allowed_roles = list(JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_BLUESHIELD_GUARD)
//Nullsuits (Zero Suits)
@@ -44,52 +44,52 @@
/datum/gear/uniform/job_nullsuit/cmd
display_name = "nullsuit, cmd"
path = /obj/item/clothing/under/rank/nullsuit/cmd
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_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")
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER,JOB_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")
allowed_roles = list(JOB_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")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_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")
allowed_roles = list(JOB_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")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_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")
allowed_roles = list(JOB_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")
allowed_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_PATHFINDER, JOB_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")
allowed_roles = list(JOB_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")
allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN,JOB_HEAD_OF_PERSONNEL)
//VR Suit
@@ -112,4 +112,4 @@
/datum/gear/uniform/tacticool
display_name = "Tacticool turtleneck"
path = /obj/item/clothing/under/syndicate/tacticool/loadout
path = /obj/item/clothing/under/syndicate/tacticool/loadout
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+8 -8
View File
@@ -15,27 +15,27 @@
/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","Blueshield Guard","Security Pilot") //YW ADDITIONS
allowed_roles = list(JOB_HEAD_OF_SECURITY, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_BLUESHIELD_GUARD, JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/suit/job_fed/medsci
display_name = "fed uniform, med/sci"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedblue
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist","Xenobotanist", "Field Medic") //CHOMP keep explo
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST,JOB_XENOBOTANIST, JOB_FIELD_MEDIC) //CHOMP keep explo
/datum/gear/suit/job_fed/eng
display_name = "fed uniform, eng"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER)
//DS9
/datum/gear/suit/job_trek/ds9_coat
display_name = "DS9 Overcoat (use uniform)"
path = /obj/item/clothing/suit/storage/trek/ds9
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",
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS //CHOMP keep explo
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_CHIEF_ENGINEER,JOB_RESEARCH_DIRECTOR,
JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,
JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST,JOB_ATMOSPHERIC_TECHNICIAN,
JOB_ENGINEER,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,
JOB_PATHFINDER,JOB_EXPLORER,JOB_FIELD_MEDIC,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT) //YW ADDITIONS //CHOMP keep explo
/*
Swimsuits
code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm
+4 -4
View File
@@ -25,18 +25,18 @@
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")
allowed_roles = list(JOB_PILOT,JOB_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")
allowed_roles = list(JOB_PILOT,JOB_SECURITY_PILOT)
/datum/gear/uniform/combatpilot
display_name = "Security Pilot Uniform"
display_name = JOB_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("Pilot","Security Pilot") //CHOMPEDIT: Adding this to pilots as well
allowed_roles = list(JOB_PILOT,JOB_SECURITY_PILOT) //CHOMPEDIT: Adding this to pilots as well
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+5 -5
View File
@@ -35,7 +35,7 @@
/datum/gear/utility/dufflebag/med
display_name = "medical dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/med
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist","Psychiatrist","Field Medic") //CHOMP explo keep
allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST,JOB_FIELD_MEDIC) //CHOMP explo keep
/datum/gear/utility/dufflebag/med/emt
display_name = "EMT dufflebag"
@@ -44,22 +44,22 @@
/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","Blueshield Guard","Security Pilot")//YW ADDITIONS
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_SECURITY_OFFICER,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/utility/dufflebag/eng
display_name = "engineering dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN,JOB_ENGINEER)
/datum/gear/utility/dufflebag/sci
display_name = "science dufflebag"
path = /obj/item/weapon/storage/backpack/dufflebag/sci
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist","Xenobotanist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST,JOB_XENOBOTANIST)
/datum/gear/utility/dufflebag/explorer
display_name = "explorer dufflebag" //CHOMP explo keep
path = /obj/item/weapon/storage/backpack/dufflebag/explorer
allowed_roles = list("Pathfinder","Explorer") //CHOMP explo keep
allowed_roles = list(JOB_PATHFINDER,JOB_EXPLORER) //CHOMP explo keep
/datum/gear/utility/dufflebag/talon
display_name = "Talon dufflebag"
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+45 -45
View File
@@ -169,107 +169,107 @@
/datum/gear/uniform/dept/undercoat/cap
display_name = "site manager undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/cap
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
/datum/gear/uniform/dept/undercoat/hop
display_name = "head of personnel undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/hop
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
/datum/gear/uniform/dept/undercoat/rd
display_name = "research director undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/rd
allowed_roles = list("Research Director")
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
/datum/gear/uniform/dept/undercoat/hos
display_name = "head of security undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/uniform/dept/undercoat/ce
display_name = "chief engineer undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/ce
allowed_roles = list("Chief Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER)
/datum/gear/uniform/dept/undercoat/cmo
display_name = "chief medical officer undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/cmo
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
/datum/gear/uniform/dept/undercoat/qm
display_name = "quartermaster undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/qm
allowed_roles = list("Quartermaster")
allowed_roles = list(JOB_QUARTERMASTER)
/datum/gear/uniform/dept/undercoat/cargo
display_name = "cargo undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/cargo
allowed_roles = list("Cargo Technician","Quartermaster","Shaft Miner")
allowed_roles = list(JOB_CARGO_TECHNICIAN,JOB_QUARTERMASTER,JOB_SHAFT_MINER)
/datum/gear/uniform/dept/undercoat/mining
display_name = "mining undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/mining
allowed_roles = list("Quartermaster","Shaft Miner")
allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER)
/datum/gear/uniform/dept/undercoat/security
display_name = "security undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,JOB_WARDEN,JOB_SECURITY_OFFICER,JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/uniform/dept/undercoat/service
display_name = "service undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/service
allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL,JOB_BARTENDER,JOB_BOTANIST,JOB_JANITOR,JOB_CHEF,JOB_LIBRARIAN,JOB_CHAPLAIN)
/datum/gear/uniform/dept/undercoat/engineer
display_name = "engineering undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer
allowed_roles = list("Chief Engineer","Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER)
/datum/gear/uniform/dept/undercoat/atmos
display_name = "atmospherics undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/atmos
allowed_roles = list("Chief Engineer","Atmospheric Technician")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN)
/datum/gear/uniform/dept/undercoat/research
display_name = "scientist undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/sci
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST)
/datum/gear/uniform/dept/undercoat/robo
display_name = "roboticist undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/robo
allowed_roles = list("Research Director","Roboticist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST)
/datum/gear/uniform/dept/undercoat/medical
display_name = "medical undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/medical
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST,JOB_PSYCHIATRIST)
/datum/gear/uniform/dept/undercoat/chemistry
display_name = "chemist undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/chemistry
allowed_roles = list("Chief Medical Officer","Chemist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST)
/datum/gear/uniform/dept/undercoat/virology
display_name = "virologist undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/viro
allowed_roles = list("Chief Medical Officer","Medical Doctor")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR)
/datum/gear/uniform/dept/undercoat/psych
display_name = "psychiatrist undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/psych
allowed_roles = list("Chief Medical Officer","Psychiatrist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PSYCHIATRIST)
/datum/gear/uniform/dept/undercoat/paramedic
display_name = "paramedic undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/para
allowed_roles = list("Chief Medical Officer","Paramedic")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC)
/datum/gear/uniform/dept/undercoat/iaa
display_name = "internal affairs undercoat (Teshari)"
path = /obj/item/clothing/under/teshari/undercoat/jobs/iaa
allowed_roles = list("Internal Affairs Agent")
allowed_roles = list(JOB_INTERNAL_AFFAIRS_AGENT)
/datum/gear/suit/dept/cloak
whitelisted = SPECIES_TESHARI
@@ -278,22 +278,22 @@
/datum/gear/suit/dept/cloak/cap
display_name = "site manager cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
/datum/gear/suit/dept/cloak/hop
display_name = "head of personnel cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hop
allowed_roles = list("Head of Personnel")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL)
/datum/gear/suit/dept/cloak/rd
display_name = "research director cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/rd
allowed_roles = list("Research Director")
allowed_roles = list(JOB_RESEARCH_DIRECTOR)
/datum/gear/suit/dept/cloak/hos
display_name = "head of security cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/suit/dept/cloak/hos/New()
..()
@@ -306,7 +306,7 @@
/datum/gear/suit/cloak/dept/ce
display_name = "chief engineer cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/ce
allowed_roles = list("Chief Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER)
/datum/gear/suit/dept/cloak/ce/New()
..()
@@ -319,7 +319,7 @@
/datum/gear/suit/dept/cloak/cmo
display_name = "chief medical officer cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
/datum/gear/suit/dept/cloak/cmo/New()
..()
@@ -332,7 +332,7 @@
/datum/gear/suit/dept/cloak/qm
display_name = "quartermaster cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/qm
allowed_roles = list("Chief Medical Officer")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER)
/datum/gear/suit/dept/cloak/qm/New()
..()
@@ -345,7 +345,7 @@
/datum/gear/suit/dept/cloak/cargo
display_name = "cargo cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician")
allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER,JOB_CARGO_TECHNICIAN)
/datum/gear/suit/dept/cloak/cargo/New()
..()
@@ -358,7 +358,7 @@
/datum/gear/suit/dept/cloak/mining
display_name = "mining cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/mining
allowed_roles = list("Quartermaster","Shaft Miner")
allowed_roles = list(JOB_QUARTERMASTER,JOB_SHAFT_MINER)
/datum/gear/suit/dept/cloak/mining/New()
..()
@@ -371,7 +371,7 @@
/datum/gear/suit/dept/cloak/security
display_name = "security cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIVE,JOB_WARDEN,JOB_SECURITY_OFFICER,JOB_SECURITY_PILOT) //YW ADDITIONS
/datum/gear/suit/dept/cloak/security/New()
..()
@@ -384,7 +384,7 @@
/datum/gear/suit/dept/cloak/service
display_name = "service cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/service
allowed_roles = list("Head of Personnel","Bartender","Botanist","Janitor","Chef","Librarian","Chaplain")
allowed_roles = list(JOB_HEAD_OF_PERSONNEL,JOB_BARTENDER,JOB_BOTANIST,JOB_JANITOR,JOB_CHEF,JOB_LIBRARIAN,JOB_CHAPLAIN)
/datum/gear/suit/dept/cloak/service/New()
..()
@@ -397,7 +397,7 @@
/datum/gear/suit/dept/cloak/engineer
display_name = "engineering cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer
allowed_roles = list("Chief Engineer","Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ENGINEER)
/datum/gear/suit/dept/cloak/engineer/New()
..()
@@ -410,7 +410,7 @@
/datum/gear/suit/dept/cloak/atmos
display_name = "atmospherics cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos
allowed_roles = list("Chief Engineer","Atmospheric Technician")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN)
/datum/gear/suit/dept/cloak/atmos/New()
..()
@@ -423,7 +423,7 @@
/datum/gear/suit/dept/cloak/research
display_name = "scientist cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/sci
allowed_roles = list("Research Director","Scientist","Roboticist","Xenobiologist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST,JOB_ROBOTICIST,JOB_XENOBIOLOGIST)
/datum/gear/suit/dept/cloak/research/New()
..()
@@ -436,7 +436,7 @@
/datum/gear/suit/dept/cloak/robo
display_name = "roboticist cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/robo
allowed_roles = list("Research Director","Roboticist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_ROBOTICIST)
/datum/gear/suit/dept/cloak/robo/New()
..()
@@ -449,7 +449,7 @@
/datum/gear/suit/dept/cloak/medical
display_name = "medical cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/medical
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Psychiatrist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_MEDICAL_DOCTOR,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST)
/datum/gear/suit/dept/cloak/medical/New()
..()
@@ -462,7 +462,7 @@
/datum/gear/suit/dept/cloak/chemistry
display_name = "chemist cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry
allowed_roles = list("Chemist")
allowed_roles = list(JOB_CHEMIST)
/datum/gear/suit/dept/cloak/chemistry/New()
..()
@@ -475,7 +475,7 @@
/datum/gear/suit/dept/cloak/virology
display_name = "virologist cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/viro
allowed_roles = list("Medical Doctor")
allowed_roles = list(JOB_MEDICAL_DOCTOR)
/datum/gear/suit/dept/cloak/virology/New()
..()
@@ -488,12 +488,12 @@
/datum/gear/suit/dept/cloak/psych
display_name = "psychiatrist cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/psych
allowed_roles = list("Chief Medical Officer","Psychiatrist")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PSYCHIATRIST)
/datum/gear/suit/dept/cloak/paramedic
display_name = "paramedic cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/para
allowed_roles = list("Chief Medical Officer","Paramedic")
allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC)
/datum/gear/suit/dept/cloak/paramedic/New()
..()
@@ -506,7 +506,7 @@
/datum/gear/suit/dept/cloak/iaa
display_name = "internal affairs cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa
allowed_roles = list("Internal Affairs Agent")
allowed_roles = list(JOB_INTERNAL_AFFAIRS_AGENT)
/datum/gear/suit/dept/cloak/iaa/New()
..()
@@ -553,19 +553,19 @@
/datum/gear/suit/dept/beltcloak/wrdn
display_name = "warden belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn
allowed_roles = list("Head of Security","Warden")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN)
sort_category = "Xenowear"
/datum/gear/suit/dept/beltcloak/jani
display_name = "janitor belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani
allowed_roles = list("Janitor")
allowed_roles = list(JOB_JANITOR)
sort_category = "Xenowear"
/datum/gear/suit/dept/beltcloak/cmd
display_name = "command belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command
allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_HEAD_OF_SECURITY,JOB_CHIEF_ENGINEER,JOB_CHIEF_MEDICAL_OFFICER,JOB_RESEARCH_DIRECTOR)
sort_category = "Xenowear"
/datum/gear/suit/cloak_hood
code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm
+3 -3
View File
@@ -2,10 +2,10 @@
/////
/datum/gear/suit/dept/cloak/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST)
/datum/gear/uniform/dept/undercoat/research
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
allowed_roles = list(JOB_RESEARCH_DIRECTOR,JOB_SCIENTIST, JOB_ROBOTICIST, JOB_XENOBIOLOGIST, JOB_XENOBOTANIST)
/////
@@ -126,7 +126,7 @@
description = "A comfortable official suit for altevian command officers."
display_name = "altevian officer's suit selection, site manager"
whitelisted = SPECIES_ALTEVIAN
allowed_roles = list("Site Manager")
allowed_roles = list(JOB_SITE_MANAGER)
sort_category = "Xenowear"
/datum/gear/suit/altevian_officer_suit/New()
code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm
+5 -5
View File
@@ -8,7 +8,7 @@
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")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_DETECTIV,JOB_WARDEN,JOB_SECURITY_OFFICER)
/datum/gear/suit/zaddat/engineer
display_name = "Zaddat engineer shroud"
@@ -16,7 +16,7 @@
path = /obj/item/clothing/suit/space/void/zaddat/engineer
sort_category = "Xenowear"
whitelisted = SPECIES_ZADDAT
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer")
allowed_roles = list(JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEER)
//Added from CHOMP
@@ -65,17 +65,17 @@
/datum/gear/suit/dept/beltcloak/wrdn
display_name = "warden belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn
allowed_roles = list("Head of Security","Warden")
allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN)
/datum/gear/suit/dept/beltcloak/hos
display_name = "Chief of Security belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos
allowed_roles = list("Head of Security")
allowed_roles = list(JOB_HEAD_OF_SECURITY)
/datum/gear/suit/dept/beltcloak/jani
display_name = "janitor belted cloak (Teshari)"
path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani
allowed_roles = list("Janitor")
allowed_roles = list(JOB_JANITOR)
/datum/gear/suit/dept/cloak/command/New()
..()
code/modules/client/preference_setup/occupation/occupation.dm
+1 -1
View File
@@ -176,7 +176,7 @@
if((pref.job_civilian_low & ASSISTANT) && job.type != /datum/job/assistant)
. += "<font color=grey>[rank]</font></a></td><td></td></tr>"
continue
if((rank in SSjob.get_job_titles_in_department(DEPARTMENT_COMMAND) ) || (rank == "AI"))//Bold head jobs
if((rank in SSjob.get_job_titles_in_department(DEPARTMENT_COMMAND) ) || (rank == JOB_AI))//Bold head jobs
. += "<b>[rank]</b></a>"
else
. += "[rank]</a>"