cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes flash hyper vulnerability based on negative flash resistance modifier, removes snowflake trait. (#69530)

Browse Source
This commit is contained in:
itseasytosee
2022-09-16 19:27:08 -07:00
committed by GitHub
parent 9899c5e920
commit 48250f603e
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/flash.dm
+5 -2
View File
@@ -1,5 +1,6 @@
#define CONFUSION_STACK_MAX_MULTIPLIER 2
/// No deviation at all. Flashed from the front or front-left/front-right. Alternatively, flashed in direct view.
#define DEVIATION_NONE 0
/// Partial deviation. Flashed from the side. Alternatively, flashed out the corner of your eyes.
@@ -200,8 +201,10 @@
if(victim.flags_1 & IS_SPINNING_1)
return DEVIATION_NONE
if(HAS_TRAIT(victim, TRAIT_FLASH_SENSITIVE)) //If your eyes are sensitive and can be flashed from any direction.
return DEVIATION_NONE
if(iscarbon(victim))
var/mob/living/carbon/carbon_victim = victim
if(carbon_victim.get_eye_protection() < FLASH_PROTECTION_SENSITIVE) // If we have really bad flash sensitivity, usually due to really sensitive eyes, we get flashed from all directions
return DEVIATION_NONE
// Are they on the same tile? We'll return partial deviation. This may be someone flashing while lying down
// or flashing someone they're stood on the same turf as, or a borg flashing someone buckled to them.
code/modules/surgery/organs/eyes.dm
+2 -13
View File
@@ -517,19 +517,12 @@
desc = "These eyes seem to stare back no matter the direction you look at it from."
eye_icon_state = "flyeyes"
icon_state = "eyeballs-fly"
/obj/item/organ/internal/eyes/fly/Insert(mob/living/carbon/eye_owner, special = FALSE, drop_if_replaced = TRUE)
. = ..()
ADD_TRAIT(eye_owner, TRAIT_FLASH_SENSITIVE, ORGAN_TRAIT)
/obj/item/organ/internal/eyes/fly/Remove(mob/living/carbon/eye_owner, special = FALSE)
REMOVE_TRAIT(eye_owner, TRAIT_FLASH_SENSITIVE, ORGAN_TRAIT)
return ..()
flash_protect = FLASH_PROTECTION_HYPER_SENSITIVE
/obj/item/organ/internal/eyes/night_vision/maintenance_adapted
name = "adapted eyes"
desc = "These red eyes look like two foggy marbles. They give off a particularly worrying glow in the dark."
flash_protect = FLASH_PROTECTION_SENSITIVE
flash_protect = FLASH_PROTECTION_HYPER_SENSITIVE
eye_color_left = "f00"
eye_color_right = "f00"
icon_state = "adapted_eyes"
@@ -545,8 +538,6 @@
adapt_light.on = TRUE
adapt_light.forceMove(adapted)
adapt_light.update_brightness(adapted)
//traits
ADD_TRAIT(adapted, TRAIT_FLASH_SENSITIVE, ORGAN_TRAIT)
ADD_TRAIT(adapted, TRAIT_UNNATURAL_RED_GLOWY_EYES, ORGAN_TRAIT)
/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/on_life(delta_time, times_fired)
@@ -565,7 +556,5 @@
adapt_light.on = FALSE
adapt_light.update_brightness(unadapted)
adapt_light.forceMove(src)
//traits
REMOVE_TRAIT(unadapted, TRAIT_FLASH_SENSITIVE, ORGAN_TRAIT)
REMOVE_TRAIT(unadapted, TRAIT_UNNATURAL_RED_GLOWY_EYES, ORGAN_TRAIT)
return ..()