diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 3f9dc09ae6..bc016bcc7a 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -9,7 +9,7 @@ flags_equip_slot = SLOT_WAIST matter = list("metal" = 50,"glass" = 20) - + light_color = "#dae2ff" light_range = 5 light_power = 1 ground_offset_x = 2 @@ -32,8 +32,10 @@ . = ..() if(on) icon_state = "[initial(icon_state)]-on" + item_state = "[initial(item_state)]-on" else icon_state = initial(icon_state) + item_state = initial(item_state) /obj/item/device/flashlight/animation_spin(speed = 5, loop_amount = -1, clockwise = TRUE, sections = 3, angular_offset = 0, pixel_fuzz = 0) clockwise = pick(TRUE, FALSE) @@ -576,3 +578,14 @@ signal.linked_cam = new(loc, name) cas_groups[FACTION_MARINE].add_signal(signal) anchored = TRUE + +/obj/item/device/flashlight/tnr + name = "TNR shoulder lamp" + desc = "A dismounted TNR shoulder lamp." + icon = 'icons/obj/items/lighting.dmi' + icon_state = "tnr" + item_state = "tnr" + w_class = SIZE_MEDIUM + flags_equip_slot = null + raillight_compatible = 0 + diff --git a/icons/mob/humans/onmob/items_lefthand_0.dmi b/icons/mob/humans/onmob/items_lefthand_0.dmi index a293dfded9..3419fbe0e4 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_0.dmi and b/icons/mob/humans/onmob/items_lefthand_0.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi index a5f3abc035..6089b19dcd 100644 Binary files a/icons/mob/humans/onmob/items_righthand_0.dmi and b/icons/mob/humans/onmob/items_righthand_0.dmi differ diff --git a/icons/obj/items/lighting.dmi b/icons/obj/items/lighting.dmi index 617109d9a8..b7132b0122 100644 Binary files a/icons/obj/items/lighting.dmi and b/icons/obj/items/lighting.dmi differ