From 94c700a06c675a43b8c4027456313c05bbc6e114 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Sun, 22 Mar 2020 01:31:59 +1100 Subject: [PATCH] NVG Nerf/Syndicate NVG Buff (#11548) * nerfs the shit out of nvg and gives syndicate special flashproof versions * forgot about this one * bleh --- code/game/gamemodes/nuclear/nuclear.dm | 4 ++-- code/game/objects/items/storage/firstaid.dm | 4 ++-- .../structures/crates_lockers/closets/syndicate.dm | 2 +- code/modules/clothing/glasses/_glasses.dm | 10 +++++++++- code/modules/clothing/glasses/hud.dm | 11 ++++++++++- code/modules/ninja/outfit.dm | 2 +- 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 632d59c84d..48a298984c 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -165,7 +165,7 @@ /datum/outfit/syndicate/full name = "Syndicate Operative - Full Kit" - glasses = /obj/item/clothing/glasses/night + glasses = /obj/item/clothing/glasses/night/syndicate mask = /obj/item/clothing/mask/gas/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi r_pocket = /obj/item/tank/internals/emergency_oxygen/engi @@ -180,7 +180,7 @@ /datum/outfit/syndicate/lone name = "Syndicate Operative - Lone" - glasses = /obj/item/clothing/glasses/night + glasses = /obj/item/clothing/glasses/night/syndicate mask = /obj/item/clothing/mask/gas/syndicate suit = /obj/item/clothing/suit/space/syndicate/black/red head = /obj/item/clothing/head/helmet/space/syndicate/black/red diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c9c686414d..01193d0e21 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -189,7 +189,7 @@ new /obj/item/reagent_containers/medspray/silver_sulf(src) new /obj/item/healthanalyzer/advanced(src) new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for - new /obj/item/clothing/glasses/hud/health/night(src) + new /obj/item/clothing/glasses/hud/health/night/syndicate(src) /obj/item/storage/firstaid/tactical/nukeop name = "improved combat medical kit" @@ -204,7 +204,7 @@ new /obj/item/reagent_containers/medspray/silver_sulf(src) new /obj/item/healthanalyzer/advanced(src) new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for - new /obj/item/clothing/glasses/hud/health/night(src) + new /obj/item/clothing/glasses/hud/health/night/syndicate(src) /* * Pill Bottles diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index b967b4efe1..da11f858f8 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -15,7 +15,7 @@ new /obj/item/ammo_box/magazine/m10mm(src) new /obj/item/storage/belt/military(src) new /obj/item/crowbar/red(src) - new /obj/item/clothing/glasses/night(src) + new /obj/item/clothing/glasses/night/syndicate(src) /obj/structure/closet/syndicate/nuclear desc = "It's a storage unit for a Syndicate boarding party." diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index d3ecccfcf8..66dcf89a7a 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -82,6 +82,7 @@ icon_state = "nvgmeson" item_state = "nvgmeson" darkness_view = 8 + flash_protect = -2 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE glass_colour_type = /datum/client_colour/glass_colour/green @@ -119,10 +120,11 @@ /obj/item/clothing/glasses/night name = "night vision goggles" - desc = "You can totally see in the dark now!" + desc = "You can totally see in the dark now! Just don't look too closely at bright lights. This lacks any flash correction." icon_state = "night" item_state = "glasses" darkness_view = 8 + flash_protect = -2 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE glass_colour_type = /datum/client_colour/glass_colour/green @@ -130,6 +132,12 @@ name = "prescription night vision goggles" desc = "NVGs but for those with nearsightedness." vision_correction = 1 + +/obj/item/clothing/glasses/night/syndicate + name = "combat night vision goggles" + desc = "See everything, without fear." + flash_protect = 1 + vision_correction = 1 /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user) user.visible_message("[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 5c0bb33a29..c745cd74f0 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -63,12 +63,19 @@ /obj/item/clothing/glasses/hud/health/night name = "night vision health scanner HUD" - desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness." + desc = "An advanced medical heads-up display that allows doctors to find patients in complete darkness." icon_state = "healthhudnight" item_state = "glasses" darkness_view = 8 + flash_protect = -2 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/green + +/obj/item/clothing/glasses/hud/health/night/syndicate + name = "combat night vision health scanner HUD" + desc = "An advanced shielded medical heads-up display that allows soldiers to approximate how much lead poisoning their allies have suffered in complete darkness." + flash_protect = 1 + vision_correction = 1 /obj/item/clothing/glasses/hud/health/sunglasses name = "medical HUDSunglasses" @@ -126,6 +133,7 @@ icon_state = "diagnostichudnight" item_state = "glasses" darkness_view = 8 + flash_protect = -2 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/green @@ -199,6 +207,7 @@ desc = "An advanced heads-up display which provides id data and vision in complete darkness." icon_state = "securityhudnight" darkness_view = 8 + flash_protect = -2 //You either are flashproof or you can see in the dark, pick one. lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE glass_colour_type = /datum/client_colour/glass_colour/green diff --git a/code/modules/ninja/outfit.dm b/code/modules/ninja/outfit.dm index 323deed5c4..983ef0585a 100644 --- a/code/modules/ninja/outfit.dm +++ b/code/modules/ninja/outfit.dm @@ -2,7 +2,7 @@ name = "Space Ninja" uniform = /obj/item/clothing/under/color/black/trackless suit = /obj/item/clothing/suit/space/space_ninja - glasses = /obj/item/clothing/glasses/night + glasses = /obj/item/clothing/glasses/night/syndicate mask = /obj/item/clothing/mask/gas/space_ninja head = /obj/item/clothing/head/helmet/space/space_ninja ears = /obj/item/radio/headset