From 8b9f5e949a117761c01b2ae9a61bfc2af74a70fa Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Tue, 17 Mar 2020 15:11:28 +0000 Subject: [PATCH] security pilot basics --- code/datums/outfits/jobs/security_yw.dm | 5 ++++ code/game/jobs/access_datum_yw.dm | 6 +++++ code/game/jobs/job/security_yw.dm | 16 +++++++++++++ code/game/jobs/jobs.dm | 1 + .../loadout/loadout_accessories.dm | 14 +++++------ .../loadout/loadout_accessories_vr.dm | 14 +++++------ .../loadout/loadout_accessories_yw.dm | 9 ++++++++ .../preference_setup/loadout/loadout_eyes.dm | 4 ++-- .../loadout/loadout_eyes_yw.dm | 2 +- .../preference_setup/loadout/loadout_head.dm | 10 ++++---- .../preference_setup/loadout/loadout_shoes.dm | 2 +- .../preference_setup/loadout/loadout_suit.dm | 6 ++--- .../loadout/loadout_uniform.dm | 10 ++++---- .../loadout/loadout_uniform_vr.dm | 16 ++++++------- .../loadout/loadout_uniform_yw.dm | 23 ++++++++++++++++++- .../loadout/loadout_utility_vr.dm | 2 +- .../preference_setup/loadout/loadout_xeno.dm | 4 ++-- .../clothing/under/extrauniforms_yw.dm | 16 +++++++++++++ vorestation.dme | 3 +++ 19 files changed, 120 insertions(+), 43 deletions(-) create mode 100644 code/datums/outfits/jobs/security_yw.dm create mode 100644 code/game/jobs/job/security_yw.dm create mode 100644 code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm diff --git a/code/datums/outfits/jobs/security_yw.dm b/code/datums/outfits/jobs/security_yw.dm new file mode 100644 index 0000000000..c5a878f26e --- /dev/null +++ b/code/datums/outfits/jobs/security_yw.dm @@ -0,0 +1,5 @@ +/decl/hierarchy/outfit/job/security/pilot + name = OUTFIT_JOB_NAME("Security Pilot") + uniform = /obj/item/clothing/under/rank/khi/sec/pilot + id_type = /obj/item/weapon/card/id/security + pda_type = /obj/item/device/pda/security \ No newline at end of file diff --git a/code/game/jobs/access_datum_yw.dm b/code/game/jobs/access_datum_yw.dm index 717a90635d..a2e3ad286c 100644 --- a/code/game/jobs/access_datum_yw.dm +++ b/code/game/jobs/access_datum_yw.dm @@ -1,3 +1,9 @@ +/var/const/access_secpilot = 51 +/datum/access/secpilot + id = access_secpilot + desc = "Security Flight Control" + region = ACCESS_REGION_SECURITY + /var/const/access_blueshield = 52 /datum/access/blueshield id = access_blueshield diff --git a/code/game/jobs/job/security_yw.dm b/code/game/jobs/job/security_yw.dm new file mode 100644 index 0000000000..0a24cab824 --- /dev/null +++ b/code/game/jobs/job/security_yw.dm @@ -0,0 +1,16 @@ +/datum/job/security/pilot + title = "Security Pilot" + flag = SECPILOT + department = "Security" + department_flag = ENGSEC + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the head of security" + selection_color = "#601C1C" + economic_modifier = 5 + access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks, access_secpilot) + minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks, access_secpilot) + minimal_player_age = 7 + outfit_type = /decl/hierarchy/outfit/job/security/pilot +// alt_titles = list("Mech Operator","Rover Pilot") \ No newline at end of file diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 21e6593fb5..ac2f22a217 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -12,6 +12,7 @@ var/const/ATMOSTECH =(1<<7) var/const/AI =(1<<8) var/const/CYBORG =(1<<9) var/const/BLUESHIELD =(1<<13) //YW addition +var/const/SECPILOT =(1<<14) //YW addition var/const/INTERN =(1<<15) //VOREStation Add var/const/MEDSCI =(1<<1) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 05442e5208..2ef7687150 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -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") /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") /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") /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") /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") /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") /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") /datum/gear/accessory/fannypack display_name = "fannypack selection" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 8ae13a2930..ea652686d4 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -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") /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") /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") /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") /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") /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") /datum/gear/accessory/flops display_name = "drop straps" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm new file mode 100644 index 0000000000..3784ccd445 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_yw.dm @@ -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") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 4c3b1378d2..79875aa291 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -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") /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") /datum/gear/eyes/sun/shades display_name = "Sunglasses, fat (Security/Command)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm index 2b1ec0f025..0e2e714725 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm @@ -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)" diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 7c2a327b38..ec04a5e7fa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -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") /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") /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") /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") /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") /datum/gear/head/cap/yellow display_name = "cap, yellow" diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm index bb6f50e9f5..c26f9da4bd 100644 --- a/code/modules/client/preference_setup/loadout/loadout_shoes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_shoes.dm @@ -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") /datum/gear/shoes/boots/winter/science display_name = "science winter boots" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index c1c242e4f6..fff6406a1c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -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") /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") /datum/gear/suit/wintercoat/medical display_name = "winter coat, medical" @@ -478,7 +478,7 @@ datum/gear/suit/duster /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" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index a4451e4392..480106effa 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -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") /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") /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") /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") /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") /datum/gear/uniform/brandsuit/grayson display_name = "outfit, grayson" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 4768998c8d..23140edef0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -16,7 +16,7 @@ /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") /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") /datum/gear/suit/job_fed/medsci display_name = "fed uniform, med/sci" @@ -64,7 +64,7 @@ /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") //TNG /datum/gear/uniform/job_trek/cmd/tng @@ -80,7 +80,7 @@ /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") //VOY /datum/gear/uniform/job_trek/cmd/voy @@ -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") //DS9 @@ -106,7 +106,7 @@ 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") /datum/gear/uniform/job_trek/cmd/ds9 @@ -122,7 +122,7 @@ /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") //ENT @@ -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") /* Swimsuits */ diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm index 0fef98d933..b635994995 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_yw.dm @@ -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 \ No newline at end of file + 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") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 0df769d847..02a7916164 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -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") /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 2a60cf94a9..da56920e51 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -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") /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") /datum/gear/suit/dept/cloak/service display_name = "service cloak (Teshari)" diff --git a/code/modules/clothing/under/extrauniforms_yw.dm b/code/modules/clothing/under/extrauniforms_yw.dm index 49c9968b8f..612bcede4e 100644 --- a/code/modules/clothing/under/extrauniforms_yw.dm +++ b/code/modules/clothing/under/extrauniforms_yw.dm @@ -19,6 +19,22 @@ item_state = "blueshield2" armor = list(melee = 15, bullet = 10, laser = 10,energy = 5, bomb = 15, bio = 0, rad = 0) +/obj/item/clothing/accessory/storage/webbing/combatpilot //redefined to change the name and keep it loaded in the event the sc files are disabled in future + name = "combat pilot harness" + desc = "Sturdy mess of black synthcotton belts and buckles." + icon_state = "pilot_webbing2" + sprite_sheets = list( + "Teshari" = 'icons/mob/species/seromi/ties.dmi' + ) + +/obj/item/clothing/under/rank/khi/sec/pilot //yes, we're inheriting from the khi version; that one has full rolldown sprites + name = "security pilot uniform" + desc = "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." + armor = list(melee = 0, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0) + //we probably won't get hit by melee attacks as a pilot, but logically you'd want protection against anything that might penetrate the armor + starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/combatpilot) + //come prefitted with some snappy extra webbing + /obj/item/clothing/under/yw/rank/security/formal name = "security suit" desc = "A formal security suit for officers complete with nanotrasen belt buckle." diff --git a/vorestation.dme b/vorestation.dme index b5bc55dd25..d1c459aec6 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -373,6 +373,7 @@ #include "code\datums\outfits\jobs\misc.dm" #include "code\datums\outfits\jobs\science.dm" #include "code\datums\outfits\jobs\security.dm" +#include "code\datums\outfits\jobs\security_yw.dm" #include "code\datums\outfits\jobs\special_vr.dm" #include "code\datums\outfits\jobs\YW.dm" #include "code\datums\outfits\military\fleet.dm" @@ -736,6 +737,7 @@ #include "code\game\jobs\job\science_vr.dm" #include "code\game\jobs\job\security.dm" #include "code\game\jobs\job\security_vr.dm" +#include "code\game\jobs\job\security_yw.dm" #include "code\game\jobs\job\silicon.dm" #include "code\game\jobs\job\silicon_vr.dm" #include "code\game\jobs\job\special_vr.dm" @@ -1702,6 +1704,7 @@ #include "code\modules\client\preference_setup\loadout\loadout.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories.dm" #include "code\modules\client\preference_setup\loadout\loadout_accessories_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_accessories_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_cosmetics.dm" #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm"