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

[MIRROR] Headset Refactor and Selection (#9438)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
modular_chomp/code/game/machinery/vending.dm
View File

@@ -25,7 +25,7 @@
/obj/item/storage/pouch/holster = 5,
// Misc
/obj/item/radio/headset/explorer = 10,
/obj/item/radio/headset/explorer/alt = 10,
/obj/item/radio/headset/alt/explorer = 10,
/obj/item/clothing/mask/gas/explorer = 10,
/obj/item/storage/backpack/satchel/explorer = 10,
/obj/item/storage/backpack/dufflebag/explorer = 10,
@@ -203,4 +203,4 @@
//Some stuff to let sec do things
/obj/machinery/vending/nifsoft_shop
req_log_access = access_security
has_logs = 1
has_logs = 1

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

@@ -99,3 +99,24 @@
desc = "A headset with combined medical and security functionality."
icon_state = "med_headset"
ks2type = /obj/item/encryptionkey/headset_medsec
/obj/item/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset with combined medical and science functionality."
icon_state = "med_headset"
ks2type = /obj/item/encryptionkey/headset_medsci
/obj/item/radio/headset/volunteer
name = "volunteer's headset"
desc = "A headset used by volunteers to expedition teams, has access to the exploration channel."
icon_state = "pilot_headset"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/explorer
/obj/item/radio/headset/explorer
name = "explorer's headset"
desc = "Headset used by explorers for exploring. Access to the explorer channel."
/obj/item/radio/headset/alt/explorer
name = "explorer's bowman headset"
desc = "Bowman headset used by explorers for exploring. Access to the explorer channel."

12
modular_chomp/code/game/objects/structures/crate_lockers/closets/secure/security.dm
View File

@@ -10,7 +10,7 @@
/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/gun/energy/gun,
/obj/item/melee/telebaton,
/obj/item/flash,
@@ -27,7 +27,7 @@
/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/storage/box/ids = 2,
/obj/item/gun/energy/gun/compact,
/obj/item/storage/box/commandkeys,
@@ -90,7 +90,7 @@
/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/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/shield/riot,
@@ -151,7 +151,7 @@
/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/clothing/glasses/sunglasses/sechud,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/badge/holo/warden,
@@ -195,7 +195,7 @@
/obj/item/clothing/mask/gas/sechailer/swat/officer,
/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/storage/belt/security,
/obj/item/flash,
/obj/item/reagent_containers/spray/pepper,
@@ -268,7 +268,7 @@
/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/clothing/suit/storage/vest/detective,
/obj/item/taperoll/police,
/obj/item/clothing/accessory/holster/armpit,