diff --git a/code/game/machinery/vending/vendor_types/crew/mp.dm b/code/game/machinery/vending/vendor_types/crew/mp.dm index 647d84fac01a..ce1d44c547d8 100644 --- a/code/game/machinery/vending/vendor_types/crew/mp.dm +++ b/code/game/machinery/vending/vendor_types/crew/mp.dm @@ -7,7 +7,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("M276 Pattern Military Police Rig", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("Security HUD-Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), - list("Medical Helmet Optic", 0, /obj/item/device/helmet_visor/medical, MARINE_CAN_BUY_OPTIC, VENDOR_ITEM_RECOMMENDED), + list("SensorMate Medical Optic", 0, /obj/item/device/helmet_visor/medical/sensor, MARINE_CAN_BUY_OPTIC, VENDOR_ITEM_RECOMMENDED), list("ARMOR (TAKE ALL)", 0, null, null, null), list("Military Police M2 Armor", 0, /obj/item/clothing/suit/storage/marine/MP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_warden, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("M276 Pattern Military Police Rig", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("Security HUD-Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), - list("Medical Helmet Optic", 0, /obj/item/device/helmet_visor/medical, MARINE_CAN_BUY_OPTIC, VENDOR_ITEM_RECOMMENDED), + list("SensorMate Medical Optic", 0, /obj/item/device/helmet_visor/medical/sensor, MARINE_CAN_BUY_OPTIC, VENDOR_ITEM_RECOMMENDED), list("ARMOR (TAKE ALL)", 0, null, null, null), list("Military Warden M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/warden, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index 0e1aa60ca4eb..c00d8d7d9b6c 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_military_police_chief, list( list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("M276 Pattern Military Police Rig", 0, /obj/item/storage/belt/security/MP/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("Security HUD-Glasses", 0, /obj/item/clothing/glasses/sunglasses/sechud, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), - list("Medical Helmet Optic", 0, /obj/item/device/helmet_visor/medical, MARINE_CAN_BUY_OPTIC, VENDOR_ITEM_RECOMMENDED), + list("SensorMate Medical Optic", 0, /obj/item/device/helmet_visor/medical/sensor, MARINE_CAN_BUY_OPTIC, VENDOR_ITEM_RECOMMENDED), list("ARMOR (TAKE ALL)", 0, null, null, null), list("Military Police Chief M3 Armor", 0, /obj/item/clothing/suit/storage/marine/MP/WO, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 3ced90bfe322..6ee2c3bea84c 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Tanker Armor", 0, /obj/item/clothing/suit/storage/marine/tanker, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("M50 Tanker Helmet", 0, /obj/item/clothing/head/helmet/marine/tech/tanker, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), - list("Medical Helmet Optic", 0, /obj/item/device/helmet_visor/medical, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("SensorMate Medical Optic", 0, /obj/item/device/helmet_visor/medical/sensor, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("Welding Kit", 0, /obj/item/tool/weldpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/mre, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), diff --git a/code/game/machinery/vending/vendor_types/intelligence_officer.dm b/code/game/machinery/vending/vendor_types/intelligence_officer.dm index 54ed7e374150..8a2dfa8a00d6 100644 --- a/code/game/machinery/vending/vendor_types/intelligence_officer.dm +++ b/code/game/machinery/vending/vendor_types/intelligence_officer.dm @@ -52,7 +52,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 5, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 5, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("Night Vision Optic", 25, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 2a6bdac434be..8c1f6d3182ff 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -91,7 +91,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 12, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 12, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 938ddb39f4bc..8b675be59af4 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("HELMET OPTICS", 0, null, null, null), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), - list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), + list("SensorMate Medical Optic", 4, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_RECOMMENDED), list("Night Vision Optic", 25, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), list("ENGINEERING SUPPLIES", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm index 3703ad01be8d..cfc7531e7cc8 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_rifleman.dm @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_marine, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 15, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm index d089218c2759..38823292f91e 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_smartgunner.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_smartgun, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 15, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm index 15604d3a4400..66451ae46d8f 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm @@ -196,7 +196,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_specialist, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 15, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm index 08caae444855..5121d9024e20 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_tl.dm @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_tl, list( list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 15, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("RADIO KEYS", 0, null, null, null), diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm index 33ab12807b35..fcb8071c1ce7 100644 --- a/code/game/objects/items/devices/helmet_visors.dm +++ b/code/game/objects/items/devices/helmet_visors.dm @@ -85,6 +85,12 @@ action_icon_string = "med_sight_down" helmet_overlay = "med_sight_right" +/obj/item/device/helmet_visor/medical/sensor + name = "sensormate optic" + icon_state = "sensor_sight" + action_icon_string = "sensor_sight_down" + helmet_overlay = "sensor_sight_right" + /obj/item/device/helmet_visor/medical/advanced name = "advanced medical optic" helmet_overlay = "med_sight_right" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 5d6f7014a8f7..969433ab9f46 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -839,6 +839,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( "nvg_sight_down", "med_sight_down", "sec_sight_down", + "sensor_sight_down", "blank_hud_sight_down" ) @@ -1494,7 +1495,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/advanced) /obj/item/clothing/head/helmet/marine/MP/SO/basic - built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical) + built_in_visors = list(new /obj/item/device/helmet_visor, new /obj/item/device/helmet_visor/medical/sensor) /obj/item/clothing/head/helmet/marine/MP/provost/marshal name = "\improper M10 pattern MP riot helmet" @@ -2113,8 +2114,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_inv_hide = NO_FLAGS flags_marine_helmet = NO_FLAGS flags_atom = NO_NAME_OVERRIDE|NO_GAMEMODE_SKIN - built_in_visors = list(new /obj/item/device/helmet_visor/medical) - start_down_visor_type = /obj/item/device/helmet_visor/medical + built_in_visors = list(new /obj/item/device/helmet_visor/medical/sensor) + start_down_visor_type = /obj/item/device/helmet_visor/medical/sensor camera_factions = FACTION_LIST_TWE /obj/item/clothing/head/helmet/marine/veteran/royal_marine/generic diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 5093c68a490f..16d2df37744e 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -524,7 +524,7 @@ new /obj/item/pamphlet/upgradeable/medical(src) new /obj/item/storage/pouch/first_responder/full(src) new /obj/item/storage/pouch/autoinjector/full(src) - new /obj/item/device/helmet_visor/medical(src) + new /obj/item/device/helmet_visor/medical/sensor(src) new /obj/item/roller(src) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index de5985a04e8b..ae03f05fa547 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -737,7 +737,7 @@ list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), - list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_MANDATORY), + list("SensorMate Medical Optic", 4, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_MANDATORY), list("SPECIAL AMMUNITION", 0, null, null, null), list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR), @@ -1140,7 +1140,7 @@ list("Autoinjector (Tricordrazine)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), - list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_MANDATORY), + list("SensorMate Medical Optic", 4, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_MANDATORY), list("SPECIAL AMMUNITION", 0, null, null, null), list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR), diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index a91f53def3b4..2af6b05db2a2 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -203,7 +203,7 @@ list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 15, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), @@ -447,7 +447,7 @@ list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 12, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 12, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), @@ -693,7 +693,7 @@ list("Powerloader Pamphlet", 30, /obj/item/pamphlet/upgradeable/powerloader, null, VENDOR_ITEM_REGULAR), list("HELMET OPTICS", 0, null, null, null), - list("Medical Helmet Optic", 12, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("SensorMate Medical Optic", 12, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_REGULAR), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), ) @@ -959,7 +959,7 @@ list("HELMET OPTICS", 0, null, null, null), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), - list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), + list("SensorMate Medical Optic", 4, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_RECOMMENDED), list("UTILITIES", 0, null, null, null), list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), @@ -1131,7 +1131,7 @@ list("HELMET OPTICS", 0, null, null, null), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), - list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), + list("SensorMate Medical Optic", 4, /obj/item/device/helmet_visor/medical/sensor, null, VENDOR_ITEM_RECOMMENDED), list("Night Vision Optic", 25, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), list("ENGINEERING SUPPLIES", 0, null, null, null), diff --git a/icons/mob/hud/actions.dmi b/icons/mob/hud/actions.dmi index 4a754815243b..1d6ec5f82dcf 100644 Binary files a/icons/mob/hud/actions.dmi and b/icons/mob/hud/actions.dmi differ diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi index 748846dbe013..b92844ce262d 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/huds.dmi differ diff --git a/icons/obj/items/clothing/helmet_visors.dmi b/icons/obj/items/clothing/helmet_visors.dmi index a134369e1b4b..291610df3c3d 100644 Binary files a/icons/obj/items/clothing/helmet_visors.dmi and b/icons/obj/items/clothing/helmet_visors.dmi differ diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm index 384bf5f01cf6..851f341d73f8 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm @@ -12930,7 +12930,7 @@ pixel_x = -6; pixel_y = 8 }, -/obj/item/device/helmet_visor/medical{ +/obj/item/device/helmet_visor/medical/sensor{ pixel_x = 4; pixel_y = 1 },