diff --git a/code/datums/jobs/job/militarypolice.dm b/code/datums/jobs/job/militarypolice.dm index 2eb8aeabbce..5b3ca4f89a2 100644 --- a/code/datums/jobs/job/militarypolice.dm +++ b/code/datums/jobs/job/militarypolice.dm @@ -84,12 +84,6 @@ In addition, you are tasked with the security of high-ranking personnel, includi wear_suit = /obj/item/clothing/suit/armor/bulletproof/mp suit_store = /obj/item/weapon/gun/energy/taser -/obj/item/radio/headset/mainship/mp - icon = 'icons/obj/items/radio.dmi' - name = "security radio headset" - icon_state = "mp_headset" - keyslot = /obj/item/encryptionkey/mcom - /obj/item/storage/pouch/pistol/laserpistol/Initialize() . = ..() new /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_pistol/tactical(src) diff --git a/code/datums/jobs/job/other.dm b/code/datums/jobs/job/other.dm index f3cab152069..37d00fdcd2e 100644 --- a/code/datums/jobs/job/other.dm +++ b/code/datums/jobs/job/other.dm @@ -66,6 +66,7 @@ gloves = /obj/item/clothing/gloves/marine/officer/chief/sa glasses = /obj/item/clothing/glasses/sunglasses/sa/nodrop back = /obj/item/storage/backpack/marine/satchel + ears = /obj/item/radio/headset/mainship/spatial /datum/job/spatial_agent/galaxy_red outfit = /datum/outfit/job/other/spatial_agent/galaxy_red diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm index 3722a2a11ce..0df5bb7e19b 100644 --- a/code/game/objects/items/radio/headset.dm +++ b/code/game/objects/items/radio/headset.dm @@ -488,6 +488,16 @@ GLOBAL_LIST_INIT(channel_tokens, list( name = "silicon radio" keyslot = /obj/item/encryptionkey/mcom/ai +/obj/item/radio/headset/mainship/mp + name = "security radio headset" + icon_state = "mp_headset" + keyslot = /obj/item/encryptionkey/mcom + +/obj/item/radio/headset/mainship/spatial + name = "spatial agent headset" + icon_state = "headset_marine_generic" + keyslot = /obj/item/encryptionkey/mcom/ai + /obj/item/radio/headset/mainship/marine keyslot = /obj/item/encryptionkey/general