Skip to content

Commit

Permalink
[MIRROR] Removes the adapted flashlight (#928)
Browse files Browse the repository at this point in the history
* Removes the adapted flashlight (#81426)

## About The Pull Request

It doesn't need to exist, I killed see_in_dark so we can always see shit
emissives.

## Why It's Good For The Game

Cleaner code

* Removes the adapted flashlight

---------

Co-authored-by: LemonInTheDark <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Feb 13, 2024
1 parent d016d1c commit 4e7fd7e
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 20 deletions.
8 changes: 0 additions & 8 deletions code/game/objects/items/devices/flashlight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -914,14 +914,6 @@
item_flags = DROPDEL
actions_types = list()

/obj/item/flashlight/eyelight/adapted
name = "adaptedlight"
desc = "There is no possible way for a player to see this, so I can safely talk at length about why this exists. Adapted eyes come \
with icons that go above the lighting layer so to make sure the red eyes that pierce the darkness are always visible we make the \
human emit the smallest amount of light possible. Thanks for reading :)"
light_range = 1
light_power = 0.07

/obj/item/flashlight/eyelight/glow
light_system = MOVABLE_LIGHT_BEAM
light_range = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@
/obj/item/camera/siliconcam,
/obj/item/door_remote/omni,
/obj/item/flashlight/emp/debug,
/obj/item/flashlight/eyelight/adapted,
/obj/item/flashlight/flare,
/obj/item/flashlight/lamp,
/obj/item/healthanalyzer/rad_laser,
Expand Down
11 changes: 0 additions & 11 deletions code/modules/surgery/organs/internal/eyes/_eyes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -754,16 +754,9 @@
low_light_cutoff = list(5, 12, 20)
medium_light_cutoff = list(15, 20, 30)
high_light_cutoff = list(30, 35, 50)
var/obj/item/flashlight/eyelight/adapted/adapt_light

/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/on_mob_insert(mob/living/carbon/eye_owner)
. = ..()
//add lighting
if(!adapt_light)
adapt_light = new /obj/item/flashlight/eyelight/adapted()
adapt_light.set_light_on(TRUE)
adapt_light.forceMove(eye_owner)
adapt_light.update_brightness(eye_owner)
ADD_TRAIT(eye_owner, TRAIT_UNNATURAL_RED_GLOWY_EYES, ORGAN_TRAIT)

/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/on_life(seconds_per_tick, times_fired)
Expand All @@ -776,9 +769,5 @@
. = ..()

/obj/item/organ/internal/eyes/night_vision/maintenance_adapted/on_mob_remove(mob/living/carbon/unadapted, special = FALSE)
//remove lighting
adapt_light.set_light_on(FALSE)
adapt_light.update_brightness(unadapted)
adapt_light.forceMove(src)
REMOVE_TRAIT(unadapted, TRAIT_UNNATURAL_RED_GLOWY_EYES, ORGAN_TRAIT)
return ..()

0 comments on commit 4e7fd7e

Please sign in to comment.