From e41e3faf37ea6f22887554e0d473b79ae2103613 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 20 Mar 2024 23:21:23 -0500 Subject: [PATCH 1/6] M56 headmounted sight NV removal. --- code/modules/clothing/glasses/night.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index 2a3780832e..2cd8e5584a 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -89,14 +89,17 @@ /obj/item/clothing/glasses/night/m56_goggles name = "\improper M56 head mounted sight" gender = NEUTER - desc = "A headset and goggles system for the M56 Smartgun. Has a low-res short-range imager, allowing for view of terrain." + desc = "The headset camera and eyepiece part of the M56 Smartgun system. Connects to the weapon for tracking and detection of targets." icon = 'icons/obj/items/clothing/glasses.dmi' icon_state = "m56_goggles" deactive_state = "m56_goggles_0" toggleable = TRUE actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight) - vision_flags = SEE_TURFS + darkness_view = 0 + vision_flags = 0 + lighting_alpha = 255 fullscreen_vision = null + eye_protection = EYE_PROTECTION_FLAVOR req_skill = SKILL_SPEC_WEAPONS req_skill_level = SKILL_SPEC_SMARTGUN From d34e22ee6ad5066e2c4b169aa5b5021e23ea4999 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 21 Mar 2024 02:23:53 -0500 Subject: [PATCH 2/6] creates variant instead that has no NV --- code/modules/clothing/glasses/night.dm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index 2cd8e5584a..fbf535f928 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -95,9 +95,7 @@ deactive_state = "m56_goggles_0" toggleable = TRUE actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/m56_goggles/far_sight) - darkness_view = 0 - vision_flags = 0 - lighting_alpha = 255 + vision_flags = SEE_TURFS fullscreen_vision = null eye_protection = EYE_PROTECTION_FLAVOR req_skill = SKILL_SPEC_WEAPONS @@ -201,6 +199,18 @@ else button.icon_state = "template" +/obj/item/clothing/glasses/night/m56_goggles/no_nightvision + name = "\improper M56 head mounted sight" + gender = NEUTER + desc = "The headset, camera, and eyepiece part of the M56 Smartgun system. Connects to the weapon for tracking and detection of targets." + icon = 'icons/obj/items/clothing/glasses.dmi' + icon_state = "m56_goggles" + deactive_state = "m56_goggles_0" + toggleable = TRUE + darkness_view = 0 + vision_flags = 0 + lighting_alpha = 255 + /obj/item/clothing/glasses/night/m56_goggles/whiteout name = "\improper M56T head mounted sight" desc = "A headset and goggles system for the M56T 'Terminator' Smartgun. Has a low-light vision processor as well as a system allowing detection of thermal signatures though solid surfaces." From 61bd5ac443e642f7aa43c734c9306ca9d5efe6eb Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 24 Mar 2024 21:11:39 -0500 Subject: [PATCH 3/6] presets now have their HMS --- code/modules/gear_presets/cmb.dm | 2 +- code/modules/gear_presets/dust_raider.dm | 1 + code/modules/gear_presets/pmc.dm | 1 + code/modules/gear_presets/uscm.dm | 4 ++++ code/modules/gear_presets/whiteout.dm | 1 + code/modules/gear_presets/wo.dm | 2 ++ 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 22bf31d42c..cd96958af4 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -639,4 +639,4 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/smartgunner/full/, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/headband/red, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision, WEAR_EYES) diff --git a/code/modules/gear_presets/dust_raider.dm b/code/modules/gear_presets/dust_raider.dm index 78fea23a77..8061a22e26 100644 --- a/code/modules/gear_presets/dust_raider.dm +++ b/code/modules/gear_presets/dust_raider.dm @@ -88,6 +88,7 @@ //Backup SMG Weapon new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39(new_human), WEAR_L_STORE) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 1fb3f15a79..1dcb5fa95c 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -994,6 +994,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/gunner, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 4743089baa..8a369fe1e4 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -213,6 +213,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/smartgunner(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/specrag(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) @@ -700,6 +701,9 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/cryo(new_human), WEAR_L_EAR) /datum/equipment_preset/uscm/smartgunner_equipped/cryo diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 2028148c81..82ba86e5e9 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -141,6 +141,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) //head new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) //uniform var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() var/obj/item/clothing/accessory/storage/webbing/W = new() diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 1b92d36c8d..81ea9b8f6a 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -157,6 +157,7 @@ //head new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/mp_honor/com(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/chiefofficer(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) //waist new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) //limbs @@ -703,6 +704,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/full(new_human), WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_L_STORE) add_common_wo_equipment(new_human) From e8bef669b04aa48de181d1419f319e259a0f82e9 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 24 Mar 2024 21:54:39 -0500 Subject: [PATCH 4/6] final commit, smartgunner has HMS in lockers now --- .../objects/structures/crates_lockers/closets/job_closets.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 586832e746..fa1c08b410 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -145,6 +145,7 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/storage/belt/marine/smartgunner(src) new /obj/item/storage/belt/gun/smartgunner(src) + new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) /obj/structure/closet/secure_closet/smartgunner_forecon name = "smartgunner locker" @@ -162,6 +163,7 @@ new /obj/item/ammo_magazine/smartgun(src) new /obj/item/storage/belt/marine/smartgunner/standard(src) new /obj/item/storage/belt/gun/smartgunner/standard(src) + new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) /obj/structure/closet/cryo/Initialize() . = ..() @@ -171,3 +173,4 @@ new /obj/item/clothing/shoes/marine/knife(src) new /obj/item/device/radio/headset/almayer/marine(src) new /obj/item/device/radio/headset/almayer/marine(src) + new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src) From 7e7174d747cc2aff7e3e56213af0e889d90cf84a Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Mon, 25 Mar 2024 00:57:37 -0500 Subject: [PATCH 5/6] Remove farsight toggle from no_nightvision variant hopefully needs testing --- code/modules/clothing/glasses/night.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index fbf535f928..de13c24852 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -207,6 +207,7 @@ icon_state = "m56_goggles" deactive_state = "m56_goggles_0" toggleable = TRUE + actions_types = list(/datum/action/item_action/toggle) darkness_view = 0 vision_flags = 0 lighting_alpha = 255 From b697c83b1527f4b5f2fd5e2e86cd379bd306e0a7 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Fri, 5 Apr 2024 01:56:16 -0500 Subject: [PATCH 6/6] morrowchanges completed --- code/modules/clothing/glasses/night.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/code/modules/clothing/glasses/night.dm b/code/modules/clothing/glasses/night.dm index de13c24852..fbb6fcab27 100644 --- a/code/modules/clothing/glasses/night.dm +++ b/code/modules/clothing/glasses/night.dm @@ -89,7 +89,7 @@ /obj/item/clothing/glasses/night/m56_goggles name = "\improper M56 head mounted sight" gender = NEUTER - desc = "The headset camera and eyepiece part of the M56 Smartgun system. Connects to the weapon for tracking and detection of targets." + desc = "A headset and goggles system for the M56 Smartgun. Has a low-res short-range imager, allowing for view of terrain." icon = 'icons/obj/items/clothing/glasses.dmi' icon_state = "m56_goggles" deactive_state = "m56_goggles_0" @@ -200,13 +200,6 @@ button.icon_state = "template" /obj/item/clothing/glasses/night/m56_goggles/no_nightvision - name = "\improper M56 head mounted sight" - gender = NEUTER - desc = "The headset, camera, and eyepiece part of the M56 Smartgun system. Connects to the weapon for tracking and detection of targets." - icon = 'icons/obj/items/clothing/glasses.dmi' - icon_state = "m56_goggles" - deactive_state = "m56_goggles_0" - toggleable = TRUE actions_types = list(/datum/action/item_action/toggle) darkness_view = 0 vision_flags = 0