diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index e93d4224748..432d2a158b2 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -150,6 +150,7 @@ if(!isloyal(M)) if(user.mind in ticker.mode.head_revolutionaries) if(ticker.mode.add_revolutionary(M.mind)) + M.Stun(3) times_used -- //Flashes less likely to burn out for headrevs when used for conversion else resisted = 1 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 6bf97bb6cb2..1c7167abcfa 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -802,9 +802,9 @@ /obj/machinery/power/apc/proc/malfhacked(mob/living/silicon/ai/malf) if(!istype(malf)) return + malf.malfhack = null + malf.malfhacking = FALSE if(src && !src.aidisabled) - malf.malfhack = null - malf.malfhacking = FALSE malf.malf_picker.processing_time += 10 malfai = malf.parent || malf @@ -813,6 +813,8 @@ malf << "Hack complete. The APC is now under your exclusive control." update_icon() + else + malf << "Hack aborted. The designated APC has stopped responding and no longer exists on the power network." /obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf) if(!istype(malf)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index cc2ebdaa18c..a9f383c0ca7 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -503,3 +503,9 @@ obj/item/weapon/gun/proc/newshot() if(zoomable) azoom = new() azoom.gun = src + + +/obj/item/weapon/gun/burn() + if(pin) + qdel(pin) + .=..() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index b4e7ac59683..e13d7e48874 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -164,4 +164,9 @@ SSobj.processing |= src else SSobj.processing -= src - ..() \ No newline at end of file + ..() + +/obj/item/weapon/gun/energy/burn() + if(power_supply) + qdel(power_supply) + .=..() \ No newline at end of file