From a88da69f66ef5c121195d4a1ddfbd1e4967421ce Mon Sep 17 00:00:00 2001 From: Igors Rjabcevs Date: Wed, 3 Aug 2016 08:34:15 +0300 Subject: [PATCH] Prevent minigun from freezing Garbage Collector if it's spawned by itself; (#19666) Also actually prevents minigun from firing if it's overheater; --- code/modules/projectiles/guns/projectile/laser_gatling.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/laser_gatling.dm b/code/modules/projectiles/guns/projectile/laser_gatling.dm index ea192206003..35210e78702 100644 --- a/code/modules/projectiles/guns/projectile/laser_gatling.dm +++ b/code/modules/projectiles/guns/projectile/laser_gatling.dm @@ -124,11 +124,11 @@ else qdel(src) -/obj/item/weapon/gun/projectile/minigun/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) +/obj/item/weapon/gun/projectile/minigun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override) if(ammo_pack) if(ammo_pack.overheat < ammo_pack.overheat_max) - . = ..() - ammo_pack.overheat++ + ammo_pack.overheat += burst_size + ..() else user << "The gun's heat sensor locked the trigger to prevent lens damage." @@ -141,9 +141,9 @@ if(!ammo_pack) if(istype(loc,/obj/item/weapon/minigunpack)) //We should spawn inside a ammo pack so let's use that one. ammo_pack = loc + ..() else qdel(src)//No pack, no gun - ..() /obj/item/weapon/gun/projectile/minigun/dropped(mob/living/user) ammo_pack.attach_gun(user)