cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 20:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
SplinterGP
2020-05-05 21:02:46 -03:00
committed by GitHub
parent 6b1cb4e1ff 187cebed48
commit 17df0f666f
29 changed files with 3643 additions and 1657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+7 -7
View File
@@ -79,7 +79,7 @@
/datum/gear/accessory/holster
display_name = "holster selection (Security, CD, HoP)"
path = /obj/item/clothing/accessory/holster
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Blueshield Guard")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/holster/New()
..()
@@ -135,32 +135,32 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, brown"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black"
path = /obj/item/clothing/accessory/storage/black_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown"
path = /obj/item/clothing/accessory/storage/brown_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black"
path = /obj/item/clothing/accessory/storage/black_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white"
path = /obj/item/clothing/accessory/storage/white_drop_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/fannypack
display_name = "fannypack selection"
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+7 -7
View File
@@ -41,15 +41,15 @@
/datum/gear/accessory/holster
display_name = "holster selection (Security, CD, HoP, Exploration)"
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder", "Blueshield Guard")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/brown_vest
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_vest
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
@@ -57,11 +57,11 @@
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"
@@ -85,9 +85,9 @@
/datum/gear/accessory/pilotpin
display_name = "pilot qualification pin"
description = "An iron pin denoting the qualification to fly SCG spacecraft."
description = "An iron pin denoting the qualification to fly USG spacecraft."
path = /obj/item/clothing/accessory/solgov/specialty/pilot
allowed_roles = list("Pathfinder", "Pilot", "Field Medic")
allowed_roles = list("Pathfinder", "Pilot", "Field Medic","Security Pilot") //YW ADDITIONS
/datum/gear/accessory/flops
display_name = "drop straps"
code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm
+9
View File
@@ -0,0 +1,9 @@
/datum/gear/accessory/pilot_webbing1
path = /obj/item/clothing/accessory/storage/webbing/pilot1
display_name = "harness and webbing (Sec, Exploration)"
allowed_roles = list("Security Officer","Detective","Head of Security","Warden","Explorer","Pathfinder","Blueshield Guard","Pilot","Security Pilot")
/datum/gear/accessory/pilot_webbing2
path = /obj/item/clothing/accessory/storage/webbing/pilot2
display_name = "harness and webbing, alt. (Sec, Exploration)"
allowed_roles = list("Security Officer","Detective","Head of Security","Warden","Explorer","Pathfinder","Blueshield Guard","Pilot","Security Pilot")
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+2 -2
View File
@@ -36,7 +36,7 @@
/datum/gear/eyes/security
display_name = "Security HUD (Security)"
path = /obj/item/clothing/glasses/hud/security
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/eyes/security/prescriptionsec
display_name = "Security HUD, prescription (Security)"
@@ -108,7 +108,7 @@
/datum/gear/eyes/sun
display_name = "Sunglasses (Security/Command)"
path = /obj/item/clothing/glasses/sunglasses
allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/eyes/sun/shades
display_name = "Sunglasses, fat (Security/Command)"
code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/gear/eyes/arglasses/sec
display_name = "AR-S glasses (Sec, BSG)"
path = /obj/item/clothing/glasses/omnihud/sec
allowed_roles = list("Security Officer","Head of Security","Warden","Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden","Detective","Blueshield Guard","Security Pilot")
/datum/gear/eyes/arglasses/eng
display_name = "AR-E glasses (Eng)"
code/modules/client/preference_setup/loadout/loadout_head.dm
+5 -5
View File
@@ -19,7 +19,7 @@
/datum/gear/head/beret/bsec
display_name = "beret, navy (officer)"
path = /obj/item/clothing/head/beret/sec/navy/officer
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/beret/bsec_warden
display_name = "beret, navy (warden)"
@@ -34,7 +34,7 @@
/datum/gear/head/beret/csec
display_name = "beret, corporate (officer)"
path = /obj/item/clothing/head/beret/sec/corporate/officer
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/beret/csec_warden
display_name = "beret, corporate (warden)"
@@ -57,7 +57,7 @@
/datum/gear/head/beret/sec
display_name = "beret, red (security)"
path = /obj/item/clothing/head/beret/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap
display_name = "cap, black"
@@ -78,7 +78,7 @@
/datum/gear/head/cap/corp
display_name = "cap, corporate (Security)"
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/green
display_name = "cap, green"
@@ -107,7 +107,7 @@
/datum/gear/head/cap/sec
display_name = "cap, security (Security)"
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/yellow
display_name = "cap, yellow"
code/modules/client/preference_setup/loadout/loadout_shoes.dm
+1 -1
View File
@@ -186,7 +186,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")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/shoes/boots/winter/science
display_name = "science winter boots"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+4 -4
View File
@@ -257,7 +257,7 @@ datum/gear/suit/duster
/datum/gear/suit/roles/poncho/cloak/security
display_name = "cloak, security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/security
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/suit/roles/poncho/cloak/service
display_name = "cloak, service"
@@ -340,7 +340,7 @@ datum/gear/suit/duster
/datum/gear/suit/wintercoat/security
display_name = "winter coat, security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/suit/wintercoat/medical
display_name = "winter coat, medical"
@@ -473,12 +473,12 @@ datum/gear/suit/duster
/datum/gear/suit/snowsuit/command
display_name = "snowsuit, command"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/command
allowed_roles = list("Colony Director","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary","Blueshield Guard")
allowed_roles = list("Colony Director","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary","Blueshield Guard") //YW ADDITIONS
/datum/gear/suit/snowsuit/security
display_name = "snowsuit, security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/security
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Detective","Blueshield Guard","Security Pilot")
/datum/gear/suit/snowsuit/medical
display_name = "snowsuit, medical"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+5 -5
View File
@@ -158,7 +158,7 @@
/datum/gear/uniform/job_skirt/security
display_name = "skirt, security"
path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_skirt/head_of_security
display_name = "skirt, hos"
@@ -173,7 +173,7 @@
/datum/gear/uniform/job_turtle/security
display_name = "turtleneck, security"
path = /obj/item/clothing/under/rank/security/turtleneck
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_turtle/engineering
display_name = "turtleneck, engineering"
@@ -307,7 +307,7 @@
/datum/gear/uniform/corpsecsuit
display_name = "uniform, corporate (Security)"
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/corpwarsuit
display_name = "uniform, corporate (Warden)"
@@ -333,7 +333,7 @@
/datum/gear/uniform/navysecsuit
display_name = "uniform, navy blue (Security)"
path = /obj/item/clothing/under/rank/security/navyblue
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/navywarsuit
display_name = "uniform, navy blue (Warden)"
@@ -432,7 +432,7 @@
/datum/gear/uniform/pcrc
display_name = "uniform, PCRC (Security)"
path = /obj/item/clothing/under/pcrc
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard")
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/brandsuit/grayson
display_name = "outfit, grayson"
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+14 -14
View File
@@ -11,12 +11,12 @@
/datum/gear/uniform/job_khi/cmd
display_name = "khi uniform, cmd"
path = /obj/item/clothing/under/rank/khi/cmd
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_khi/sec
display_name = "khi uniform, sec"
path = /obj/item/clothing/under/rank/khi/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_khi/med
display_name = "khi uniform, med"
@@ -37,7 +37,7 @@
/datum/gear/suit/job_fed/sec
display_name = "fed uniform, sec"
path = /obj/item/clothing/suit/storage/fluff/fedcoat
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard")
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/suit/job_fed/medsci
display_name = "fed uniform, med/sci"
@@ -54,7 +54,7 @@
/datum/gear/uniform/job_trek/cmd/tos
display_name = "TOS uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
@@ -64,13 +64,13 @@
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//TNG
/datum/gear/uniform/job_trek/cmd/tng
display_name = "TNG uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/next
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
@@ -80,13 +80,13 @@
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/next
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//VOY
/datum/gear/uniform/job_trek/cmd/voy
display_name = "VOY uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/voy
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
@@ -96,7 +96,7 @@
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/voy
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//DS9
@@ -106,13 +106,13 @@
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director",
"Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist",
"Scientist","Roboticist","Xenobiologist","Atmospheric Technician",
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard")
"Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_trek/cmd/ds9
display_name = "DS9 uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ds9
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
@@ -122,14 +122,14 @@
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ds9
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//ENT
/datum/gear/uniform/job_trek/cmd/ent
display_name = "ENT uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ent
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard")
allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
@@ -139,7 +139,7 @@
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ent
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard")
allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
/*
Swimsuits
*/
code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm
+22 -1
View File
@@ -18,4 +18,25 @@
/datum/gear/uniform/redvictdress
description = "A victorian style dress, fancy!"
display_name = "Victorian Dress, Red"
path = /obj/item/clothing/under/yw/victsuit/victdress/red
path = /obj/item/clothing/under/yw/victsuit/victdress/red
/datum/gear/uniform/pilot1
display_name = "NT Pilot Uniform"
description = "A blue and grey NanoTrasen flight suit. Warm and practical, it feels cozy. Includes harness and webbing."
path = /obj/item/clothing/under/rank/pilot1
cost = 2 //base cost 1 + accessory 1
allowed_roles = list("Pilot","Security Pilot")
/datum/gear/uniform/pilot2
display_name = "NT Pilot Uniform, Alt."
description = "A dark blue NanoTrasen flight suit. Warm and practical, several patches are scattered across it. Includes harness and webbing."
path = /obj/item/clothing/under/rank/pilot2
cost = 2 //base cost 1 + accessory 1
allowed_roles = list("Pilot","Security Pilot")
/datum/gear/uniform/combatpilot
display_name = "Security Pilot Uniform"
description = "A lightweight uniform intended for vehicle and powersuit operators, designed to allow free movement and maximum comfort in hot, cramped cockpits. Comes prefitted with a harness and webbing for gear."
path = /obj/item/clothing/under/rank/khi/sec/pilot
cost = 2 //base cost 1 + accessory 1
allowed_roles = list("Security Pilot")
code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+1 -1
View File
@@ -44,7 +44,7 @@
/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")
allowed_roles = list("Head of Security","Warden","Detective","Security Officer","Blueshield Guard","Security Pilot")//YW ADDITIONS
/datum/gear/utility/dufflebag/eng
display_name = "engineering dufflebag"
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+2 -2
View File
@@ -210,7 +210,7 @@
/datum/gear/uniform/dept/undercoat/security
display_name = "security undercoat (Teshari)"
path = /obj/item/clothing/under/seromi/undercoat/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
/datum/gear/uniform/dept/undercoat/service
display_name = "service undercoat (Teshari)"
@@ -299,7 +299,7 @@
/datum/gear/suit/dept/cloak/security
display_name = "security cloak (Teshari)"
path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/sec
allowed_roles = list("Head of Security","Detective","Warden","Security Officer",)
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Security Pilot")//YW ADDITIONS
/datum/gear/suit/dept/cloak/service
display_name = "service cloak (Teshari)"