Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ROADMAP] tightens communications #3060

Merged
3 commits merged into from
Apr 21, 2023
Merged

[ROADMAP] tightens communications #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7398e92
[ROADMAP] tightens communications
ItsVyzo Apr 13, 2023
17da5d0
Merge branch 'master' into tighter_comms
ItsVyzo Apr 18, 2023
7efde1e
IOs get some stuff back
Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/machinery/vending/vendor_types/intelligence_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list(
GLOBAL_LIST_INIT(cm_vending_clothing_intelligence_officer, list(
list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null),
list("Gloves", 0, /obj/item/clothing/gloves/marine/insulated, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("Headset", 0, /obj/item/device/radio/headset/almayer/intel, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY),
list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),

list("ARMOR (CHOOSE 1)", 0, null, null, null),
Expand Down
132 changes: 78 additions & 54 deletions code/game/objects/items/devices/radio/encryptionkey.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
icon_state = "binary_key"
translate_apollo = TRUE



/obj/item/device/encryptionkey/public
name = "Public Radio Encryption Key"
icon_state = "stripped_key"
Expand All @@ -28,6 +26,25 @@
icon_state = "stripped_key"
channels = list(RADIO_CHANNEL_COLONY= TRUE)

// MARINE ONE CHANNEL

/obj/item/device/encryptionkey/command
name = "Command Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE)

/obj/item/device/encryptionkey/jtac
name = "\improper JTAC Radio Encryption Key"
icon_state = "jtac_key"
channels = list(RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_REQ = TRUE)

/obj/item/device/encryptionkey/intel
name = "\improper Intel Radio Encryption Key"
icon_state = "jtac_key"
channels = list(RADIO_CHANNEL_INTEL = TRUE)

//MARINE ENCRYPTION KEYS

/obj/item/device/encryptionkey/ai_integrated
name = "AI Integrated Encryption Key"
desc = "Integrated encryption key"
Expand All @@ -40,80 +57,85 @@
icon_state = "eng_key"
channels = list(RADIO_CHANNEL_SENTRY = TRUE)

/obj/item/device/encryptionkey/engi
name = "Engineering Radio Encryption Key"
icon_state = "eng_key"
channels = list(RADIO_CHANNEL_ENGI = TRUE)
// MARINE COMMAND

/obj/item/device/encryptionkey/sec
name = "Security Radio Encryption Key"
icon_state = "sec_key"
channels = list(RADIO_CHANNEL_MP = TRUE)
/obj/item/device/encryptionkey/cmpcom/cdrcom
name = "\improper Marine Senior Command Radio Encryption Key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)

/obj/item/device/encryptionkey/med
name = "Medical Radio Encryption Key"
icon_state = "med_key"
channels = list(RADIO_CHANNEL_MEDSCI = TRUE)
/obj/item/device/encryptionkey/mcom
name = "\improper Marine Command Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)

// MARINE ENGINEERING

/obj/item/device/encryptionkey/ce
name = "Chief Engineer's Encryption Key"
icon_state = "ce_key"
channels = list(RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)

/obj/item/device/encryptionkey/engi
name = "Engineering Radio Encryption Key"
icon_state = "eng_key"
channels = list(RADIO_CHANNEL_ENGI = TRUE)

// MARINE MEDICAL

/obj/item/device/encryptionkey/cmo
name = "Chief Medical Officer's Encryption Key"
icon_state = "cmo_key"
channels = list(RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_COMMAND = TRUE)

/obj/item/device/encryptionkey/command
name = "Command Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE)
/obj/item/device/encryptionkey/med
name = "Medical Radio Encryption Key"
icon_state = "med_key"
channels = list(RADIO_CHANNEL_MEDSCI = TRUE)

// MARINE MILITARY POLICE

/obj/item/device/encryptionkey/cmpcom
name = "\improper Marine Chief MP Radio Encryption Key"
icon_state = "cmp_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)

/obj/item/device/encryptionkey/mmpo
name = "\improper Military Police Radio Encryption Key"
icon_state = "sec_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE,)

/obj/item/device/encryptionkey/sec
name = "Security Radio Encryption Key"
icon_state = "sec_key"
channels = list(RADIO_CHANNEL_MP = TRUE)

// MARINE REQUISTIONS

/obj/item/device/encryptionkey/ro
name = "Requisition Officer's Encryption Key"
icon_state = "ce_key"
channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = FALSE, RADIO_CHANNEL_MEDSCI = FALSE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)

/obj/item/device/encryptionkey/req
/obj/item/device/encryptionkey/req/ct
name = "Supply Radio Encryption Key"
icon_state = "req_key"
channels = list(RADIO_CHANNEL_REQ = TRUE)
channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = FALSE, RADIO_CHANNEL_ENGI = FALSE)

/obj/item/device/encryptionkey/req/ct
/obj/item/device/encryptionkey/req
name = "Supply Radio Encryption Key"
icon_state = "req_key"
channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = FALSE, RADIO_CHANNEL_ENGI = FALSE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)

/obj/item/device/encryptionkey/mmpo
name = "\improper Military Police Radio Encryption Key"
icon_state = "sec_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE,)

//MARINE ENCRYPTION KEYS

/obj/item/device/encryptionkey/cmpcom
name = "\improper Marine Chief MP Radio Encryption Key"
icon_state = "cmp_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE)
channels = list(RADIO_CHANNEL_REQ = TRUE)

/obj/item/device/encryptionkey/cmpcom/cdrcom
name = "\improper Marine Senior Command Radio Encryption Key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
// MARINE SUPPORT

/obj/item/device/encryptionkey/cmpcom/synth
name = "\improper Marine Synth Radio Encryption Key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)

/obj/item/device/encryptionkey/mcom
name = "\improper Marine Command Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)

/obj/item/device/encryptionkey/mcom/cl
name = "\improper Corporate Liaison radio encryption key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_WY = TRUE)
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_WY = TRUE)

/obj/item/device/encryptionkey/mcom/rep
name = "\improper Representative radio encryption key"
Expand All @@ -123,25 +145,27 @@
/obj/item/device/encryptionkey/po
name = "\improper Marine Pilot Officer Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_INTEL = TRUE)

/obj/item/device/encryptionkey/io
name = "\improper Marine Intelligence Officer Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_INTEL = TRUE)
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_INTEL = TRUE)

/obj/item/device/encryptionkey/vc
name = "\improper Marine Vehicle Crewman Radio Encryption Key"
icon_state = "cap_key"
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE)

/obj/item/device/encryptionkey/req/mst
name = "Supply Radio Encryption Key"
icon_state = "req_key"
channels = list(RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_COMMAND = FALSE)

/obj/item/device/encryptionkey/mcom/ai //AI only.
channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_MP = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE)

/obj/item/device/encryptionkey/jtac
name = "\improper JTAC Radio Encryption Key"
icon_state = "jtac_key"
channels = list(RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_REQ = TRUE)

/obj/item/device/encryptionkey/intel
name = "\improper Intel Radio Encryption Key"
icon_state = "jtac_key"
channels = list(RADIO_CHANNEL_INTEL = TRUE)
// MARINE SQUADS

/obj/item/device/encryptionkey/squadlead
name = "\improper Squad Leader Radio Encryption Key"
Expand Down
13 changes: 7 additions & 6 deletions code/game/objects/items/devices/radio/headset.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,9 @@

/obj/item/device/radio/headset/almayer/chef
name = "kitchen radio headset"
desc = "Used by the onboard kitchen staff, filled with background noise of sizzling pots. Can coordinate with the supply channel, using :u."
desc = "Used by the onboard kitchen staff, filled with background noise of sizzling pots. Can coordinate with the supply channel, using :u and inform command of delivery service using :v."
icon_state = "req_headset"
initial_keys = list(/obj/item/device/encryptionkey/req/ct)
initial_keys = list(/obj/item/device/encryptionkey/req/mst)

/obj/item/device/radio/headset/almayer/doc
name = "medical radio headset"
Expand Down Expand Up @@ -495,15 +495,15 @@

/obj/item/device/radio/headset/almayer/po
name = "marine pilot radio headset"
desc = "Used by Pilot Officers. Channels are as follows: :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :j - JTAC, :t - intel."
desc = "Used by Pilot Officers. Channels are as follows: :v - marine command, :n - engineering, :m - medical, :j - JTAC, :t - intel."
initial_keys = list(/obj/item/device/encryptionkey/po)
volume = RADIO_VOLUME_CRITICAL
multibroadcast_cooldown = LOW_MULTIBROADCAST_COOLDOWN

/obj/item/device/radio/headset/almayer/intel
name = "marine intel radio headset"
desc = "Used by Intelligence Officers. Channels are as follows: :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :j - JTAC, :t - intel."
initial_keys = list(/obj/item/device/encryptionkey/po)
desc = "Used by Intelligence Officers. Channels are as follows: :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medical, :j - JTAC, :t - intel."
initial_keys = list(/obj/item/device/encryptionkey/io)

/obj/item/device/radio/headset/almayer/mcl
name = "corporate liaison radio headset"
Expand Down Expand Up @@ -994,6 +994,7 @@

/obj/item/device/radio/headset/almayer/mcom/vc
name = "marine vehicle crew radio headset"
desc = "Used by USCM vehicle crew, features a non-standard brace. Channels are as follows: :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel."
desc = "Used by USCM vehicle crew, features a non-standard brace. Channels are as follows: :v - marine command, :n - engineering, :m - medbay, :u - requisitions"
initial_keys = list(/obj/item/device/encryptionkey/vc)
volume = RADIO_VOLUME_RAISED
multibroadcast_cooldown = HIGH_MULTIBROADCAST_COOLDOWN
2 changes: 1 addition & 1 deletion code/modules/gear_presets/uscm.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
var/obj/item/clothing/accessory/storage/webbing/W = new()
U.attach_accessory(H, W)
H.equip_to_slot_or_del(U, WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/intel(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET)
H.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(H), WEAR_WAIST)
H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/rto/intel(H), WEAR_HEAD)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/gear_presets/uscm_ship.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@
if(H.client && H.client.prefs && (H.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new back_item(H), WEAR_BACK)
H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET)
Expand All @@ -644,7 +644,7 @@
if(H.client && H.client.prefs && (H.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS)
Expand Down Expand Up @@ -676,7 +676,7 @@
if(H.client && H.client.prefs && (H.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new back_item(H), WEAR_BACK)
H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET)
Expand All @@ -694,7 +694,7 @@
if(H.client && H.client.prefs && (H.client.prefs.backbag == 1))
back_item = /obj/item/storage/backpack/marine

H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(H), WEAR_L_EAR)
H.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(H), WEAR_BODY)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(H), WEAR_FEET)
H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), WEAR_HANDS)
Expand Down