TNR handheld (#427)

cmss13-devs · Sep 10, 2024 · 3543c18 · 3543c18
1 parent d86de15
commit 3543c18
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git 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
diff --git a/icons/mob/humans/onmob/items_righthand_0.dmi b/icons/mob/humans/onmob/items_righthand_0.dmi
diff --git a/icons/obj/items/lighting.dmi b/icons/obj/items/lighting.dmi