Skip to content

Commit

Permalink
Increases light max size to 7
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Aug 26, 2023
1 parent 2232657 commit de17e54
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
6 changes: 4 additions & 2 deletions code/datums/components/overlay_lighting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
"288" = 'icons/effects/light_overlays/light_288.dmi',
"320" = 'icons/effects/light_overlays/light_320.dmi',
"352" = 'icons/effects/light_overlays/light_352.dmi',
"384" = 'icons/effects/light_overlays/light_384.dmi',
"416" = 'icons/effects/light_overlays/light_416.dmi',
)

///Overlay effect to cut into the darkness and provide light.
Expand Down Expand Up @@ -317,14 +319,14 @@
make_luminosity_update()


///Changes the range which the light reaches. 0 means no light, 6 is the maximum value.
///Changes the range which the light reaches. 0 means no light, 7 is the maximum value.
/datum/component/overlay_lighting/proc/set_range(atom/source, new_range)
SIGNAL_HANDLER
if(range == new_range)
return
if(range == 0)
turn_off()
range = clamp(CEILING(new_range, 0.5), 1, 6)
range = clamp(CEILING(new_range, 0.5), 1, 7)
var/pixel_bounds = ((range - 1) * 64) + 32
lumcount_range = CEILING(range, 1)
if(current_holder && overlay_lighting_flags & LIGHTING_ON)
Expand Down
5 changes: 1 addition & 4 deletions code/game/objects/items/devices/flashlight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
desc = "A red USCM issued flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = SIZE_SMALL
light_power = 2
light_range = 8
light_range = 7
icon_state = "flare"
item_state = "flare"
actions = list() //just pull it manually, neckbeard.
Expand Down Expand Up @@ -371,7 +371,6 @@

/// Flares deployed by a flare gun
/obj/item/device/flashlight/flare/on/gun
light_range = 7

//Special flare subtype for the illumination flare shell
//Acts like a flare, just even stronger, and set length
Expand All @@ -380,7 +379,6 @@
desc = "It's really bright, and unreachable."
icon_state = "" //No sprite
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
light_range = 7 //Way brighter than most lights
show_flame = FALSE

/obj/item/device/flashlight/flare/on/illumination/Initialize()
Expand All @@ -401,7 +399,6 @@
name = "burning star shell ash"
desc = "Bright burning ash from a Star Shell 40mm. Don't touch, or it'll burn ya'."
icon_state = "starshell_ash"
light_range = 7
anchored = TRUE//can't be picked up
ammo_datum = /datum/ammo/flare/starshell
show_flame = FALSE
Expand Down
Binary file added icons/effects/light_overlays/light_384.dmi
Binary file not shown.
Binary file added icons/effects/light_overlays/light_416.dmi
Binary file not shown.

0 comments on commit de17e54

Please sign in to comment.