Skip to content

Commit

Permalink
Maint lights dimmening (#591)
Browse files Browse the repository at this point in the history
  • Loading branch information
QuacksQ authored Jun 1, 2024
1 parent 664fa91 commit 6691f3c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/cleanable/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
name = "glowing goo"
desc = "Jeez. I hope that's not for lunch."
icon_state = "greenglow"
light_power = 3
light_power = 1.5
light_range = 2
light_color = LIGHT_COLOR_GREEN
beauty = -300
Expand Down
5 changes: 3 additions & 2 deletions code/game/objects/items/devices/flashlight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,9 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 10
light_range = 5
light_system = STATIC_LIGHT
light_range = 4
light_power = 1
light_system = MOVABLE_LIGHT
w_class = WEIGHT_CLASS_BULKY
flags_1 = CONDUCT_1
custom_materials = null
Expand Down
3 changes: 2 additions & 1 deletion code/modules/power/lighting/light.dm
Original file line number Diff line number Diff line change
Expand Up @@ -650,11 +650,12 @@
icon = 'icons/obj/lighting.dmi'
base_state = "floor" // base description and icon_state
icon_state = "floor"
brightness = 4
brightness = 2
layer = LOW_OBJ_LAYER
plane = FLOOR_PLANE
light_type = /obj/item/light/bulb
fitting = "bulb"
bulb_power = 0.4

#undef NIGHTSHIFT_LIGHT_MODIFIER
#undef NIGHTSHIFT_COLOR_MODIFIER
2 changes: 1 addition & 1 deletion code/modules/power/lighting/light_mapping_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
/obj/machinery/light/small/maintenance
bulb_colour = "#e0a142"
nightshift_allowed = FALSE
bulb_power = 0.8
bulb_power = 0.3

// -------- Directional presets
// The directions are backwards on the lights we have now
Expand Down

0 comments on commit 6691f3c

Please sign in to comment.