diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 2907949596a..a22f1c54055 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -51,8 +51,8 @@ /obj/effect/decal/fake_object/light_source/Initialize() .=..() - set_light(light_power, light_range, light_color) + set_light(light_range, light_power, light_color) /obj/effect/decal/fake_object/light_source/invisible - simulated = 0 - invisibility = 101 + simulated = FALSE + invisibility = INVISIBILITY_ABSTRACT diff --git a/code/game/objects/items/devices/lighting/hull_beacon.dm b/code/game/objects/items/devices/lighting/hull_beacon.dm index 8561bf3a1ce..fd2dc71bb59 100644 --- a/code/game/objects/items/devices/lighting/hull_beacon.dm +++ b/code/game/objects/items/devices/lighting/hull_beacon.dm @@ -3,6 +3,12 @@ desc = "A light-emitting hull beacon." icon = 'icons/obj/lighting.dmi' anchored = TRUE + light_system = MOVABLE_LIGHT + light_range = 3 + +/obj/item/hullbeacon/Initialize() + . = ..() + set_light_on(TRUE) /obj/item/hullbeacon/attack_hand(mob/user) return @@ -12,11 +18,9 @@ desc = "A red, light-emitting hull beacon." icon_state = "beacon_red_on" light_color = LIGHT_COLOR_RED - light_range = 3 /obj/item/hullbeacon/green name = "green hull beacon" desc = "A green, light-emitting hull beacon." icon_state = "beacon_green_on" light_color = LIGHT_COLOR_GREEN - light_range = 3 diff --git a/code/modules/power/radial_floodlight.dm b/code/modules/power/radial_floodlight.dm index ea4e1b303e2..5f67d02f621 100644 --- a/code/modules/power/radial_floodlight.dm +++ b/code/modules/power/radial_floodlight.dm @@ -5,30 +5,33 @@ icon_state = "radial_floodlight" anchored = FALSE density = TRUE - active_power_usage = 800 + light_system = MOVABLE_LIGHT light_color = LIGHT_COLOR_TUNGSTEN light_range = 8 + light_power = 3 + active_power_usage = 800 WATTS var/on = FALSE /obj/machinery/power/radial_floodlight/proc/toggle_active(var/force_state) if(!isnull(force_state)) - if(force_state == on) - return on = force_state else on = !on + if(on) - set_light(light_range, 1) - START_PROCESSING(SSprocessing, src) - else - set_light(0) - STOP_PROCESSING(SSprocessing, src) + update_use_power(POWER_USE_ACTIVE) + START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF) + playsound(loc, 'sound/effects/lighton.ogg', 65, 1) + + set_light_on(on) update_icon() /obj/machinery/power/radial_floodlight/process() var/actual_load = draw_power(active_power_usage) if(!on || !anchored || (stat & BROKEN) || !powernet || actual_load < active_power_usage) + STOP_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF) + update_use_power(POWER_USE_OFF) toggle_active(FALSE) return diff --git a/html/changelogs/kano-dot-light-lighting.yml b/html/changelogs/kano-dot-light-lighting.yml new file mode 100644 index 00000000000..d7cfd80f26e --- /dev/null +++ b/html/changelogs/kano-dot-light-lighting.yml @@ -0,0 +1,8 @@ + +author: Kano + +delete-after: True + +changes: + - bugfix: "Fixed hull beacons and radial lights not emitting light. Also fixed thunderdome being dark." + - bugfix: "Fixed radial lights not drawing power from powernet." diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index af4528ac208..0127538a688 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -389948,9 +389948,9 @@ sJv sJv sJv sJv -eSV -eSV -eSV +qAF +qAF +qAF eSV eSV eSV @@ -390209,7 +390209,7 @@ pzt bJo qAF eSV -qAF +eSV eSV eSV eSV