diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index f79120e0e7f..3a68f3e713a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -283,6 +283,7 @@ req_access = list(ACCESS_SECURITY_BRIG) starts_with = list( + /obj/item/modular_computer/tablet/preset/custom_loadout/standard/security, /obj/item/cartridge/security, /obj/item/radio/headset/headset_sec, /obj/item/radio/headset/headset_sec/alt, @@ -301,6 +302,7 @@ /obj/item/gun/energy/secutor, /obj/item/cell/device/weapon, /obj/item/gps/security, + /obj/item/holowarrant, /obj/item/clothing/under/bodysuit/bodysuitsec, /obj/item/clothing/suit/storage/hooded/wintercoat/security, /obj/item/clothing/shoes/boots/winter/security, diff --git a/code/modules/clothing/under/accessories/armor.dm b/code/modules/clothing/under/accessories/armor.dm index 364b46c424c..dbdadcb1fbd 100644 --- a/code/modules/clothing/under/accessories/armor.dm +++ b/code/modules/clothing/under/accessories/armor.dm @@ -519,17 +519,28 @@ camera_networks = list(NETWORK_CIV_HELMETS) /obj/item/clothing/accessory/armor/helmetcamera/security - name = "\improper Security helmet camera" + name = "security helmet camera" desc = "A small camera that attaches to helmets. This one has its feed restricted to Security." icon_state = "helmcam_sec" camera_networks = list(NETWORK_SEC_HELMETS) +/obj/item/clothing/accessory/armor/helmetcamera/security/body + name = "security body camera" + desc = "A small camera that attaches to most uniforms. This one has its feed restricted to Security." + icon_state = "helmcam_body_sec" + slot = ACCESSORY_SLOT_DECOR + /obj/item/clothing/accessory/armor/helmetcamera/exploration - name = "\improper Exploration helmet camera" + name = "exploration helmet camera" desc = "A small camera that attaches to helmets. This one has its feed restricted to Exploration." icon_state = "helmcam_explo" camera_networks = list(NETWORK_EXPLO_HELMETS) +/obj/item/clothing/accessory/armor/helmetcamera/exploration/body + name = "exploration body camera" + desc = "A small camera that attaches to most uniforms. This one has its feed restricted to Exploration." + slot = ACCESSORY_SLOT_DECOR + icon_state = "helmcam_body_explo" //Lightweight Limb Plating - These are incompatible with plate carriers. diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index 7e2351e67d8..664551678ef 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -98,3 +98,11 @@ /obj/item/modular_computer/laptop/preset/custom_loadout/standard/pathfinder/install_default_programs() ..() hard_drive.store_file(new/datum/computer_file/program/camera_monitor/explohelmet()) + +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/searchandrescue + name = "\improper S&R's laptop" + +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/searchandrescue/install_default_programs() + ..() + hard_drive.store_file(new/datum/computer_file/program/camera_monitor/explohelmet()) + hard_drive.store_file(new/datum/computer_file/program/suit_sensors()) diff --git a/code/modules/modular_computers/computers/subtypes/preset_tablet.dm b/code/modules/modular_computers/computers/subtypes/preset_tablet.dm index 05e7c8afbb9..9ad672c0ce4 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_tablet.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_tablet.dm @@ -26,3 +26,12 @@ network_card = new/obj/item/computer_hardware/network_card(src) battery_module = new/obj/item/computer_hardware/battery_module/micro(src) battery_module.charge_to_full() + +/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security + name = "\improper Security Officer's tablet" + +/obj/item/modular_computer/tablet/preset/custom_loadout/standard/security/install_default_programs() + ..() + hard_drive.store_file(new/datum/computer_file/program/camera_monitor()) + hard_drive.store_file(new/datum/computer_file/program/camera_monitor/sechelmet()) + hard_drive.store_file(new/datum/computer_file/program/digitalwarrant()) diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm index 6a3d774fc59..78124a6ffc9 100644 --- a/code/modules/tgui/modules/camera.dm +++ b/code/modules/tgui/modules/camera.dm @@ -303,6 +303,7 @@ /datum/tgui_module_old/camera/ntos/helmet/New(host) . = ..(host, list(NETWORK_CIV_HELMETS)) + /datum/tgui_module_old/camera/ntos/security_helmet name = "Security Helmet Camera Monitor" diff --git a/icons/obj/clothing/Sprite-0002.dmi b/icons/obj/clothing/Sprite-0002.dmi deleted file mode 100644 index 948401a6185..00000000000 Binary files a/icons/obj/clothing/Sprite-0002.dmi and /dev/null differ diff --git a/icons/obj/clothing/modular_armor.dmi b/icons/obj/clothing/modular_armor.dmi index f77e0b26080..8299cefb219 100644 Binary files a/icons/obj/clothing/modular_armor.dmi and b/icons/obj/clothing/modular_armor.dmi differ