cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +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/datums/autolathe/arms_1_yw.dm
+69 -1
View File
@@ -3,4 +3,72 @@
id = "shotgun_scatter"
build_path = /obj/item/ammo_casing/a12g/scatter
materials = list(DEFAULT_WALL_MATERIAL = 450)
hidden = 1
hidden = 1
/datum/design/item/autolathe/arms/shotgun_clip_scatter
name = "2-round 12g speedloader (scatter)"
id = "shotgun_speedloader_scatter"
build_path = /obj/item/ammo_magazine/clip/c12g/scatter
materials = list(DEFAULT_WALL_MATERIAL = 1337)
hidden = 1
//printable boxes of shotgun ammo, by KK
//the prices are rounded up to the cost of nine shells, but compared to printing a bunch of speedloaders you get a small discount. honestly the speedloaders are overpriced (the metal frame is somehow more expensive than a third shell!) but take it up with polaris.
/datum/design/item/autolathe/arms/ammobox/shotgun_box_beanbag
name = "8-round 12g ammo box (beanbag)"
id = "shotgun_ammobox_beanbag"
build_path = /obj/item/weapon/storage/box/beanbags
materials = list(DEFAULT_WALL_MATERIAL = 2025)
hidden = 1
/datum/design/item/autolathe/arms/ammobox/shotgun_box_slugs
name = "8-round 12g ammo box (slug)"
id = "shotgun_ammobox_slug"
build_path = /obj/item/weapon/storage/box/shotgunammo
materials = list(DEFAULT_WALL_MATERIAL = 4050)
hidden = 1
/datum/design/item/autolathe/arms/ammobox/shotgun_box_pellet
name = "8-round 12g ammo box (pellet)"
id = "shotgun_ammobox_pellet"
build_path = /obj/item/weapon/storage/box/shotgunshells
materials = list(DEFAULT_WALL_MATERIAL = 4050)
hidden = 1
/datum/design/item/autolathe/arms/ammobox/shotgun_box_scatter
name = "8-round 12g ammo box (scatter)"
id = "shotgun_ammobox_scatter"
build_path = /obj/item/weapon/storage/box/scattershot
materials = list(DEFAULT_WALL_MATERIAL = 4050)
hidden = 1
//commented out, pending review, maybe 16rnd boxes should be cargo only?
/*
/datum/design/item/autolathe/arms/ammobox/shotgun_box_beanbag_large
name = "16-round 12g ammo box (beanbag)"
id = "shotgun_ammobox_beanbag_large"
build_path = /obj/item/weapon/storage/box/beanbags/large
materials = list(DEFAULT_WALL_MATERIAL = 4050)
hidden = 1
/datum/design/item/autolathe/arms/ammobox/shotgun_box_slugs_large
name = "16-round 12g ammo box (slug)"
id = "shotgun_ammobox_slug_large"
build_path = /obj/item/weapon/storage/box/shotgunammo/large
materials = list(DEFAULT_WALL_MATERIAL = 8100)
hidden = 1
/datum/design/item/autolathe/arms/ammobox/shotgun_box_pellet_large
name = "16-round 12g ammo box (pellet)"
id = "shotgun_ammobox_pellet_large"
build_path = /obj/item/weapon/storage/box/shotgunshells/large
materials = list(DEFAULT_WALL_MATERIAL = 8100)
hidden = 1
/datum/design/item/autolathe/arms/ammobox/shotgun_box_scatter_large
name = "16-round 12g ammo box (scatter)"
id = "shotgun_ammobox_scatter_large"
build_path = /obj/item/weapon/storage/box/scattershot/large
materials = list(DEFAULT_WALL_MATERIAL = 8100)
hidden = 1
*/
code/datums/outfits/jobs/security_yw.dm
+5
View File
@@ -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
code/game/jobs/access_datum_yw.dm
+6
View File
@@ -1,3 +1,9 @@
/var/const/access_secpilot = 51
/datum/access/secpilot
id = access_secpilot
desc = "Security Pilot Access"
region = ACCESS_REGION_SECURITY
/var/const/access_blueshield = 52
/datum/access/blueshield
id = access_blueshield
code/game/jobs/job/security_yw.dm
+38
View File
@@ -0,0 +1,38 @@
/datum/job/hos
disallow_jobhop = TRUE
access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
access_research, access_engine, access_mining, access_construction, access_mailsorting,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_secpilot)
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory,
access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
access_research, access_engine, access_mining, access_construction, access_mailsorting,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks, access_secpilot)
/datum/job/warden
access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_morgue, access_external_airlocks, access_secpilot)
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_external_airlocks, access_secpilot)
/datum/job/security/pilot
title = "Security Pilot"
flag = SECPILOT
departments = list(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
job_description = "Tasked with flying, operating, and sometimes even maintaining small spacecraft and personal exosuits such as the Durand or Gygax, \
Security Pilots are responsible for transporting criminals to more permanent holding facilities, and patrolling \
for potential threats to their workplace. They may also be expected to step in to standard Security duties if \
there's a shortage of regular officers."
// alt_titles = list("Mech Operator" = /datum/alt_title/sec_mech_operator)
code/game/jobs/jobs.dm
+1
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm
+36
View File
@@ -35,3 +35,39 @@
/obj/item/gunbox/blueshield,
/obj/item/gunbox/blueshield/secondary
)
/obj/structure/closet/secure_closet/security_pilot
name = "security pilot's locker"
req_access = list(access_secpilot)
icon = 'icons/obj/closet_yw.dmi'
icon_state = "secpilot1"
icon_closed = "secpilot"
icon_locked = "secpilot1"
icon_opened = "secpilotopen"
icon_broken = "secpilotbroken"
icon_off = "secpilotoff"
storage_capacity = 2.5 * MOB_MEDIUM
starts_with = list(
/obj/item/weapon/storage/backpack/parachute,
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/clothing/head/pilot/alt,
/obj/item/clothing/mask/gas/half,
/obj/item/clothing/suit/storage/toggle/yw/secjacket,
/obj/item/clothing/under/rank/khi/sec/pilot,
/obj/item/clothing/gloves/fingerless,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec/alt,
/obj/item/weapon/storage/belt/security,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/weapon/storage/box/flare,
/obj/item/clothing/accessory/storage/webbing/combatpilot,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/accessory/holster/armpit,
/obj/item/weapon/gun/energy/taser,
/obj/item/weapon/cell/device/weapon,
/obj/item/device/flashlight/maglight,
/obj/item/device/radio
)
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)"
code/modules/clothing/under/extrauniforms_yw.dm
+16
View File
@@ -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."
code/modules/projectiles/ammunition/magazines_yw.dm
+7
View File
@@ -0,0 +1,7 @@
/obj/item/ammo_magazine/clip/c12g/scatter
name = "ammo clip (12g scatter)"
icon = 'icons/obj/ammo_yw.dmi'
icon_state = "12gclipscatter"
desc = "A color-coded metal clip for holding and quickly loading shotgun shells. This one is loaded with scattershot."
ammo_type = /obj/item/ammo_casing/a12g/scatter
matter = list(DEFAULT_WALL_MATERIAL = 1070) // buckshot and slugs cost the same
icons/mob/hud_jobs_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

icons/obj/ammo_yw.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 949 B

After

Width:  |  Height:  |  Size: 1.0 KiB

icons/obj/closet_yw.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

maps/yw/cryogaia-05-main.dmm
+3338 -1605
View File
File diff suppressed because it is too large Load Diff
maps/yw/cryogaia_areas.dm
+16
View File
@@ -42,6 +42,8 @@
/area/borealis2/outdoors/grounds/power
name = "\The Exterior Powerline"
icon = 'icons/turf/areas.dmi'
icon_state = "yellow"
/area/borealis2/outdoors/grounds/traderpad
name = "\improper Cryogaia Commerce Pad"
@@ -215,6 +217,12 @@
requires_power = 1
base_turf = /turf/space
/area/shuttle/security
name = "\improper Security Interceptor"
icon_state = "shuttle2"
requires_power = 1
base_turf = /turf/space
// Bad guys!!
/area/shuttle/mercenary
name = "\improper Mercenary Vessel"
@@ -277,6 +285,14 @@
name = "\improper Security Auxiliary Station"
icon_state = "security"
/area/security/pilotroom
name = "\improper Security Pilot Ready Room"
icon_state = "red2"
/area/security/hangar
name = "\improper Security Interceptor Hangar"
icon_state = "security"
/area/security/sorting
name = "\improper Security disposals processing"
icon_state = "security"
maps/yw/cryogaia_defines.dm
+2 -1
View File
@@ -226,7 +226,8 @@
icon_state = "globe"
color = "#00AAFF"
initial_generic_waypoints = list(
"cryogaia_excursion_hangar"
"cryogaia_excursion_hangar",
"cryogaia_security_hangar"
)
//Despite not being in the multi-z complex, these levels are part of the overmap sector
extra_z_levels = null //None at the moment. Plains would be added here.
maps/yw/cryogaia_shuttles.dm
+25
View File
@@ -10,6 +10,14 @@
shuttle_area = list(/area/shuttle/excursion)
fuel_consumption = 3
/datum/shuttle/autodock/overmap/security
name = "Security Interceptor"
warmup_time = 0
current_location = "cryogaia_security_hangar"
docking_controller_tag = "secshuttle_docker"
shuttle_area = list(/area/shuttle/security)
fuel_consumption = 1 //much less, due to being teeny
// The 'ship' of the excursion shuttle
/obj/effect/overmap/visitable/ship/landable/excursion
name = "Excursion Shuttle"
@@ -18,14 +26,31 @@
vessel_size = SHIP_SIZE_SMALL
shuttle = "Excursion Shuttle"
/obj/effect/overmap/visitable/ship/landable/security
name = "Security Interceptor"
desc = "An NT-owned high-speed interceptor. Lightly armed."
vessel_mass = 2500
vessel_size = SHIP_SIZE_SMALL
shuttle = "Security Interceptor"
/obj/machinery/computer/shuttle_control/explore/excursion
name = "short jump console"
shuttle_tag = "Excursion Shuttle"
req_one_access = list(access_pilot)
/obj/machinery/computer/shuttle_control/explore/security
name = "short jump console"
shuttle_tag = "Security Interceptor"
req_one_access = list(access_secpilot)
/obj/effect/shuttle_landmark/premade/excursion/cryogaia
name = "NSB Cryogaia (Excursion Dock)"
landmark_tag = "cryogaia_excursion_hangar"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/cryogaia/station/excursion_dock
/obj/effect/shuttle_landmark/premade/security/cryogaia
name = "NSB Cryogaia (Security Dock)"
landmark_tag = "cryogaia_security_hangar"
base_turf = /turf/simulated/floor/reinforced
base_area = /area/security/hangar
vorestation.dme
+4
View File
@@ -381,6 +381,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"
@@ -751,6 +752,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"
@@ -1762,6 +1764,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"
@@ -3123,6 +3126,7 @@
#include "code\modules\projectiles\ammunition\boxes_yw.dm"
#include "code\modules\projectiles\ammunition\magazines.dm"
#include "code\modules\projectiles\ammunition\magazines_vr.dm"
#include "code\modules\projectiles\ammunition\magazines_yw.dm"
#include "code\modules\projectiles\ammunition\magnetic.dm"
#include "code\modules\projectiles\ammunition\rounds.dm"
#include "code\modules\projectiles\ammunition\smartmag.dm"