diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index bf023c2c07..29a31122bf 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -170,7 +170,7 @@ flags_1 = CONDUCT_1 brightness_on = 2 light_color = "#FFDDCC" - flashlight_power = 0.3 + flashlight_power = 0.5 var/holo_cooldown = 0 /obj/item/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag) @@ -227,15 +227,12 @@ custom_materials = null on = TRUE - // green-shaded desk lamp /obj/item/flashlight/lamp/green desc = "A classic green-shaded desk lamp." icon_state = "lampgreen" item_state = "lampgreen" - - /obj/item/flashlight/lamp/verb/toggle_light() set name = "Toggle light" set category = "Object" @@ -258,12 +255,13 @@ desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = WEIGHT_CLASS_SMALL brightness_on = 7 // Pretty bright. + total_mass = 0.8 light_color = "#FA421A" icon_state = "flare" item_state = "flare" actions_types = list() var/fuel = 0 - var/on_damage = 7 + var/on_damage = 9 var/produce_heat = 1500 heat = 1000 light_color = LIGHT_COLOR_FLARE @@ -331,14 +329,15 @@ name = "torch" desc = "A torch fashioned from some leaves and a log." w_class = WEIGHT_CLASS_BULKY - brightness_on = 4 + brightness_on = 6 //When on were like a lantern light_color = "#FAA44B" icon_state = "torch" item_state = "torch" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' light_color = LIGHT_COLOR_ORANGE - on_damage = 10 + total_mass = TOTAL_MASS_NORMAL_ITEM + on_damage = 12 //Its a log thats on fire slot_flags = null /obj/item/flashlight/lantern @@ -348,10 +347,9 @@ lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' desc = "A mining lantern." - brightness_on = 6 // luminosity when on + brightness_on = 6 // luminosity when on light_color = "#FFAA44" - flashlight_power = 0.75 - + flashlight_power = 0.8 /obj/item/flashlight/slime gender = PLURAL @@ -372,7 +370,6 @@ var/emp_cur_charges = 4 var/charge_tick = 0 - /obj/item/flashlight/emp/New() ..() START_PROCESSING(SSobj, src) @@ -435,7 +432,7 @@ var/fuel = 0 /obj/item/flashlight/glowstick/Initialize() - fuel = rand(1600, 2000) + fuel = rand(1000, 1500) light_color = color . = ..() @@ -540,7 +537,7 @@ /obj/item/flashlight/eyelight name = "eyelight" desc = "This shouldn't exist outside of someone's head, how are you seeing this?" - brightness_on = 15 + brightness_on = 10 flags_1 = CONDUCT_1 item_flags = DROPDEL actions_types = list()