diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index f2ccc0c1aa1..d9fb3846d48 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -32,3 +32,13 @@ /obj/item/camera_bug/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state) integrated_console.tgui_interact(user, ui_key, ui, force_open, master_ui, state) + + +/obj/item/camera_bug/ert + name = "ERT Camera Monitor" + desc = "A small handheld device used by ERT commanders to view camera feeds remotely." + +/obj/item/camera_bug/ert/Initialize(mapload) + . = ..() + integrated_console.network = list("ERT") + diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 2142dc9e50b..18844947c7c 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -289,19 +289,27 @@ freqlock = TRUE /obj/item/radio/headset/ert/alt - name = "\proper emergency response team's bowman headset" + name = "emergency response team's bowman headset" desc = "The headset of the boss. Protects ears from flashbangs." flags = EARBANGPROTECT icon_state = "com_headset_alt" item_state = "com_headset_alt" +/obj/item/radio/headset/ert/alt/commander + name = "ERT commander's bowman headset" + desc = "The headset of the boss. Protects ears from flashbangs. Can transmit even if telecomms are down." + requires_tcomms = FALSE + instant = TRUE + /obj/item/radio/headset/centcom name = "\proper centcom officer's bowman headset" - desc = "The headset of final authority. Protects ears from flashbangs." + desc = "The headset of final authority. Protects ears from flashbangs. Can transmit even if telecomms are down." flags = EARBANGPROTECT icon_state = "com_headset_alt" item_state = "com_headset_alt" ks2type = /obj/item/encryptionkey/centcom + requires_tcomms = FALSE + instant = TRUE /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" diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 96825ebdab7..e9786d69dea 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -38,6 +38,7 @@ uniform = /obj/item/clothing/under/rank/centcom_officer/sensor back = /obj/item/storage/backpack/ert/commander + l_ear = /obj/item/radio/headset/ert/alt/commander id = /obj/item/card/id/ert/commander @@ -81,7 +82,8 @@ belt = /obj/item/gun/energy/gun/blueshield/pdw9 backpack_contents = list( - /obj/item/gun/energy/ionrifle/carbine = 1, + /obj/item/camera_bug/ert = 1, + /obj/item/door_remote/omni = 1, /obj/item/restraints/handcuffs = 1, /obj/item/clothing/shoes/magboots = 1, /obj/item/storage/lockbox/mindshield = 1 @@ -100,7 +102,8 @@ backpack_contents = list( /obj/item/restraints/handcuffs = 1, /obj/item/storage/lockbox/mindshield = 1, - /obj/item/gun/energy/ionrifle/carbine = 1, + /obj/item/camera_bug/ert = 1, + /obj/item/door_remote/omni = 1, /obj/item/ammo_box/magazine/enforcer/lethal = 2 )