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

[MIRROR] fix multiple headsets (#9594)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-12-07 03:48:52 -07:00
committed by GitHub
parent 75adedc330
commit 7dd76b67ad
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/items/devices/radio/headset.dm
View File

@@ -514,6 +514,7 @@
name = "emergency response team bowman headset" name = "emergency response team bowman headset"
desc = "The bowman headset of the boss's boss." // CHOMPAdd desc = "The bowman headset of the boss's boss." // CHOMPAdd
icon_state = "com_headset_alt" icon_state = "com_headset_alt"
centComm = 1
ks2type = /obj/item/encryptionkey/ert ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/ia /obj/item/radio/headset/ia
@@ -546,6 +547,8 @@
name = "centcom bowman headset" name = "centcom bowman headset"
desc = "The bowman headset of the boss's boss." // CHOMPAdd desc = "The bowman headset of the boss's boss." // CHOMPAdd
icon_state = "com_headset_alt" icon_state = "com_headset_alt"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/nanotrasen /obj/item/radio/headset/nanotrasen
name = "\improper NT radio headset" name = "\improper NT radio headset"
@@ -558,6 +561,8 @@
name = "\improper NT bowman headset" name = "\improper NT bowman headset"
desc = "The bowman headset of a Nanotrasen corporate employee." // CHOMPAdd desc = "The bowman headset of a Nanotrasen corporate employee." // CHOMPAdd
icon_state = "nt_headset_alt" icon_state = "nt_headset_alt"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/pathfinder /obj/item/radio/headset/pathfinder
name = "pathfinder's headset" name = "pathfinder's headset"
@@ -570,6 +575,8 @@
name = "pathfinder's bowman headset" name = "pathfinder's bowman headset"
desc = "Bowman headset used by pathfinders for exploring. Access to the explorer and command channels." // CHOMPAdd desc = "Bowman headset used by pathfinders for exploring. Access to the explorer and command channels." // CHOMPAdd
icon_state = "exp_headset_alt" icon_state = "exp_headset_alt"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/pathfinder
/obj/item/radio/headset/pilot /obj/item/radio/headset/pilot
name = "pilot's headset" name = "pilot's headset"
@@ -581,6 +588,7 @@
name = "pilot's bowman headset" name = "pilot's bowman headset"
desc = "A bowman headset used by pilots." // CHOMPAdd desc = "A bowman headset used by pilots." // CHOMPAdd
icon_state = "pilot_headset_alt" icon_state = "pilot_headset_alt"
adhoc_fallback = TRUE
/obj/item/radio/headset/explorer /obj/item/radio/headset/explorer
name = "away team member's headset" name = "away team member's headset"
@@ -593,6 +601,8 @@
name = "away team's bowman headset" name = "away team's bowman headset"
desc = "Bowman headset used by the away team for exploring. Access to the away team channel." // CHOMPAdd desc = "Bowman headset used by the away team for exploring. Access to the away team channel." // CHOMPAdd
icon_state = "exp_headset_alt" icon_state = "exp_headset_alt"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/explorer
/obj/item/radio/headset/sar /obj/item/radio/headset/sar
name = "search and rescue headset" name = "search and rescue headset"

6
code/modules/casino/headset_casino.dm
View File

@@ -3,14 +3,18 @@
desc = "An updated, modular intercom that fits over the head with extra comfortable for the hardworking casino luxury crew. Has encryption key for scamm-... Kind casino staff channel." desc = "An updated, modular intercom that fits over the head with extra comfortable for the hardworking casino luxury crew. Has encryption key for scamm-... Kind casino staff channel."
icon = 'icons/obj/casino.dmi' icon = 'icons/obj/casino.dmi'
icon_state = "headset" icon_state = "headset"
adhoc_fallback = TRUE
origin_tech = list(TECH_ILLEGAL = 1) origin_tech = list(TECH_ILLEGAL = 1)
ks1type = /obj/item/encryptionkey/casino ks1type = /obj/item/encryptionkey/casino
/obj/item/radio/headset/casino/bowman /obj/item/radio/headset/alt/casino
name = "casino bowman headset" name = "casino bowman headset"
desc = "An updated, modular intercom that fits over the head with extra comfortable for the hardworking casino luxury crew. Has encryption key for scamm-... Kind casino staff channel."
icon = 'icons/obj/casino.dmi'
icon_state = "headset_alt" icon_state = "headset_alt"
adhoc_fallback = TRUE adhoc_fallback = TRUE
origin_tech = list(TECH_ILLEGAL = 2) origin_tech = list(TECH_ILLEGAL = 2)
ks1type = /obj/item/encryptionkey/casino
/obj/item/encryptionkey/casino /obj/item/encryptionkey/casino
icon = 'icons/obj/casino.dmi' icon = 'icons/obj/casino.dmi'

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

@@ -19,7 +19,7 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1) backpack_contents = list(/obj/item/clothing/accessory/permit/gun/planetside = 1)
headset = /obj/item/radio/headset/explorer headset = /obj/item/radio/headset/explorer
headset_alt = /obj/item/radio/headset/explorer headset_alt = /obj/item/radio/headset/alt/explorer
headset_earbud = /obj/item/radio/headset/explorer headset_earbud = /obj/item/radio/headset/explorer
/decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H) /decl/hierarchy/outfit/job/explorer2/post_equip(mob/living/carbon/human/H)
@@ -54,9 +54,9 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
id_pda_assignment = JOB_PILOT id_pda_assignment = JOB_PILOT
flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL flags = OUTFIT_HAS_BACKPACK|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/alt/pilot headset = /obj/item/radio/headset/pilot
headset_alt = /obj/item/radio/headset/alt/pilot headset_alt = /obj/item/radio/headset/alt/pilot
headset_earbud = /obj/item/radio/headset/alt/pilot headset_earbud = /obj/item/radio/headset/pilot
/decl/hierarchy/outfit/job/medical/sar /decl/hierarchy/outfit/job/medical/sar
name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit name = OUTFIT_JOB_NAME("Field Medic") //VOREStation Edit
@@ -72,5 +72,5 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
headset = /obj/item/radio/headset/sar headset = /obj/item/radio/headset/sar
headset_alt = /obj/item/radio/headset/sar headset_alt = /obj/item/radio/headset/alt/sar
headset_earbud = /obj/item/radio/headset/sar headset_earbud = /obj/item/radio/headset/sar