cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Headset Option Fixes (#9540)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-28 23:30:27 -07:00
committed by GitHub
parent 89015607ec
commit 800252c62b
19 changed files with 197 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/datums/outfits/horror_killers.dm
View File

@@ -5,7 +5,6 @@
gloves = /obj/item/clothing/gloves/black
mask = /obj/item/clothing/mask/gas/clown_hat
head = /obj/item/clothing/head/chaplain_hood
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie
r_pocket = /obj/item/bikehorn
@@ -15,6 +14,10 @@
id_type = /obj/item/card/id/syndicate/station_access
id_pda_assignment = "Tunnel Clown!"
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
/decl/hierarchy/outfit/masked_killer
name = "Masked Killer"
uniform = /obj/item/clothing/under/overalls
@@ -22,13 +25,16 @@
gloves = /obj/item/clothing/gloves/sterile/latex
mask = /obj/item/clothing/mask/surgical
head = /obj/item/clothing/head/welding
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/plain/monocle
suit = /obj/item/clothing/suit/storage/apron
l_pocket = /obj/item/material/knife/tacknife
r_pocket = /obj/item/surgical/scalpel
r_hand = /obj/item/material/twohanded/fireaxe
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
/decl/hierarchy/outfit/masked_killer/post_equip(var/mob/living/carbon/human/H)
var/victim = get_mannequin(H.ckey)
for(var/obj/item/carried_item in H.get_equipped_items(TRUE))
@@ -39,7 +45,6 @@
uniform = /obj/item/clothing/under/suit_jacket{ starting_accessories=list(/obj/item/clothing/accessory/wcoat) }
shoes = /obj/item/clothing/shoes/black
gloves = /obj/item/clothing/gloves/black
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/sunglasses
l_pocket = /obj/item/melee/energy/sword
mask = /obj/item/clothing/mask/gas/clown_hat
@@ -49,6 +54,10 @@
pda_slot = slot_belt
pda_type = /obj/item/pda/heads
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset/alt
headset_earbud = /obj/item/radio/headset/earbud
/decl/hierarchy/outfit/professional/post_equip(var/mob/living/carbon/human/H)
var/obj/item/storage/secure/briefcase/sec_briefcase = new(H)
for(var/obj/item/briefcase_item in sec_briefcase)

5
code/datums/outfits/jobs/YW.dm
View File

@@ -1,8 +1,11 @@
/decl/hierarchy/outfit/job/blueshield
name = OUTFIT_JOB_NAME(JOB_BLUESHIELD_GUARD)
uniform = /obj/item/clothing/under/yw/blueshield
l_ear = /obj/item/radio/headset/heads/blueshield
shoes = /obj/item/clothing/shoes/laceup
id_type = /obj/item/card/id/blueshield
pda_type = /obj/item/pda/captain
r_hand = /obj/item/clipboard
headset = /obj/item/radio/headset/heads/blueshield
headset_alt = /obj/item/radio/headset/heads/blueshield
headset_earbud = /obj/item/radio/headset/heads/blueshield

7
code/datums/outfits/jobs/medical.dm
View File

@@ -78,7 +78,6 @@
/decl/hierarchy/outfit/job/medical/geneticist
name = OUTFIT_JOB_NAME(JOB_GENETICIST)
l_ear = /obj/item/radio/headset/headset_medsci // CHOMPAdd - Geneticists get their cool headset
uniform = /obj/item/clothing/under/rank/geneticist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/genetics
backpack = /obj/item/storage/backpack/genetics
@@ -87,6 +86,12 @@
id_type = /obj/item/card/id/medical/geneticist
pda_type = /obj/item/pda/geneticist
// CHOMPAdd Start - Geneticists get their cool headset
headset = /obj/item/radio/headset/headset_medsci
headset_alt = /obj/item/radio/headset/headset_medsci
headset_earbud = /obj/item/radio/headset/headset_medsci
// CHOMPAdd End
/decl/hierarchy/outfit/job/medical/psychiatrist
name = OUTFIT_JOB_NAME(JOB_PSYCHIATRIST)
uniform = /obj/item/clothing/under/rank/psych

10
code/datums/outfits/jobs/special_vr.dm
View File

@@ -4,24 +4,30 @@
gloves = /obj/item/clothing/gloves/white
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/beret/centcom/officer
l_ear = /obj/item/radio/headset/centcom
glasses = /obj/item/clothing/glasses/omnihud/all
id_type = /obj/item/card/id/centcom
pda_type = /obj/item/pda/centcom
flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/centcom
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
/decl/hierarchy/outfit/job/emergency_responder
name = OUTFIT_JOB_NAME("Emergency Responder")
uniform = /obj/item/clothing/under/ert
shoes = /obj/item/clothing/shoes/boots/swat
gloves = /obj/item/clothing/gloves/swat
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/sunglasses
back = /obj/item/storage/backpack/satchel
id_type = /obj/item/card/id/centcom/ERT
pda_type = /obj/item/pda/centcom
flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/ert
headset_alt = /obj/item/radio/headset/ert
headset_earbud = /obj/item/radio/headset/ert
/decl/hierarchy/outfit/job/emergency_responder/post_equip(var/mob/living/carbon/human/H)
..()
ert.add_antagonist(H.mind)

4
code/datums/outfits/military/military.dm
View File

@@ -2,4 +2,6 @@
name = "Military Uniform"
hierarchy_type = /decl/hierarchy/outfit/military
l_ear = /obj/item/radio/headset
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset
headset_earbud = /obj/item/radio/headset

10
code/datums/outfits/misc.dm
View File

@@ -29,7 +29,6 @@
/decl/hierarchy/outfit/soviet_soldier/admiral
name = "Soviet admiral"
head = /obj/item/clothing/head/hgpiratecap
l_ear = /obj/item/radio/headset/heads/captain
glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
suit = /obj/item/clothing/suit/hgpirate
@@ -37,10 +36,13 @@
id_type = /obj/item/card/id/centcom //station
id_pda_assignment = "Admiral"
headset = /obj/item/radio/headset/heads/captain
headset_alt = /obj/item/radio/headset/heads/captain
headset_earbud = /obj/item/radio/headset/heads/captain
/decl/hierarchy/outfit/merchant
name = "Merchant"
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset
uniform = /obj/item/clothing/under/color/grey
id_slot = slot_wear_id
id_type = /obj/item/card/id/civilian //merchant
@@ -48,6 +50,10 @@
pda_type = /obj/item/pda/chef //cause I like the look
id_pda_assignment = "Merchant"
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset
headset_earbud = /obj/item/radio/headset
/decl/hierarchy/outfit/merchant/vox
name = "Merchant - Vox"
shoes = /obj/item/clothing/shoes/boots/jackboots/toeless

15
code/datums/outfits/nanotrasen.dm
View File

@@ -3,7 +3,6 @@
uniform = /obj/item/clothing/under/rank/centcom
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/white
l_ear = /obj/item/radio/headset/heads/hop
glasses = /obj/item/clothing/glasses/sunglasses
id_slot = slot_wear_id
@@ -11,6 +10,10 @@
pda_slot = slot_r_store
pda_type = /obj/item/pda/heads
headset = /obj/item/radio/headset/heads/hop
headset_alt = /obj/item/radio/headset/heads/hop
headset_earbud = /obj/item/radio/headset/heads/hop
/decl/hierarchy/outfit/nanotrasen/representative
name = "Nanotrasen representative"
belt = /obj/item/clipboard
@@ -19,14 +22,20 @@
/decl/hierarchy/outfit/nanotrasen/officer
name = "Nanotrasen officer"
head = /obj/item/clothing/head/beret/centcom/officer
l_ear = /obj/item/radio/headset/heads/captain
belt = /obj/item/gun/energy
id_pda_assignment = "NanoTrasen Navy Officer"
headset = /obj/item/radio/headset/heads/captain
headset_alt = /obj/item/radio/headset/heads/captain
headset_earbud = /obj/item/radio/headset/heads/captain
/decl/hierarchy/outfit/nanotrasen/captain
name = "Nanotrasen captain"
uniform = /obj/item/clothing/under/rank/centcom_captain
l_ear = /obj/item/radio/headset/heads/captain
head = /obj/item/clothing/head/beret/centcom/captain
belt = /obj/item/gun/energy
id_pda_assignment = "NanoTrasen Navy Captain"
headset = /obj/item/radio/headset/heads/captain
headset_alt = /obj/item/radio/headset/heads/captain
headset_earbud = /obj/item/radio/headset/heads/captain

25
code/datums/outfits/outfit_vr.dm
View File

@@ -3,7 +3,6 @@
uniform = /obj/item/clothing/under/solgov/utility/army/urban
shoes = /obj/item/clothing/shoes/boots/jackboots
gloves = /obj/item/clothing/gloves/combat
l_ear = /obj/item/radio/headset/centcom
r_pocket = /obj/item/ammo_magazine/m95
l_pocket = /obj/item/ammo_magazine/m95
l_hand = /obj/item/ammo_magazine/m95
@@ -15,6 +14,10 @@
suit = /obj/item/clothing/suit/armor/combat/USDF
belt = /obj/item/storage/belt/security/tactical
headset = /obj/item/radio/headset/centcom
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
/decl/hierarchy/outfit/USDF/Marine/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s military ID Card"
@@ -29,7 +32,6 @@
name = "USDF officer"
head = /obj/item/clothing/head/dress/army/command
shoes = /obj/item/clothing/shoes/boots/jackboots
l_ear = /obj/item/radio/headset/centcom
uniform = /obj/item/clothing/under/solgov/mildress/army/command
back = /obj/item/storage/backpack/satchel
belt = /obj/item/gun/projectile/revolver/consul
@@ -38,6 +40,10 @@
r_hand = /obj/item/clothing/accessory/holster/hip
l_hand = /obj/item/clothing/accessory/tie/black
headset = /obj/item/radio/headset/centcom
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
/decl/hierarchy/outfit/USDF/Officer/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s military ID Card"
@@ -51,7 +57,6 @@
/decl/hierarchy/outfit/solcom/representative
name = "SolGov Representative" //YW EDIT: SolGov
shoes = /obj/item/clothing/shoes/laceup
l_ear = /obj/item/radio/headset/centcom
uniform = /obj/item/clothing/under/suit_jacket/navy
back = /obj/item/storage/backpack/satchel
l_pocket = /obj/item/pen/blue
@@ -59,6 +64,10 @@
r_hand = /obj/item/pda/centcom
l_hand = /obj/item/clipboard
headset = /obj/item/radio/headset/centcom
headset_alt = /obj/item/radio/headset/centcom
headset_earbud = /obj/item/radio/headset/centcom
/decl/hierarchy/outfit/solcom/representative/equip_id(mob/living/carbon/human/H)
var/obj/item/card/id/C = ..()
C.name = "[H.real_name]'s SolGov ID Card" //YW EDIT: SolGov
@@ -74,7 +83,6 @@
head = /obj/item/clothing/head/helmet/combat/imperial
shoes =/obj/item/clothing/shoes/leg_guard/combat/imperial
gloves = /obj/item/clothing/gloves/arm_guard/combat/imperial
l_ear = /obj/item/radio/headset/syndicate
uniform = /obj/item/clothing/under/imperial
mask = /obj/item/clothing/mask/gas/imperial
suit = /obj/item/clothing/suit/armor/combat/imperial
@@ -86,12 +94,15 @@
l_hand = /obj/item/shield/energy/imperial
suit_store = /obj/item/gun/energy/imperial
headset = /obj/item/radio/headset/syndicate
headset_alt = /obj/item/radio/headset/syndicate
headset_earbud = /obj/item/radio/headset/syndicate
/decl/hierarchy/outfit/imperial/officer
name = "Imperial officer"
head = /obj/item/clothing/head/helmet/combat/imperial/centurion
shoes = /obj/item/clothing/shoes/leg_guard/combat/imperial
gloves = /obj/item/clothing/gloves/arm_guard/combat/imperial
l_ear = /obj/item/radio/headset/syndicate
uniform = /obj/item/clothing/under/imperial
mask = /obj/item/clothing/mask/gas/imperial
suit = /obj/item/clothing/suit/armor/combat/imperial/centurion
@@ -102,6 +113,10 @@
l_hand = /obj/item/shield/energy/imperial
suit_store = /obj/item/gun/energy/imperial
headset = /obj/item/radio/headset/syndicate
headset_alt = /obj/item/radio/headset/syndicate
headset_earbud = /obj/item/radio/headset/syndicate
/*
SOUTHERN CROSS OUTFITS
Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead goes in lockers. Keep this in mind if editing.

15
code/datums/outfits/spec_op.dm
View File

@@ -2,7 +2,6 @@
name = "Special ops - Officer"
uniform = /obj/item/clothing/under/syndicate/combat
suit = /obj/item/clothing/suit/armor/swat/officer
l_ear = /obj/item/radio/headset/ert
glasses = /obj/item/clothing/glasses/thermal/plain/eyepatch
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/havana
head = /obj/item/clothing/head/beret //deathsquad
@@ -16,6 +15,10 @@
id_desc = "Special operations ID."
id_pda_assignment = "Special Operations Officer"
headset = /obj/item/radio/headset/ert
headset_alt = /obj/item/radio/headset/ert
headset_earbud = /obj/item/radio/headset/ert
/decl/hierarchy/outfit/spec_op_officer/space
name = "Special ops - Officer in space"
suit = /obj/item/clothing/suit/armor/swat //obj/item/clothing/suit/space/void/swat
@@ -29,7 +32,6 @@
uniform = /obj/item/clothing/under/ert
shoes = /obj/item/clothing/shoes/boots/swat
gloves = /obj/item/clothing/gloves/swat
l_ear = /obj/item/radio/headset/ert
belt = /obj/item/gun/energy/gun
glasses = /obj/item/clothing/glasses/sunglasses
back = /obj/item/storage/backpack/satchel
@@ -37,6 +39,10 @@
id_slot = slot_wear_id
id_type = /obj/item/card/id/centcom/ERT
headset = /obj/item/radio/headset/ert
headset_alt = /obj/item/radio/headset/ert
headset_earbud = /obj/item/radio/headset/ert
/decl/hierarchy/outfit/death_command
name = "Spec ops - Death commando"
@@ -55,7 +61,6 @@
name = "Spec ops - Mercenary"
uniform = /obj/item/clothing/under/syndicate
shoes = /obj/item/clothing/shoes/boots/combat
l_ear = /obj/item/radio/headset/syndicate
belt = /obj/item/storage/belt/security
glasses = /obj/item/clothing/glasses/sunglasses
gloves = /obj/item/clothing/gloves/swat
@@ -66,4 +71,8 @@
id_type = /obj/item/card/id/syndicate
id_pda_assignment = "Mercenary"
headset = /obj/item/radio/headset/syndicate
headset_alt = /obj/item/radio/headset/alt/syndicate
headset_earbud = /obj/item/radio/headset/earbud/syndicate
flags = OUTFIT_HAS_BACKPACK

5
code/datums/outfits/wizardry.dm
View File

@@ -1,7 +1,6 @@
/decl/hierarchy/outfit/wizard
uniform = /obj/item/clothing/under/color/lightpurple
shoes = /obj/item/clothing/shoes/sandal
l_ear = /obj/item/radio/headset
r_pocket = /obj/item/teleportation_scroll
l_hand = /obj/item/staff
r_hand = /obj/item/spellbook
@@ -9,6 +8,10 @@
backpack_contents = list(/obj/item/storage/box = 1)
hierarchy_type = /decl/hierarchy/outfit/wizard
headset = /obj/item/radio/headset
headset_alt = /obj/item/radio/headset
headset_earbud = /obj/item/radio/headset
/decl/hierarchy/outfit/wizard/blue
name = "Wizard - Blue"
head = /obj/item/clothing/head/wizard

15
maps/southern_cross/job/outfits.dm
View File

@@ -10,7 +10,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
@@ -19,6 +18,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
@@ -43,7 +46,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/radio/headset/alt/pilot
uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
id_slot = slot_wear_id
pda_slot = slot_belt
@@ -52,12 +54,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/alt/pilot
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
l_ear = /obj/item/radio/headset/sar
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
@@ -65,3 +70,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_type = /obj/item/pda/sar //VOREStation Add
id_pda_assignment = "Field Medic" //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/sar
headset_alt = /obj/item/radio/headset/sar
headset_earbud = /obj/item/radio/headset/sar

31
maps/tether/tether_jobs.dm
View File

@@ -177,8 +177,6 @@
id_type = /obj/item/card/id/talon/captain
id_slot = slot_wear_id
pda_type = null
l_ear = /obj/item/radio/headset/talon
glasses = /obj/item/clothing/glasses/sunglasses
uniform = /obj/item/clothing/under/rank/talon/command
shoes = /obj/item/clothing/shoes/brown
@@ -186,6 +184,10 @@
satchel_one = /obj/item/storage/backpack/satchel/talon
messenger_bag = /obj/item/storage/backpack/messenger/talon
headset = /obj/item/radio/headset/talon
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
/decl/hierarchy/outfit/job/talon_pilot
name = OUTFIT_JOB_NAME(JOB_TALON_PILOT)
@@ -194,7 +196,6 @@
pda_type = null
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
l_ear = /obj/item/radio/headset/talon
shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/pilot_vr/talon
uniform = /obj/item/clothing/under/rank/talon/pilot
@@ -206,6 +207,10 @@
satchel_one = /obj/item/storage/backpack/satchel/talon
messenger_bag = /obj/item/storage/backpack/messenger/talon
headset = /obj/item/radio/headset/talon
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
/decl/hierarchy/outfit/job/talon_doctor
name = OUTFIT_JOB_NAME(JOB_TALON_DOCTOR)
hierarchy_type = /decl/hierarchy/outfit/job
@@ -214,7 +219,6 @@
id_slot = slot_wear_id
pda_type = null
l_ear = /obj/item/radio/headset/talon
shoes = /obj/item/clothing/shoes/white
backpack = /obj/item/storage/backpack/medic
satchel_one = /obj/item/storage/backpack/satchel/med
@@ -227,6 +231,10 @@
satchel_one = /obj/item/storage/backpack/satchel/talon
messenger_bag = /obj/item/storage/backpack/messenger/talon
headset = /obj/item/radio/headset/talon
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
/decl/hierarchy/outfit/job/talon_security
name = OUTFIT_JOB_NAME(JOB_ALT_TALON_SECURITY)
hierarchy_type = /decl/hierarchy/outfit/job
@@ -236,7 +244,6 @@
pda_type = null
backpack_contents = list(/obj/item/handcuffs = 1)
l_ear = /obj/item/radio/headset/talon
gloves = /obj/item/clothing/gloves/black
shoes = /obj/item/clothing/shoes/boots/jackboots
backpack = /obj/item/storage/backpack/security
@@ -248,6 +255,10 @@
satchel_one = /obj/item/storage/backpack/satchel/talon
messenger_bag = /obj/item/storage/backpack/messenger/talon
headset = /obj/item/radio/headset/talon
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
/decl/hierarchy/outfit/job/talon_engineer
name = OUTFIT_JOB_NAME(JOB_TALON_ENGINEER)
hierarchy_type = /decl/hierarchy/outfit/job
@@ -257,7 +268,6 @@
pda_type = null
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
l_ear = /obj/item/radio/headset/talon
belt = /obj/item/storage/belt/utility/full
shoes = /obj/item/clothing/shoes/boots/workboots
r_pocket = /obj/item/t_scanner
@@ -270,6 +280,10 @@
satchel_one = /obj/item/storage/backpack/satchel/talon
messenger_bag = /obj/item/storage/backpack/messenger/talon
headset = /obj/item/radio/headset/talon
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon
/decl/hierarchy/outfit/job/talon_miner
name = OUTFIT_JOB_NAME(JOB_TALON_MINER)
hierarchy_type = /decl/hierarchy/outfit/job
@@ -279,7 +293,6 @@
pda_type = null
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL
l_ear = /obj/item/radio/headset/talon
shoes = /obj/item/clothing/shoes/boots/workboots
r_pocket = /obj/item/storage/bag/ore
l_pocket = /obj/item/tool/crowbar
@@ -287,3 +300,7 @@
backpack = /obj/item/storage/backpack/talon
satchel_one = /obj/item/storage/backpack/satchel/talon
messenger_bag = /obj/item/storage/backpack/messenger/talon
headset = /obj/item/radio/headset/talon
headset_alt = /obj/item/radio/headset/talon
headset_earbud = /obj/item/radio/headset/talon

34
maps/yw/job/outfits.dm
View File

@@ -8,7 +8,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
@@ -17,6 +16,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
@@ -41,19 +44,21 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/radio/headset/alt/pilot
id_slot = slot_wear_id
pda_slot = slot_belt
pda_type = /obj/item/pda //VOREStation Edit - Civilian
id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/alt/pilot
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC) //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
l_ear = /obj/item/radio/headset/sar
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
@@ -61,12 +66,14 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = JOB_FIELD_MEDIC //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/sar
headset_alt = /obj/item/radio/headset/sar
headset_earbud = /obj/item/radio/headset/sar
/decl/hierarchy/outfit/job/explorer2
name = OUTFIT_JOB_NAME(JOB_EXPLORER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
@@ -75,6 +82,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
@@ -99,7 +110,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/radio/headset/alt/pilot
id_slot = slot_wear_id
pda_slot = slot_belt
pda_type = /obj/item/pda //VOREStation Edit - Civilian
@@ -107,12 +117,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/alt/pilot
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME(JOB_FIELD_MEDIC) //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
l_ear = /obj/item/radio/headset/sar
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
@@ -121,12 +134,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = JOB_FIELD_MEDIC //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/sar
headset_alt = /obj/item/radio/headset/sar
headset_earbud = /obj/item/radio/headset/sar
/decl/hierarchy/outfit/job/pathfinder
name = OUTFIT_JOB_NAME(JOB_PATHFINDER)
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/pathfinder
@@ -135,6 +151,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)

5
maps/yw/job/outfits_yw.dm
View File

@@ -2,7 +2,6 @@
name = OUTFIT_JOB_NAME("Pathfinder")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer //TODO: Uniforms.
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/pathfinder
@@ -11,6 +10,10 @@
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/pathfinder/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)

5
modular_chomp/code/datums/outfits/jobs/command.dm
View File

@@ -1,7 +1,10 @@
/decl/hierarchy/outfit/job/bridge_officer
name = OUTFIT_JOB_NAME("Bridge Officer")
uniform = /obj/item/clothing/under/utility
l_ear = /obj/item/radio/headset/headset_com
shoes = /obj/item/clothing/shoes/boots/winter/explorer
id_type = /obj/item/card/id/silver/secretary
pda_type = /obj/item/pda/heads
headset = /obj/item/radio/headset/headset_com
headset_alt = /obj/item/radio/headset/headset_com
headset_earbud = /obj/item/radio/headset/headset_com

6
modular_chomp/code/datums/outfits/jobs/noncrew.dm
View File

@@ -6,13 +6,15 @@
r_pocket = /obj/item/spacecash/ewallet
l_pocket = /obj/item/survivalcapsule/superpose
l_ear = /obj/item/radio/headset/outsider
id_slot = slot_wear_id
id_type = /obj/item/card/id/external // No access, allows activating PDA's.
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/outsider
headset_alt = /obj/item/radio/headset/outsider
headset_earbud = /obj/item/radio/headset/outsider
/decl/hierarchy/outfit/noncrew/post_equip(mob/living/carbon/human/H)
..()
var/obj/item/spacecash/ewallet/wallet = H.r_store

5
modular_chomp/code/datums/outfits/jobs/security.dm
View File

@@ -1,7 +1,6 @@
/decl/hierarchy/outfit/job/security/brigphysician
name = OUTFIT_JOB_NAME(JOB_BRIG_PHYSICIAN)
uniform = /obj/item/clothing/under/rank/brigphys
l_ear = /obj/item/radio/headset/headset_medsec
id_type = /obj/item/card/id/security/brigphysician
pda_type = /obj/item/pda/medical
shoes = /obj/item/clothing/shoes/white
@@ -14,3 +13,7 @@
messenger_bag = /obj/item/storage/backpack/messenger/med
sports_bag = /obj/item/storage/backpack/sport/white
gloves = /obj/item/clothing/gloves/sterile/nitrile
headset = /obj/item/radio/headset/headset_medsec
headset_alt = /obj/item/radio/headset/headset_medsec
headset_earbud = /obj/item/radio/headset/headset_medsec

15
modular_chomp/maps/relic_base/job/outfits.dm
View File

@@ -10,7 +10,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
@@ -19,6 +18,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
@@ -43,7 +46,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/radio/headset/alt/pilot
uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
id_slot = slot_wear_id
pda_slot = slot_belt
@@ -52,12 +54,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = "Pilot"
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/alt/pilot
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
l_ear = /obj/item/radio/headset/sar
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
@@ -65,3 +70,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_type = /obj/item/pda/sar //VOREStation Add
id_pda_assignment = "Field Medic" //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/sar
headset_alt = /obj/item/radio/headset/sar
headset_earbud = /obj/item/radio/headset/sar

15
modular_chomp/maps/southern_cross/job/outfits.dm
View File

@@ -10,7 +10,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
name = OUTFIT_JOB_NAME("Explorer")
shoes = /obj/item/clothing/shoes/boots/winter/explorer
uniform = /obj/item/clothing/under/explorer
l_ear = /obj/item/radio/headset/explorer
id_slot = slot_wear_id
pda_slot = slot_l_store
pda_type = /obj/item/pda/explorer //VORESTation Edit - Better Brown
@@ -19,6 +18,10 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer
headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
..()
for(var/obj/item/clothing/accessory/permit/gun/planetside/permit in H.back.contents)
@@ -43,7 +46,6 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/radio/headset/alt/pilot
uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
id_slot = slot_wear_id
pda_slot = slot_belt
@@ -52,12 +54,15 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/alt/pilot
headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot
/decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
uniform = /obj/item/clothing/under/utility/blue
//suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar //VOREStation Edit
shoes = /obj/item/clothing/shoes/boots/winter/explorer
l_ear = /obj/item/radio/headset/sar
l_hand = /obj/item/storage/firstaid/regular
belt = /obj/item/storage/belt/medical/emt
pda_slot = slot_l_store
@@ -65,3 +70,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
pda_type = /obj/item/pda/sar //VOREStation Add
id_pda_assignment = "Field Medic" //VOREStation Edit
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/sar
headset_alt = /obj/item/radio/headset/sar
headset_earbud = /obj/item/radio/headset/sar