Merge pull request #11154 from Kraseo/fuck-nightmares
Fixes nightmares deleting guns with flashlights
This commit is contained in:
@@ -213,6 +213,16 @@
|
||||
PDA.f_lum = 0
|
||||
PDA.update_icon()
|
||||
visible_message("<span class='danger'>The light in [PDA] shorts out!</span>")
|
||||
else if(istype(O, /obj/item/gun))
|
||||
var/obj/item/gun/weapon = O
|
||||
if(weapon.gun_light)
|
||||
var/obj/item/flashlight/seclite/light = weapon.gun_light
|
||||
light.forceMove(get_turf(weapon))
|
||||
light.burn()
|
||||
weapon.gun_light = null
|
||||
weapon.update_gunlight()
|
||||
QDEL_NULL(weapon.alight)
|
||||
visible_message("<span class='danger'>[light] on [O] flickers out and disintegrates!</span>")
|
||||
else
|
||||
visible_message("<span class='danger'>[O] is disintegrated by [src]!</span>")
|
||||
O.burn()
|
||||
|
||||
Reference in New Issue
Block a user