[MIRROR] Headset Refactor and Selection (#9438)

Co-authored-by: Killian <49700375+KillianKirilenko@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2024-11-07 15:17:05 -07:00
committed by GitHub
parent dc4fba3638
commit 61a5f758ac
80 changed files with 827 additions and 564 deletions

View File

@@ -8,7 +8,8 @@
subspace_transmission = 1
canhear_range = 0 // can't hear headsets from very far away
slot_flags = SLOT_EARS
sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi')
sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi',
SPECIES_WEREBEAST = 'icons/inventory/ears/mob_vr_werebeast.dmi')
var/translate_binary = 0
var/translate_hive = 0
@@ -87,254 +88,6 @@
/obj/item/radio/headset/tgui_state(mob/user)
return GLOB.tgui_inventory_state
/obj/item/radio/headset/syndicate
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/encryptionkey/syndicate
/obj/item/radio/headset/syndicate/alt
icon_state = "syndie_headset"
item_state = "headset"
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/encryptionkey/syndicate
/obj/item/radio/headset/raider
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 1
ks1type = /obj/item/encryptionkey/raider
/obj/item/radio/headset/raider/Initialize()
. = ..()
set_frequency(RAID_FREQ)
/obj/item/radio/headset/binary
origin_tech = list(TECH_ILLEGAL = 3)
ks1type = /obj/item/encryptionkey/binary
/obj/item/radio/headset/headset_sec
name = "security radio headset"
desc = "This is used by your elite security force."
icon_state = "sec_headset"
ks2type = /obj/item/encryptionkey/headset_sec
/obj/item/radio/headset/headset_sec/alt
name = "security bowman headset"
desc = "This is used by your elite security force."
icon_state = "sec_headset_alt"
ks2type = /obj/item/encryptionkey/headset_sec
/obj/item/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset"
ks2type = /obj/item/encryptionkey/headset_eng
/obj/item/radio/headset/headset_eng/alt
name = "engineering bowman headset"
desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset_alt"
ks2type = /obj/item/encryptionkey/headset_eng
/obj/item/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments."
icon_state = "rob_headset"
ks2type = /obj/item/encryptionkey/headset_rob
/obj/item/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay."
icon_state = "med_headset"
ks2type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/headset_med/alt
name = "medical bowman headset"
desc = "A headset for the trained staff of the medbay."
icon_state = "med_headset_alt"
ks2type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/headset_sci
/obj/item/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset with combined medical and science functionality." // CHOMPEdit - Less mating
icon_state = "med_headset"
ks2type = /obj/item/encryptionkey/headset_medsci
/obj/item/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/headset_com
/obj/item/radio/headset/headset_com/alt
name = "command bowman headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/headset_com
/obj/item/radio/headset/heads/captain
name = "site manager's headset"
desc = "The headset of the boss."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/captain/alt
name = "site manager's bowman headset"
desc = "The headset of the boss."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/captain/sfr
name = "SFR headset"
desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
name = "\improper AI subspace transceiver"
desc = "Integrated AI radio transceiver."
icon = 'icons/obj/robot_component.dmi'
icon_state = "radio"
item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/ai_integrated
var/myAi = null // Atlantis: Reference back to the AI which has this radio.
var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
/obj/item/radio/headset/heads/ai_integrated/receive_range(freq, level)
if (disabledAi)
return -1 //Transciever Disabled.
return ..(freq, level, 1)
/obj/item/radio/headset/heads/rd
name = "research director's headset"
desc = "Headset of the eccentric-in-chief."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/heads/rd/alt
name = "research director's bowman headset"
desc = "Headset of the eccentric-in-chief."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/heads/hos
name = "head of security's headset"
desc = "The headset of the hardass who protects your worthless lives."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/heads/hos/alt
name = "head of security's bowman headset"
desc = "The headset of the hardass who protects your worthless lives."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/heads/ce
name = "chief engineer's headset"
desc = "The headset of the clown who is in charge of the circus."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/heads/ce/alt
name = "chief engineer's bowman headset"
desc = "The headset of the clown who is in charge of the circus."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/heads/cmo
name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/heads/cmo/alt
name = "chief medical officer's bowman headset"
desc = "The headset of the highly trained medical chief."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset"
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "."
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/headset_mine
name = "mining radio headset"
desc = "Headset used by miners. Has inbuilt short-band radio for when comms are down."
icon_state = "mine_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the QM and their cronies."
icon_state = "cargo_headset"
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/headset_cargo/alt
name = "supply bowman headset"
desc = "A bowman headset used by the QM and their cronies."
icon_state = "cargo_headset_alt"
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/headset_service
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
icon_state = "srv_headset"
ks2type = /obj/item/encryptionkey/headset_service
/obj/item/radio/headset/ert
name = "emergency response team radio headset"
desc = "The headset of the boss's boss."
icon_state = "com_headset"
centComm = 1
// freerange = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/ert/alt
name = "emergency response team bowman headset"
desc = "The headset of the boss's boss."
icon_state = "com_headset_alt"
// freerange = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/omni //Only for the admin intercoms
ks2type = /obj/item/encryptionkey/omni
/obj/item/radio/headset/ia
name = "internal affair's headset"
desc = "The headset of your worst enemy."
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/mmi_radio
name = "brain-integrated radio"
desc = "MMIs and synthetic brains are often equipped with these."
icon = 'icons/obj/robot_component.dmi'
icon_state = "radio"
item_state = "headset"
var/mmiowner = null
var/radio_enabled = 1
/obj/item/radio/headset/mmi_radio/receive_range(freq, level)
if (!radio_enabled || istype(src.loc.loc, /mob/living/silicon) || istype(src.loc.loc, /obj/item/organ/internal))
return -1 //Transciever Disabled.
return ..(freq, level, 1)
/obj/item/radio/headset/attackby(obj/item/W as obj, mob/user as mob)
// ..()
user.set_machine(src)
@@ -365,15 +118,15 @@
keyslot2 = null
recalculateChannels()
to_chat(user, "You pop out the encryption keys in the headset!")
to_chat(user, span_notice("You pop out the encryption keys in the headset!"))
playsound(src, W.usesound, 50, 1)
else
to_chat(user, "This headset doesn't have any encryption keys! How useless...")
to_chat(user, span_notice("This headset doesn't have any encryption keys! How useless..."))
if(istype(W, /obj/item/encryptionkey/))
if(keyslot1 && keyslot2)
to_chat(user, "The headset can't hold another key!")
to_chat(user, span_notice("The headset can't hold another key!"))
return
if(!keyslot1)
@@ -391,7 +144,6 @@
return
/obj/item/radio/headset/recalculateChannels(var/setDescription = 0)
src.channels = list()
src.translate_binary = 0
@@ -455,3 +207,496 @@
radio_text += ", "
radio_desc = radio_text
/obj/item/radio/headset/mob_headset/receive_range(freq, level)
if(ismob(src.loc))
return ..(freq, level, 1)
return -1
/obj/item/radio/headset/mob_headset/afterattack(var/atom/movable/target, mob/living/user, proximity)
if(!proximity)
return
if(istype(target,/mob/living/simple_mob))
var/mob/living/simple_mob/M = target
if(!M.mob_radio)
user.drop_item()
forceMove(M)
M.mob_radio = src
return
if(M.mob_radio)
M.mob_radio.forceMove(M.loc)
M.mob_radio = null
return
..()
/obj/item/radio/headset/alt
name = "bowman radio headset"
desc = "A larger, sturdier radio headset. A bit bulky, but guaranteed to stay on no matter what."
icon_state = "headset_alt"
/obj/item/radio/headset/earbud
name = "radio earbud"
desc = "A discreet radio earbud and low-profile mic. Simple and unobtrusive."
icon_state = "headset_earbud"
/obj/item/radio/headset/headset_sec
name = "security radio headset"
desc = "This headset is used by your elite security force." // CHOMPAdd
icon_state = "sec_headset"
ks2type = /obj/item/encryptionkey/headset_sec
/obj/item/radio/headset/alt/headset_sec
name = "security bowman headset"
desc = "This bowman headset is used by your elite security force." // CHOMPAdd
icon_state = "sec_headset_alt"
ks2type = /obj/item/encryptionkey/headset_sec
/obj/item/radio/headset/earbud/headset_sec
name = "security earbud"
desc = "This tiny earbud is used by your elite security force." // CHOMPAdd
icon_state = "sec_earbud"
ks2type = /obj/item/encryptionkey/headset_sec
/obj/item/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls." // CHOMPAdd
icon_state = "eng_headset"
ks2type = /obj/item/encryptionkey/headset_eng
/obj/item/radio/headset/alt/headset_eng
name = "engineering bowman headset"
desc = "When the engineers wish to chat like girls." // CHOMPAdd
icon_state = "eng_headset_alt"
ks2type = /obj/item/encryptionkey/headset_eng
/obj/item/radio/headset/earbud/headset_eng
name = "engineering earbud"
desc = "When the engineers wish to chat like girls." // CHOMPAdd
icon_state = "eng_earbud"
ks2type = /obj/item/encryptionkey/headset_eng
/obj/item/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay." // CHOMPAdd
icon_state = "med_headset"
ks2type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/alt/headset_med
name = "medical bowman headset"
desc = "A bowman headset for the trained staff of the medbay." // CHOMPAdd
icon_state = "med_headset_alt"
ks2type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/earbud/headset_med
name = "medical earbud"
desc = "A tiny earbud for the trained staff of the medbay." // CHOMPAdd
icon_state = "med_earbud"
ks2type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/headset_sci
/obj/item/radio/headset/alt/headset_sci
name = "science bowman headset"
desc = "A sciency bowman headset. Like usual." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/headset_sci
/obj/item/radio/headset/earbud/headset_sci
name = "science earbud"
desc = "A tiny sciency earbud. Like usual." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/headset_sci
/obj/item/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/headset_com
/obj/item/radio/headset/alt/headset_com
name = "command bowman headset"
desc = "A bowman headset with a commanding channel." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/headset_com
/obj/item/radio/headset/earbud/headset_com
name = "command earbud"
desc = "A tiny earbud with a commanding channel." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/headset_com
/obj/item/radio/headset/heads/captain
name = "site manager's headset"
desc = "The headset of the boss." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/captain/sfr
name = "SFR headset"
desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."
icon_state = "com_headset_alt"
/obj/item/radio/headset/alt/heads/captain
name = "site manager's bowman headset"
desc = "The bowman headset of the boss." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/earbud/heads/captain
name = "site manager's earbud"
desc = "The tiny earbud of the boss." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/rd
name = "research director's headset"
desc = "The headset of the eccentric-in-chief." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/alt/heads/rd
name = "research director's bowman headset"
desc = "The bowman headset of the eccentric-in-chief." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/earbud/heads/rd
name = "research director's earbud"
desc = "The tiny earbud of the eccentric-in-chief." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/heads/hos
name = "head of security's headset"
desc = "The headset of the hardass who protects your worthless lives." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/alt/heads/hos
name = "head of security's bowman headset"
desc = "The bowman headset of the hardass who protects your worthless lives." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/earbud/heads/hos
name = "head of security's earbud"
desc = "The tiny earbud of the hardass who protects your worthless lives." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/heads/ce
name = "chief engineer's headset"
desc = "The headset of the clown who is in charge of the circus." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/alt/heads/ce
name = "chief engineer's bowman headset"
desc = "The bowman headset of the clown who is in charge of the circus." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/earbud/heads/ce
name = "chief engineer's earbud"
desc = "The tiny earbud of the clown who is in charge of the circus." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/heads/cmo
name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/alt/heads/cmo
name = "chief medical officer's bowman headset"
desc = "The bowman headset of the highly trained medical chief." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/earbud/heads/cmo
name = "chief medical officer's earbud"
desc = "The tiny earbud of the highly trained medical chief." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/alt/heads/hop
name = "head of personnel's bowman headset"
desc = "The bowman headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/earbud/heads/hop
name = "head of personnel's earbud"
desc = "The tiny earbud of the poor fool who will one day be " + JOB_SITE_MANAGER + "." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/miner
name = "mining radio headset"
desc = "Headset used by miners. Has inbuilt short-band radio for when comms are down."
icon_state = "mine_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/cargo
name = "supply radio headset"
desc = "A headset used by the QM's slaves." // CHOMPAdd
icon_state = "cargo_headset"
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/alt/cargo
name = "supply bowman headset"
desc = "A bowman headset used by the QM's slaves." // CHOMPAdd
icon_state = "cargo_headset_alt"
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/earbud/cargo
name = "supply earbud"
desc = "A tiny earbud used by the QM's slaves." // CHOMPAdd
icon_state = "cargo_earbud"
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/qm
name = "qm radio headset"
desc = "A headset used by the QM." // CHOMPAdd
icon_state = "cargo_headset"
ks2type = /obj/item/encryptionkey/qm
/obj/item/radio/headset/alt/qm
name = "qm bowman headset"
desc = "A bowman headset used by the QM." // CHOMPAdd
icon_state = "cargo_headset_alt"
ks2type = /obj/item/encryptionkey/qm
/obj/item/radio/headset/earbud/qm
name = "qm earbud"
desc = "A tiny earbud used by the QM." // CHOMPAdd
icon_state = "cargo_earbud"
ks2type = /obj/item/encryptionkey/qm
/obj/item/radio/headset/service
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean." // CHOMPAdd
icon_state = "srv_headset"
ks2type = /obj/item/encryptionkey/headset_service
/obj/item/radio/headset/alt/service
name = "service bowman headset"
desc = "Bowman headset used by the service staff, tasked with keeping the station full, happy and clean." // CHOMPAdd
icon_state = "srv_headset_alt"
ks2type = /obj/item/encryptionkey/headset_service
/obj/item/radio/headset/earbud/service
name = "service earbud"
desc = "A tiny earbud used by the service staff, tasked with keeping the station full, happy and clean." // CHOMPAdd
icon_state = "srv_earbud"
ks2type = /obj/item/encryptionkey/headset_service
/obj/item/radio/headset/ert
name = "emergency response team radio headset"
desc = "The headset of the boss's boss." // CHOMPAdd
icon_state = "com_headset"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/alt/ert
name = "emergency response team bowman headset"
desc = "The bowman headset of the boss's boss." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/ia
name = "internal affairs headset"
desc = "The headset of your worst enemy." // CHOMPAdd
icon_state = "com_headset"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/alt/ia
name = "internal affairs bowman headset"
desc = "The bowman headset of your worst enemy." // CHOMPAdd
icon_state = "com_headset_alt"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/earbud/ia
name = "internal affairs earbud"
desc = "The tiny earbud of your worst enemy." // CHOMPAdd
icon_state = "com_earbud"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/centcom
name = "centcom radio headset"
desc = "The headset of the boss's boss." // CHOMPAdd
icon_state = "cent_headset"
item_state = "headset"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/alt/centcom
name = "centcom bowman headset"
desc = "The bowman headset of the boss's boss." // CHOMPAdd
icon_state = "com_headset_alt"
/obj/item/radio/headset/nanotrasen
name = "\improper NT radio headset"
desc = "The headset of a Nanotrasen corporate employee." // CHOMPAdd
icon_state = "nt_headset"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/alt/nanotrasen
name = "\improper NT bowman headset"
desc = "The bowman headset of a Nanotrasen corporate employee." // CHOMPAdd
icon_state = "nt_headset_alt"
/obj/item/radio/headset/pathfinder
name = "pathfinder's headset"
desc = "Headset used by pathfinders for exploring. Access to the explorer and command channels." // CHOMPAdd
icon_state = "exp_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/pathfinder
/obj/item/radio/headset/alt/pathfinder
name = "pathfinder's bowman headset"
desc = "Bowman headset used by pathfinders for exploring. Access to the explorer and command channels." // CHOMPAdd
icon_state = "exp_headset_alt"
/obj/item/radio/headset/pilot
name = "pilot's headset"
desc = "A headset used by pilots." // CHOMPAdd
icon_state = "pilot_headset"
adhoc_fallback = TRUE
/obj/item/radio/headset/alt/pilot
name = "pilot's bowman headset"
desc = "A bowman headset used by pilots." // CHOMPAdd
icon_state = "pilot_headset_alt"
/obj/item/radio/headset/explorer
name = "away team member's headset"
desc = "Headset used by the away team for exploring. Access to the away team channel." // CHOMPAdd
icon_state = "exp_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/explorer
/obj/item/radio/headset/alt/explorer
name = "away team's bowman headset"
desc = "Bowman headset used by the away team for exploring. Access to the away team channel." // CHOMPAdd
icon_state = "exp_headset_alt"
/obj/item/radio/headset/sar
name = "search and rescue headset"
desc = "A headset for field medics." // CHOMPAdd
icon_state = "sar_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/sar
/obj/item/radio/headset/alt/sar
name = "search and rescue bowman headset"
desc = "A bowman headset for field medics." // CHOMPAdd
icon_state = "sar_headset_alt"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/sar
/obj/item/radio/headset/talon
name = "talon headset"
desc = "A headset for communication between the crew of the ITV Talon." // CHOMPAdd
adhoc_fallback = TRUE
icon_state = "pilot_headset"
ks2type = /obj/item/encryptionkey/talon
/obj/item/radio/headset/alt/talon
name = "talon bowman headset"
desc = "A bowman headset for communication between the crew of the ITV Talon." // CHOMPAdd
adhoc_fallback = TRUE
icon_state = "pilot_headset"
ks2type = /obj/item/encryptionkey/talon
/obj/item/radio/headset/earbud/talon
name = "talon earbud"
desc = "A tiny earbud for communication between the crew of the ITV Talon." // CHOMPAdd
adhoc_fallback = TRUE
icon_state = "pilot_headset"
ks2type = /obj/item/encryptionkey/talon
/obj/item/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments." // CHOMPAdd
icon_state = "rob_headset"
ks2type = /obj/item/encryptionkey/headset_rob
// Special Antag/Admin/Event/Other headsets
/obj/item/radio/headset/syndicate
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/encryptionkey/syndicate
/obj/item/radio/headset/alt/syndicate
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/encryptionkey/syndicate
/obj/item/radio/headset/earbud/syndicate
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/encryptionkey/syndicate
/obj/item/radio/headset/raider
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 1
ks1type = /obj/item/encryptionkey/raider
/obj/item/radio/headset/raider/Initialize()
. = ..()
set_frequency(RAID_FREQ)
/obj/item/radio/headset/binary
origin_tech = list(TECH_ILLEGAL = 3)
ks1type = /obj/item/encryptionkey/binary
/obj/item/radio/headset/omni //Only for the admin intercoms
ks2type = /obj/item/encryptionkey/omni
/obj/item/radio/headset/mmi_radio
name = "brain-integrated radio"
desc = "MMIs and synthetic brains are often equipped with these." // CHOMPAdd
icon = 'icons/obj/robot_component.dmi'
icon_state = "radio"
item_state = "headset"
var/mmiowner = null
var/radio_enabled = 1
/obj/item/radio/headset/mmi_radio/receive_range(freq, level)
if (!radio_enabled || istype(src.loc.loc, /mob/living/silicon) || istype(src.loc.loc, /obj/item/organ/internal))
return -1 //Transciever Disabled.
return ..(freq, level, 1)
/obj/item/radio/headset/mob_headset //Adminbus headset for simplemob shenanigans.
name = "nonhuman radio receiver"
desc = "An updated, self-adhesive modular intercom that requires no hands to operate or ears to hold, just stick it on. Takes encryption keys"
/obj/item/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
name = "\improper AI subspace transceiver"
desc = "Integrated AI radio transceiver."
icon = 'icons/obj/robot_component.dmi'
icon_state = "radio"
item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/ai_integrated
var/myAi = null // Atlantis: Reference back to the AI which has this radio.
var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
/obj/item/radio/headset/heads/ai_integrated/receive_range(freq, level)
if (disabledAi)
return -1 //Transciever Disabled.
return ..(freq, level, 1)

View File

@@ -1,131 +0,0 @@
/obj/item/radio/headset/centcom
name = "centcom radio headset"
desc = "The headset of the boss's boss."
icon_state = "cent_headset"
item_state = "headset"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/centcom/alt
name = "centcom bowman headset"
icon_state = "com_headset_alt"
/obj/item/radio/headset/nanotrasen
name = "\improper NT radio headset"
desc = "The headset of a Nanotrasen corporate employee."
icon_state = "nt_headset"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/nanotrasen/alt
name = "\improper NT bowman headset"
icon_state = "nt_headset_alt"
/obj/item/radio/headset
sprite_sheets = list(SPECIES_TESHARI = 'icons/inventory/ears/mob_teshari.dmi',
SPECIES_WEREBEAST = 'icons/inventory/ears/mob_vr_werebeast.dmi')
/obj/item/radio/headset/mob_headset //Adminbus headset for simplemob shenanigans.
name = "nonhuman radio receiver"
desc = "An updated, self-adhesive modular intercom that requires no hands to operate or ears to hold, just stick it on. Takes encryption keys"
/obj/item/radio/headset/mob_headset/receive_range(freq, level)
if(ismob(src.loc))
return ..(freq, level, 1)
return -1
/obj/item/radio/headset/mob_headset/afterattack(var/atom/movable/target, mob/living/user, proximity)
if(!proximity)
return
if(istype(target,/mob/living/simple_mob))
var/mob/living/simple_mob/M = target
if(!M.mob_radio)
user.drop_item()
forceMove(M)
M.mob_radio = src
return
if(M.mob_radio)
M.mob_radio.forceMove(M.loc)
M.mob_radio = null
return
..()
/obj/item/radio/headset/headset_cargo
desc = "A headset used by the QM's slaves."
/obj/item/radio/headset/headset_cargo/alt
desc = "A bowman headset used by the QM's slaves."
/obj/item/radio/headset/headset_qm
name = "qm radio headset"
desc = "A headset used by the QM."
icon_state = "cargo_headset"
ks2type = /obj/item/encryptionkey/qm
/obj/item/radio/headset/headset_qm/alt
name = "qm bowman headset"
desc = "A bowman headset used by the QM."
icon_state = "cargo_headset_alt"
/obj/item/radio/headset/pathfinder
name = "pathfinder's headset"
desc = "Headset used by pathfinders for exploring. Access to the explorer and command channels."
icon_state = "exp_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/pathfinder
/obj/item/radio/headset/pathfinder/alt
name = "pathfinder's bowman headset"
desc = "Bowman headset used by pathfinders for exploring. Access to the explorer and command channels."
icon_state = "exp_headset_alt"
/obj/item/radio/headset/pilot
name = "pilot's headset"
desc = "A headset used by pilots."
icon_state = "pilot_headset"
adhoc_fallback = TRUE
/obj/item/radio/headset/pilot/alt
name = "pilot's bowman headset"
desc = "A bowman headset used by pilots."
icon_state = "pilot_headset_alt"
/obj/item/radio/headset/explorer
name = "explorer's headset" //CHOMP explo keep
desc = "Headset used by explorers for exploring. Access to the explorer channel." //CHOMP explo keep
icon_state = "exp_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/explorer
/obj/item/radio/headset/explorer/alt
name = "explorer's bowman headset" //CHOMP explo keep
desc = "Bowman headset used by explorers for exploring. Access to the explorer channel." //CHOMP explo keep
icon_state = "exp_headset_alt"
/obj/item/radio/headset/sar
name = "fm radio headset"
desc = "A headset for field medics."
icon_state = "sar_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/sar
/obj/item/radio/headset/sar/alt
name = "fm radio bowman headset"
desc = "A bowman headset for field medics."
icon_state = "sar_headset_alt"
//CHOMP explo removed wide comment field
/obj/item/radio/headset/volunteer
name = "volunteer's headset"
desc = "A headset used by volunteers to expedition teams, has access to the exploration channel." //CHOMP explo keep
icon_state = "pilot_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/explorer
//CHOMP explo keep removed wide comment field end
/obj/item/radio/headset/talon
name = "talon headset"
desc = "A headset for communication between the crew of the ITV Talon."
adhoc_fallback = TRUE
icon_state = "pilot_headset"
ks2type = /obj/item/encryptionkey/talon

View File

@@ -223,8 +223,8 @@
/obj/random/sfr/item_to_spawn()
return pick(prob(25);/obj/item/radio/headset/heads/captain/sfr,
prob(25);/obj/item/radio/headset/headset_cargo/alt,
prob(25);/obj/item/radio/headset/headset_com/alt,
prob(25);/obj/item/radio/headset/alt/cargo,
prob(25);/obj/item/radio/headset/alt/headset_com,
prob(25);/obj/item/radio/headset)
// Mining Goodies

View File

@@ -23,7 +23,9 @@
starts_with = list(
/obj/item/clothing/head/that = 2,
/obj/item/radio/headset/headset_service = 2,
/obj/item/radio/headset/service = 2,
/obj/item/radio/headset/alt/service = 2,
/obj/item/radio/headset/earbud/service = 2,
/obj/item/clothing/head/pin/flower,
/obj/item/clothing/head/pin/flower/pink,
/obj/item/clothing/head/pin/flower/yellow,
@@ -51,7 +53,9 @@
starts_with = list(
/obj/item/clothing/under/sundress,
/obj/item/clothing/under/waiter = 2,
/obj/item/radio/headset/headset_service = 2,
/obj/item/radio/headset/service = 2,
/obj/item/radio/headset/alt/service = 2,
/obj/item/radio/headset/earbud/service = 2,
/obj/item/storage/box/mousetraps = 2,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/head/chefhat,
@@ -69,7 +73,9 @@
starts_with = list(
/obj/item/clothing/under/rank/janitor,
/obj/item/clothing/under/dress/maid/janitor,
/obj/item/radio/headset/headset_service,
/obj/item/radio/headset/service,
/obj/item/radio/headset/alt/service,
/obj/item/radio/headset/earbud/service,
/obj/item/cartridge/janitor,
/obj/item/clothing/suit/storage/hooded/wintercoat/janitor,
/obj/item/clothing/gloves/black,

View File

@@ -63,7 +63,7 @@
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/radio/headset/explorer,
/obj/item/radio/headset/explorer/alt,
/obj/item/radio/headset/alt/explorer,
/obj/item/cartridge/explorer,
/obj/item/flashlight,
/obj/item/gps/explorer,
@@ -106,7 +106,7 @@
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/clothing/gloves/black,
/obj/item/radio/headset/pathfinder,
/obj/item/radio/headset/pathfinder/alt,
/obj/item/radio/headset/alt/pathfinder,
/obj/item/cartridge/explorer,
/obj/item/flashlight,
/obj/item/gps/explorer,
@@ -157,7 +157,7 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar,
/obj/item/clothing/shoes/boots/winter/explorer,
/obj/item/radio/headset/sar,
/obj/item/radio/headset/sar/alt,
/obj/item/radio/headset/alt/sar,
/obj/item/cartridge/sar,
/obj/item/flashlight,
/obj/item/tank/emergency/oxygen/engi,
@@ -206,7 +206,7 @@
/obj/item/clothing/shoes/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/radio/headset/pilot,
/obj/item/radio/headset/pilot/alt,
/obj/item/radio/headset/alt/pilot,
/obj/item/flashlight,
/obj/item/reagent_containers/food/snacks/liquidfood,
/obj/item/reagent_containers/food/snacks/liquidprotein,

View File

@@ -11,8 +11,9 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo,
/obj/item/clothing/shoes/boots/winter/supply,
/obj/item/clothing/shoes/black,
/obj/item/radio/headset/headset_cargo,
/obj/item/radio/headset/headset_cargo/alt,
/obj/item/radio/headset/cargo,
/obj/item/radio/headset/alt/cargo,
/obj/item/radio/headset/earbud/cargo,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/head/soft)
@@ -37,8 +38,9 @@
/obj/item/clothing/under/rank/cargo/jeans,
/obj/item/clothing/under/rank/cargo/jeans/female,
/obj/item/clothing/shoes/brown,
/obj/item/radio/headset/headset_qm, //VOREStation Edit,
/obj/item/radio/headset/headset_qm/alt, //VOREStation Edit,
/obj/item/radio/headset/qm,
/obj/item/radio/headset/alt/qm,
/obj/item/radio/headset/earbud/qm,
/obj/item/clothing/under/rank/neo_qm,
/obj/item/clothing/under/rank/neo_qm_skirt,
/obj/item/clothing/under/rank/neo_qm_jacket,
@@ -73,7 +75,7 @@
closet_appearance = /decl/closet_appearance/secure_closet/mining
starts_with = list(
/obj/item/radio/headset/headset_mine,
/obj/item/radio/headset/miner,
/obj/item/clothing/under/rank/miner,
/obj/item/clothing/gloves/black,
/obj/item/clothing/shoes/black,
@@ -104,7 +106,7 @@
closet_appearance = /decl/closet_appearance/secure_closet/lumber
starts_with = list(
/obj/item/radio/headset/headset_mine,
/obj/item/radio/headset/miner,
/obj/item/clothing/under/overalls,
/obj/item/clothing/gloves/light_brown,
/obj/item/clothing/gloves/black,
@@ -123,4 +125,4 @@
starts_with += /obj/item/storage/backpack/industrial
else
starts_with += /obj/item/storage/backpack/satchel/eng
return ..()
return ..()

View File

@@ -45,7 +45,7 @@
/obj/item/clothing/under/rank/khi/sec/pilot,
/obj/item/clothing/gloves/fingerless,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/storage/belt/security,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/storage/box/flare,
@@ -67,4 +67,4 @@
starts_with = list(
/obj/item/radio/off,
/obj/item/gps
)
)

View File

@@ -20,7 +20,8 @@
/obj/item/clothing/shoes/brown,
/obj/item/cartridge/ce,
/obj/item/radio/headset/heads/ce,
/obj/item/radio/headset/heads/ce/alt,
/obj/item/radio/headset/alt/heads/ce,
/obj/item/radio/headset/earbud/heads/ce,
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/suit/storage/hazardvest,
///obj/item/clothing/mask/gas, //VOREStation Removal: Locker bloat, grr. The fancy one below functions as a mask & helmet combined.
@@ -95,7 +96,8 @@
/obj/item/clothing/accessory/storage/brown_vest,
/obj/item/storage/toolbox/mechanical,
/obj/item/radio/headset/headset_eng,
/obj/item/radio/headset/headset_eng/alt,
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/clothing/mask/gas,
/obj/item/clothing/glasses/meson,
@@ -132,7 +134,8 @@
/obj/item/extinguisher/atmo,
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/radio/headset/headset_eng,
/obj/item/radio/headset/headset_eng/alt,
/obj/item/radio/headset/alt/headset_eng,
/obj/item/radio/headset/earbud/headset_eng,
/obj/item/clothing/suit/storage/hazardvest/atmos, //VOREStation edit. Eng locker gets regular haz-vest, atmos gets the themed one of their own
/obj/item/clothing/mask/gas,
/obj/item/cartridge/atmos,

View File

@@ -8,7 +8,9 @@
/obj/item/clothing/under/rank/hydroponics,
/obj/item/clothing/gloves/botanic_leather,
/obj/item/analyzer/plant_analyzer,
/obj/item/radio/headset/headset_service,
/obj/item/radio/headset/service,
/obj/item/radio/headset/alt/service,
/obj/item/radio/headset/earbud/service,
/obj/item/clothing/head/greenbandana,
/obj/item/shovel/spade,
/obj/item/material/minihoe,

View File

@@ -38,7 +38,8 @@
/obj/item/clothing/shoes/white,
/obj/item/cartridge/medical,
/obj/item/radio/headset/headset_med,
/obj/item/radio/headset/headset_med/alt,
/obj/item/radio/headset/alt/headset_med,
/obj/item/radio/headset/earbud/headset_med,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt,
/obj/item/clothing/shoes/boots/winter/medical,
@@ -107,7 +108,9 @@
/obj/item/clothing/suit/storage/toggle/labcoat/emt,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/para,
/obj/item/clothing/shoes/boots/winter/medical,
/obj/item/radio/headset/headset_med/alt,
/obj/item/radio/headset/headset_med,
/obj/item/radio/headset/alt/headset_med,
/obj/item/radio/headset/earbud/headset_med,
/obj/item/cartridge/medical,
/obj/item/storage/briefcase/inflatable,
/obj/item/flashlight,
@@ -142,7 +145,8 @@
/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
/obj/item/clothing/under/rank/neo_cmo_gorka,
/obj/item/radio/headset/heads/cmo,
/obj/item/radio/headset/heads/cmo/alt,
/obj/item/radio/headset/alt/heads/cmo,
/obj/item/radio/headset/earbud/heads/cmo,
/obj/item/flash,
/obj/item/reagent_containers/hypospray/vial,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical,

View File

@@ -45,7 +45,8 @@
/obj/item/clothing/shoes/laceup/brown,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/radio/headset/heads/rd,
/obj/item/radio/headset/heads/rd/alt,
/obj/item/radio/headset/alt/heads/rd,
/obj/item/radio/headset/earbud/heads/rd,
/obj/item/tank/air,
/obj/item/clothing/mask/gas,
/obj/item/flash,

View File

@@ -10,7 +10,8 @@
/obj/item/cartridge/captain,
/obj/item/storage/lockbox/medal,
/obj/item/radio/headset/heads/captain,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/radio/headset/alt/heads/captain,
/obj/item/radio/headset/earbud/heads/captain,
/obj/item/gun/energy/gun,
/obj/item/melee/telebaton,
/obj/item/flash,
@@ -27,7 +28,8 @@
/obj/item/clothing/head/helmet,
/obj/item/cartridge/hop,
/obj/item/radio/headset/heads/hop,
/obj/item/radio/headset/heads/hop/alt,
/obj/item/radio/headset/alt/heads/hop,
/obj/item/radio/headset/earbud/heads/hop,
/obj/item/storage/box/ids = 2,
/obj/item/gun/energy/gun/compact,
/obj/item/storage/box/commandkeys,
@@ -90,7 +92,8 @@
/obj/item/clothing/head/helmet/dermal,
/obj/item/cartridge/hos,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/radio/headset/alt/heads/hos,
/obj/item/radio/headset/earbud/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/shield/riot,
@@ -153,7 +156,8 @@
/obj/item/clothing/under/rank/neo_sec_gorka,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
@@ -199,7 +203,8 @@
/obj/item/clothing/mask/gas/sechailer/swat/officer, //CHOMP ADD
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
@@ -272,7 +277,8 @@
/obj/item/storage/belt/detective,
/obj/item/storage/box/evidence,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/clothing/suit/storage/vest/detective,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/holster/armpit,

View File

@@ -31,7 +31,8 @@
/obj/item/clothing/head/helmet/HoS/hat/blue,
/obj/item/clothing/head/helmet/dermal,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/radio/headset/alt/heads/hos,
/obj/item/radio/headset/earbud/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/storage/belt/security,
/obj/item/clothing/accessory/holster/waist,
@@ -86,7 +87,8 @@
/obj/item/clothing/head/helmet,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/storage/belt/security,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
@@ -132,7 +134,8 @@
/obj/item/clothing/head/helmet/dermal,
/obj/item/cartridge/hos,
/obj/item/radio/headset/heads/hos,
/obj/item/radio/headset/heads/hos/alt,
/obj/item/radio/headset/alt/heads/hos,
/obj/item/radio/headset/earbud/heads/hos,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/shield/riot,
@@ -179,7 +182,8 @@
/obj/item/clothing/head/helmet/warden,
/obj/item/cartridge/security,
/obj/item/radio/headset/headset_sec,
/obj/item/radio/headset/headset_sec/alt,
/obj/item/radio/headset/alt/headset_sec,
/obj/item/radio/headset/earbud/headset_sec,
/obj/item/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
@@ -214,7 +218,8 @@
/obj/item/cartridge/captain,
/obj/item/storage/lockbox/medal,
/obj/item/radio/headset/heads/captain,
/obj/item/radio/headset/heads/captain/alt,
/obj/item/radio/headset/alt/heads/captain,
/obj/item/radio/headset/earbud/heads/captain,
/obj/item/gunbox/captain,
/obj/item/melee/telebaton,
/obj/item/flash,

View File

@@ -424,7 +424,7 @@
/obj/item/clothing/under/rank/centcom,
/obj/item/clothing/under/ert,
/obj/item/clothing/under/syndicate/combat,
/obj/item/radio/headset/ert/alt,
/obj/item/radio/headset/alt/ert,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/swat,
/obj/item/clothing/gloves/swat,

View File

@@ -3,13 +3,14 @@
closet_appearance = /decl/closet_appearance/tactical/alt //because ert lockers are red for some dumb reason
starts_with = list(
/obj/item/clothing/under/ert,
/obj/item/radio/headset/ert/alt,
/obj/item/radio/headset/ert,
/obj/item/radio/headset/alt/ert,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/swat,
/obj/item/clothing/gloves/swat,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/mask/balaclava)
//would you believe mercs have no official locker? well, now they do. basically just a rebranded ERT locker but hey, it's an option. -Killian
/obj/structure/closet/wardrobe/merc
name = "mercenary equipment"
@@ -18,7 +19,9 @@
starts_with = list(
/obj/item/clothing/under/tactical,
/obj/item/clothing/under/syndicate/combat,
/obj/item/radio/headset/syndicate/alt,
/obj/item/radio/headset/syndicate,
/obj/item/radio/headset/alt/syndicate,
/obj/item/radio/headset/earbud/syndicate,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/shoes/boots/combat,
/obj/item/clothing/gloves/combat,