diff --git a/code/game/objects/items/devices/lighting/flare.dm b/code/game/objects/items/devices/lighting/flare.dm index 21d9a6db841..2e7c4de56a3 100644 --- a/code/game/objects/items/devices/lighting/flare.dm +++ b/code/game/objects/items/devices/lighting/flare.dm @@ -1,6 +1,6 @@ /obj/item/device/flashlight/flare name = "flare" - desc = "A red standard-issue flare. There are instructions on the side reading 'pull cord, make light'." + desc = "A red standard-issue flare. There are instructions on the side reading 'pull cap, make light'." w_class = ITEMSIZE_SMALL brightness_on = 3 // Pretty bright. light_power = 4 @@ -40,6 +40,14 @@ src.damtype = initial(src.damtype) update_icon() +/obj/item/device/flashlight/flare/update_icon() + ..() + item_state = icon_state + if(ismob(src.loc)) + var/mob/H = src.loc + H.update_inv_l_hand() + H.update_inv_r_hand() + /obj/item/device/flashlight/flare/attack_self(mob/user) // Usual checks if(!fuel) @@ -52,10 +60,11 @@ // All good, turn it on. if(.) if(!overrides_activation_message) - user.visible_message(SPAN_NOTICE("\The [user] activates the flare."), SPAN_NOTICE("You pull the cord on the flare, activating it!")) + user.visible_message(SPAN_NOTICE("\The [user] activates the flare."), SPAN_NOTICE("You pull the cap off the flare, activating it!")) src.force = on_damage src.damtype = "fire" START_PROCESSING(SSprocessing, src) + update_icon() /obj/item/device/flashlight/flare/torch name = "torch" diff --git a/html/changelogs/KingOfThePing - enlightening.yml b/html/changelogs/KingOfThePing - enlightening.yml new file mode 100644 index 00000000000..8238aa1b1d6 --- /dev/null +++ b/html/changelogs/KingOfThePing - enlightening.yml @@ -0,0 +1,6 @@ +author: KingOfThePing + +delete-after: True + +changes: + - tweak: "Tweaked the old emergency flare sprites and gave them animations." diff --git a/icons/mob/items/lefthand_lighting.dmi b/icons/mob/items/lefthand_lighting.dmi index ad8a7b1b8bc..6cf6b6f25f5 100644 Binary files a/icons/mob/items/lefthand_lighting.dmi and b/icons/mob/items/lefthand_lighting.dmi differ diff --git a/icons/mob/items/righthand_lighting.dmi b/icons/mob/items/righthand_lighting.dmi index e0d1081e4b0..233d2235384 100644 Binary files a/icons/mob/items/righthand_lighting.dmi and b/icons/mob/items/righthand_lighting.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index af44b776a9a..d5acac86fa1 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ