New radio sprites, to match the new PDAs (and also bowmans) (#7455)

This commit is contained in:
Wowzewow (Wezzy)
2019-11-23 22:12:30 +08:00
committed by Werner
parent 805fe17fcf
commit 44bc8543ed
12 changed files with 372 additions and 182 deletions

View File

@@ -14,7 +14,7 @@
belt = /obj/item/storage/belt/utility/full
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/device/radio/headset/syndicate
l_ear = /obj/item/device/radio/headset/syndicate/alt
id = /obj/item/card/id/syndicate
r_pocket = /obj/item/device/radio/uplink
backpack_contents = list(

View File

@@ -133,7 +133,7 @@
uniform = /obj/item/clothing/under/rank/cargo
pda = /obj/item/device/pda/quartermaster
shoes = /obj/item/clothing/shoes/brown
l_ear = /obj/item/device/radio/headset/headset_cargo
l_ear = /obj/item/device/radio/headset/qm
l_hand = /obj/item/clipboard
glasses = /obj/item/clothing/glasses/sunglasses
@@ -192,7 +192,7 @@
pda = /obj/item/device/pda/shaftminer
id = /obj/item/card/id/silver
shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/device/radio/headset/headset_cargo
l_ear = /obj/item/device/radio/headset/headset_mining
backpack_contents = list(
/obj/item/crowbar = 1,

View File

@@ -1,6 +1,6 @@
/obj/item/device/radio/headset
name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
var/radio_desc = ""
icon_state = "headset"
item_state = "headset"
@@ -69,179 +69,6 @@
return ..(freq, level)
return -1
/obj/item/device/radio/headset/hivenet
translate_hivenet = 1
ks1type = /obj/item/device/encryptionkey/hivenet
/obj/item/device/radio/headset/syndicate
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/device/encryptionkey/syndicate
/obj/item/device/radio/headset/raider
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 1
ks1type = /obj/item/device/encryptionkey/raider
/obj/item/device/radio/headset/ninja
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/device/encryptionkey/ninja
/obj/item/device/radio/headset/binary
origin_tech = list(TECH_ILLEGAL = 3)
ks1type = /obj/item/device/encryptionkey/binary
/obj/item/device/radio/headset/headset_sec
name = "security radio headset"
desc = "This is used by your elite security force."
icon_state = "sec_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments."
icon_state = "rob_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay."
icon_state = "med_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset that is a result of the mating between medical and science."
icon_state = "med_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
desc = "The headset of the boss."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/captain
/obj/item/device/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/device/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/device/radio/headset/heads/ai_integrated/receive_range(freq, level)
if (disabledAi)
return -1 //Transciever Disabled.
return ..(freq, level, 1)
/obj/item/device/radio/headset/heads/ai_integrated/Destroy()
myAi = null
return ..()
/obj/item/device/radio/headset/heads/rd
name = "research director's headset"
desc = "Headset of the researching God."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/hos
name = "head of security's headset"
desc = "The headset of the man who protects your worthless lifes."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/ce
name = "chief engineer's headset"
desc = "The headset of the guy who is in charge of morons."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/cmo
name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the QM and their slaves."
icon_state = "cargo_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/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"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/ert
name = "emergency response team radio headset"
desc = "The headset of the boss's boss."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/legion
name = "Tau Ceti Foreign Legion radio headset"
desc = "The headset used by NanoTrasen sanctioned response forces."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/onlyert
/obj/item/device/radio/headset/distress
name = "specialist radio headset"
desc = "A headset used by specialists."
ks2type = /obj/item/device/encryptionkey/onlyert
/obj/item/device/radio/headset/representative
name = "representative headset"
desc = "The headset of your worst enemy."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/attackby(obj/item/W as obj, mob/user as mob)
// ..()
user.set_machine(src)
@@ -366,3 +193,304 @@
radio_text += ", "
radio_desc = radio_text
/obj/item/device/radio/headset/alt
name = "bowman headset"
icon_state = "headset_alt"
item_state = "headset_alt"
/*
* Civillian
*/
/obj/item/device/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"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
icon_state = "hop_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset"
icon_state = "hop_headset_alt"
item_state = "com_headset_alt"
/*
* Engineering
*/
/obj/item/device/radio/headset/headset_eng
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_eng/alt
name = "engineering bowman headset"
icon_state = "eng_headset_alt"
item_state = "eng_headset_alt"
/obj/item/device/radio/headset/heads/ce
name = "chief engineer's headset"
desc = "The headset of the guy who is in charge of morons."
icon_state = "ce_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/ce/alt
name = "chief engineer's bowman headset"
icon_state = "ce_headset_alt"
item_state = "com_headset_alt"
/*
* Cargo
*/
/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the quartermaster's slaves."
icon_state = "cargo_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/headset_cargo/alt
name = "cargo bowman headset"
icon_state = "cargo_headset_alt"
/obj/item/device/radio/headset/headset_mining
name = "mining radio headset"
desc = "Headset used by dwarves. It has an inbuilt subspace antenna for better reception."
icon_state = "mine_headset"
item_state = "headset"
ks1type = /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/headset_mining/alt
name = "mining bowman radio headset"
icon_state = "mine_headset_alt"
/obj/item/device/radio/headset/qm
name = "quartermaster's headset"
desc = "A headset used by the head honcho of paper pushing."
icon_state = "qm_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/qm/alt
name = "quartermaster bowman headset"
icon_state = "qm_headset_alt"
item_state = "headset_alt"
/*
* Medical
*/
/obj/item/device/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay."
icon_state = "med_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_med/alt
name = "medical bowman headset"
icon_state = "med_headset_alt"
item_state = "med_headset_alt"
/obj/item/device/radio/headset/heads/cmo
name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief."
icon_state = "cmo_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/cmo/alt
name = "chief medical officer's bowman headset"
icon_state = "cmo_headset_alt"
item_state = "com_headset_alt"
/*
* Science
*/
/obj/item/device/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual."
icon_state = "sci_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_sci/alt
name = "science bowman headset"
icon_state = "sci_headset_alt"
item_state = "sci_headset_alt"
/obj/item/device/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments."
icon_state = "rob_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/heads/rd
name = "research director's headset"
desc = "Headset of the researching God."
icon_state = "rd_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/rd/alt
name = "research director's bowman headset"
icon_state = "rd_headset_alt"
item_state = "com_headset_alt"
/*
* Security
*/
/obj/item/device/radio/headset/headset_sec
name = "security radio headset"
desc = "This is used by your elite security force."
icon_state = "sec_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_sec/alt
name = "security bowman headset"
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
/obj/item/device/radio/headset/heads/hos
name = "head of security's headset"
desc = "The headset of the man who protects your worthless lifes."
icon_state = "hos_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/hos/alt
name = "head of security's bowman headset"
icon_state = "hos_headset_alt"
item_state = "com_headset_alt"
/*
* Captain
*/
/obj/item/device/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/headset_com/alt
name = "command bowman headset"
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
desc = "The headset of the boss."
icon_state = "cap_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/captain/alt
name = "captain's bowman headset"
icon_state = "cap_headset_alt"
item_state = "com_headset_alt"
/*
* Misc
*/
/obj/item/device/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset that is a result of the mating between medical and science."
icon_state = "medsci_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/hivenet
translate_hivenet = 1
ks1type = /obj/item/device/encryptionkey/hivenet
/obj/item/device/radio/headset/syndicate
name = "military headset"
icon_state = "syn_headset"
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/device/encryptionkey/syndicate
/obj/item/device/radio/headset/syndicate/alt
name = "military bowman headset"
icon_state = "syn_headset_alt"
item_state = "syn_headset_alt"
/obj/item/device/radio/headset/raider
icon_state = "syn_headset"
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 1
ks1type = /obj/item/device/encryptionkey/raider
/obj/item/device/radio/headset/ninja
icon_state = "syn_headset"
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1
ks1type = /obj/item/device/encryptionkey/ninja
/obj/item/device/radio/headset/binary
origin_tech = list(TECH_ILLEGAL = 3)
ks1type = /obj/item/device/encryptionkey/binary
/obj/item/device/radio/headset/ert
name = "emergency response team radio headset"
desc = "The headset of the boss's boss."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/ert
/obj/item/device/radio/headset/legion
name = "Tau Ceti Foreign Legion radio headset"
desc = "The headset used by NanoTrasen sanctioned response forces."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/onlyert
/obj/item/device/radio/headset/distress
name = "specialist radio headset"
desc = "A headset used by specialists."
ks2type = /obj/item/device/encryptionkey/onlyert
/obj/item/device/radio/headset/representative
name = "representative headset"
desc = "The headset of your worst enemy."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/headset_com
/obj/item/device/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/device/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/device/radio/headset/heads/ai_integrated/receive_range(freq, level)
if (disabledAi)
return -1 //Transciever Disabled.
return ..(freq, level, 1)
/obj/item/device/radio/headset/heads/ai_integrated/Destroy()
myAi = null
return ..()

View File

@@ -32,7 +32,8 @@
/obj/structure/closet/secure_closet/quartermaster/fill()
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/device/radio/headset/qm(src)
new /obj/item/device/radio/headset/qm/alt(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/cartridge/quartermaster(src)
new /obj/item/clothing/suit/fire/firefighter(src)

View File

@@ -27,6 +27,7 @@
new /obj/item/clothing/shoes/brown(src)
new /obj/item/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
@@ -54,6 +55,7 @@
new /obj/item/clothing/under/rank/chief_engineer(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/clothing/accessory/storage/overalls/chief(src)
/obj/structure/closet/secure_closet/engineering_electrical
@@ -123,6 +125,7 @@
new /obj/item/clothing/accessory/storage/webbing(src)
new /obj/item/storage/toolbox/mechanical(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
@@ -155,6 +158,7 @@
new /obj/item/device/flashlight(src)
new /obj/item/extinguisher(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/suit/storage/hazardvest/blue/atmos(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/cartridge/atmos(src)

View File

@@ -83,6 +83,7 @@
new /obj/item/clothing/suit/storage/toggle/fr_jacket(src)
new /obj/item/clothing/shoes/medical(src)
new /obj/item/device/radio/headset/headset_med(src)
new /obj/item/device/radio/headset/headset_med/alt(src)
new /obj/item/clothing/glasses/hud/health/aviator(src)
new /obj/item/clothing/glasses/eyepatch/hud/medical(src)
new /obj/item/clothing/suit/storage/medical_chest_rig(src)
@@ -110,6 +111,7 @@
new /obj/item/cartridge/cmo(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/device/radio/headset/heads/cmo(src)
new /obj/item/device/radio/headset/heads/cmo/alt(src)
new /obj/item/device/flash(src)
new /obj/item/reagent_containers/hypospray/cmo(src)
new /obj/item/clothing/suit/storage/toggle/labcoat/cmo(src)

View File

@@ -9,7 +9,8 @@
new /obj/item/storage/backpack(src)
else
new /obj/item/storage/backpack/satchel_norm(src)
new /obj/item/device/radio/headset( src )
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset/alt(src)
/obj/structure/closet/secure_closet/personal/patient
name = "patient's closet"
@@ -43,9 +44,9 @@
icon_state = icon_opened
/obj/structure/closet/secure_closet/personal/cabinet/fill()
new /obj/item/storage/backpack/satchel/withwallet( src )
new /obj/item/device/radio/headset( src )
new /obj/item/storage/backpack/satchel/withwallet(src)
new /obj/item/device/radio/headset(src)
new /obj/item/device/radio/headset/alt(src)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W as obj, mob/user as mob)
if (opened)

View File

@@ -13,6 +13,7 @@
new /obj/item/clothing/suit/storage/toggle/labcoat(src)
new /obj/item/clothing/shoes/science(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/device/radio/headset/headset_sci/alt(src)
new /obj/item/tank/air(src)
new /obj/item/clothing/mask/gas(src)
@@ -39,6 +40,7 @@
new /obj/item/clothing/shoes/leather(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/device/radio/headset/heads/rd/alt(src)
new /obj/item/tank/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/flash(src)
@@ -64,3 +66,4 @@
new /obj/item/clothing/shoes/leather(src)
new /obj/item/clothing/gloves/latex(src)
new /obj/item/device/radio/headset/heads/rd(src)
new /obj/item/device/radio/headset/heads/rd/alt(src)

View File

@@ -27,6 +27,7 @@
new /obj/item/clothing/under/captainformal(src)
//Tools
new /obj/item/device/radio/headset/heads/captain(src)
new /obj/item/device/radio/headset/heads/captain/alt(src)
new /obj/item/cartridge/captain(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/device/flash(src)
@@ -78,6 +79,7 @@
//Tools
new /obj/item/cartridge/hop(src)
new /obj/item/device/radio/headset/heads/hop(src)
new /obj/item/device/radio/headset/heads/hop/alt(src)
new /obj/item/gun/energy/pistol(src)
new /obj/item/gun/projectile/sec/flash(src)
new /obj/item/device/flash(src)
@@ -139,6 +141,7 @@
//Tools
new /obj/item/cartridge/hos(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/device/radio/headset/heads/hos/alt(src)
new /obj/item/storage/box/tranquilizer(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/clothing/glasses/sunglasses/sechud/head(src)
@@ -177,6 +180,7 @@
//Tools
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/device/radio/headset/heads/hos/alt(src)
//Belts
new /obj/item/storage/belt/security(src)
new /obj/item/clothing/accessory/holster/waist(src)
@@ -218,6 +222,7 @@
//Tools
new /obj/item/cartridge/security(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/taperoll/police(src)
@@ -253,6 +258,7 @@
new /obj/item/clothing/under/rank/cadet(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/device/flash(src)
new /obj/item/reagent_containers/spray/pepper(src)
new /obj/item/taperoll/police(src)
@@ -288,6 +294,7 @@
new /obj/item/clothing/head/helmet(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/glasses/sunglasses/sechud/aviator(src)
new /obj/item/clothing/glasses/sunglasses/sechud(src)
new /obj/item/ammo_magazine/c45m/rubber(src)
@@ -350,6 +357,7 @@
new /obj/item/clothing/shoes/brown(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/clothing/suit/storage/vest/detective(src)
new /obj/item/ammo_magazine/c38(src)
new /obj/item/ammo_magazine/c38(src)
@@ -380,6 +388,7 @@
new /obj/item/clothing/shoes/laceup(src)
//Tools
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/radio/headset/headset_sec/alt(src)
new /obj/item/storage/box/evidence(src)
new /obj/item/device/flash(src)
new /obj/item/taperoll/police(src)