mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-21 21:10:30 +01:00
Updates and extends the Emergency Flare (#15411)
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: KingOfThePing
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- tweak: "Tweaked the old emergency flare sprites and gave them animations."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 34 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 33 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 52 KiB |
Reference in New Issue
Block a user