diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index c7efbea388e..3b6964ec8e5 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -27,7 +27,6 @@ if(cell_type) cell = new cell_type(src) - cell.charge = rand(cell.maxcharge*0.25, cell.maxcharge) brightness_levels = list("low" = 5, "medium" = 10, "high" = 20) power_usage = brightness_levels[brightness_level] @@ -202,7 +201,6 @@ icon_state = "maglight" force = 10 flags = CONDUCT - brightness_on = 4 slot_flags = SLOT_BELT w_class = ITEMSIZE_SMALL attack_verb = list ("smacked", "thwacked", "thunked") @@ -390,6 +388,7 @@ w_class = ITEMSIZE_TINY brightness_on = 6 on = 1 //Bio-luminesence has one setting, on. + power_use = 0 /obj/item/device/flashlight/slime/New() ..() diff --git a/html/changelogs/Yoshax-Flashlights.yml b/html/changelogs/Yoshax-Flashlights.yml index bc39fb552a3..2fd3eaad1c4 100644 --- a/html/changelogs/Yoshax-Flashlights.yml +++ b/html/changelogs/Yoshax-Flashlights.yml @@ -34,6 +34,4 @@ delete-after: True # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - rscadd: "Flashlights now take powercells." - - rscadd: "Flashlights now have multiple brightness levels, including low, medium and high." - - tweak: "Flashlights are slightly brighter in general." - - rscadd: "The cells that spawn in flashlights will spawn with a random amount of charge between 25% and 100%" \ No newline at end of file + - rscadd: "Flashlights now have multiple brightness levels, including low, medium and high." \ No newline at end of file