diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index e31d2a278e..b16a937f3e 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -47,6 +47,7 @@ #define CLICK_CD_MELEE 8 #define CLICK_CD_RANGE 4 #define CLICK_CD_RAPID 2 +#define CLICK_CD_HYPERSPEED 1 #define CLICK_CD_CLICK_ABILITY 6 #define CLICK_CD_BREAKOUT 100 #define CLICK_CD_HANDCUFFED 10 diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 40f929a816..6f54782641 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -70,6 +70,7 @@ fire_sound = 'sound/weapons/laser.ogg' /obj/item/ammo_casing/energy/laser/weak - projectile_type = /obj/item/projectile/beam/weak - e_cost = 20 + projectile_type = /obj/item/projectile/beam/weak/minigun + e_cost = 5 + delay = 0 fire_sound = 'sound/weapons/gatling.ogg' diff --git a/code/modules/projectiles/guns/energy/minigun.dm b/code/modules/projectiles/guns/energy/minigun.dm index 07fc374a23..f8ae3a4847 100644 --- a/code/modules/projectiles/guns/energy/minigun.dm +++ b/code/modules/projectiles/guns/energy/minigun.dm @@ -12,8 +12,8 @@ var/obj/item/gun/energy/minigun/gun var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded. var/overheat = 0 - var/overheat_max = 50 - var/heat_diffusion = 2 + var/overheat_max = 200 + var/heat_diffusion = 5 /obj/item/minigunpack2/Initialize() . = ..() @@ -105,6 +105,7 @@ burst_size = 2 automatic = 1 can_charge = 0 + firing_burst = FALSE selfcharge = EGUN_SELFCHARGE charge_tick = 2 charge_delay = 5 @@ -136,6 +137,8 @@ ..() else to_chat(user, "The gun's heat sensor locked the trigger to prevent lens damage.") + if(user.a_intent == INTENT_HARM) + user.changeNext_move(CLICK_CD_HYPERSPEED) /obj/item/gun/energy/minigun/afterattack(atom/target, mob/living/user, flag, params) if(!ammo_pack || ammo_pack.loc != user) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index cbd0348743..71dd748dac 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -39,6 +39,12 @@ /obj/item/projectile/beam/weak damage = 15 +/obj/item/projectile/beam/weak/minigun + +/obj/item/projectile/beam/weak/minigun/Initialize() + .=..() + speed = pick(0.7,0.75,0.8,0.85,0.9,0.95,1,1.05,1.1,1.15) + /obj/item/projectile/beam/weak/penetrator armour_penetration = 50