From f532c1a44464f5518e5eb3bb60632b6c2bce3b04 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Wed, 19 Feb 2020 18:40:30 +0100 Subject: [PATCH 1/2] i spent 2 hours figuring out how to fix this --- .../living/carbon/human/species_types/shadowpeople.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 49af501942..8670e9ee4b 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -213,6 +213,16 @@ PDA.f_lum = 0 PDA.update_icon() visible_message("The light in [PDA] shorts out!") + 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.on = FALSE + light.brightness_on = 0 + light.flashlight_power = 0 + light.update_brightness() + weapon.update_gunlight() + visible_message("[light] on [O] flickers out and dies!") else visible_message("[O] is disintegrated by [src]!") O.burn() From cd56e29a98d7dd0b832c8bb5fff6cd8ad44d5677 Mon Sep 17 00:00:00 2001 From: Kraseo Date: Thu, 20 Feb 2020 00:18:43 +0100 Subject: [PATCH 2/2] drink my ass kevinz --- .../living/carbon/human/species_types/shadowpeople.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 8670e9ee4b..70abba5a01 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -217,12 +217,12 @@ var/obj/item/gun/weapon = O if(weapon.gun_light) var/obj/item/flashlight/seclite/light = weapon.gun_light - light.on = FALSE - light.brightness_on = 0 - light.flashlight_power = 0 - light.update_brightness() + light.forceMove(get_turf(weapon)) + light.burn() + weapon.gun_light = null weapon.update_gunlight() - visible_message("[light] on [O] flickers out and dies!") + QDEL_NULL(weapon.alight) + visible_message("[light] on [O] flickers out and disintegrates!") else visible_message("[O] is disintegrated by [src]!") O.burn()