From e33553be5b8ddbd5bd0af07277e9f0cf2b923c62 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 27 Oct 2025 08:09:16 -0400 Subject: [PATCH] tsf marines are now flashproof (#30752) --- code/datums/outfits/outfit_admin.dm | 5 +++-- code/modules/surgery/organs/eyes.dm | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 875466b2a57..ead2646c8db 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -751,7 +751,8 @@ cybernetic_implants = list( /obj/item/organ/internal/cyberimp/arm/flash, /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, - /obj/item/organ/internal/cyberimp/eyes/hud/security + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/eyes/cybernetic/shield/hardened ) bio_chips = list(/obj/item/bio_chip/mindshield, /obj/item/bio_chip/death_alarm @@ -815,7 +816,7 @@ /obj/item/organ/internal/cyberimp/chest/nutriment/hardened, /obj/item/organ/internal/cyberimp/brain/anti_stam/hardened, /obj/item/organ/internal/cyberimp/arm/flash, - /obj/item/organ/internal/eyes/cybernetic/shield + /obj/item/organ/internal/eyes/cybernetic/shield/hardened ) /datum/outfit/admin/solgov/elite/lieutenant diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index a5494419165..7e32d6bdeed 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -249,6 +249,10 @@ origin_tech = "materials=4;biotech=3;engineering=4;plasmatech=3" flash_intensity = 3 +/obj/item/organ/internal/eyes/cybernetic/shield/hardened + name = "hardened shielded robotic eyes" + emp_proof = TRUE + #define INTACT 0 #define ONE_SHATTERED 1 #define BOTH_SHATTERED 2