diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index b16a937f3e..e31d2a278e 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -47,7 +47,6 @@ #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/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 4b1bb960e0..91416b560b 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -136,7 +136,7 @@ /datum/crafting_recipe/minigun name = "Laser Minigun" result = /obj/item/minigunpack2 - reqs = list(/obj/item/gun/energy/laser = 3, + reqs = list(/obj/item/gun/energy/laser/carbine = 3, /obj/item/stack/sheet/plasteel = 5, /obj/item/stack/cable_coil = 30, /obj/item/stock_parts/cell/bluespace = 2) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 6f54782641..b14994cf25 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -71,6 +71,6 @@ /obj/item/ammo_casing/energy/laser/weak projectile_type = /obj/item/projectile/beam/weak/minigun - e_cost = 5 - delay = 0 + e_cost = 10 fire_sound = 'sound/weapons/gatling.ogg' + click_cooldown_override = 1 diff --git a/code/modules/projectiles/guns/energy/minigun.dm b/code/modules/projectiles/guns/energy/minigun.dm index f8ae3a4847..d903cda47c 100644 --- a/code/modules/projectiles/guns/energy/minigun.dm +++ b/code/modules/projectiles/guns/energy/minigun.dm @@ -12,7 +12,7 @@ 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 = 200 + var/overheat_max = 60 var/heat_diffusion = 5 /obj/item/minigunpack2/Initialize() @@ -97,6 +97,8 @@ icon_state = "minigun_spin" item_state = "minigun" flags_1 = CONDUCT_1 + force = 15 + recoil = 2 slowdown = 1 slot_flags = null w_class = WEIGHT_CLASS_HUGE @@ -105,7 +107,6 @@ burst_size = 2 automatic = 1 can_charge = 0 - firing_burst = FALSE selfcharge = EGUN_SELFCHARGE charge_tick = 2 charge_delay = 5 @@ -130,15 +131,13 @@ else qdel(src) -/obj/item/gun/energy/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 15) +/obj/item/gun/energy/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) if(ammo_pack) if(ammo_pack.overheat < ammo_pack.overheat_max) ammo_pack.overheat += burst_size ..() 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 71dd748dac..e89794bacd 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -40,6 +40,8 @@ damage = 15 /obj/item/projectile/beam/weak/minigun + damage = 12.5 + armour_penetration = 40 /obj/item/projectile/beam/weak/minigun/Initialize() .=..() diff --git a/sound/weapons/gatling.ogg b/sound/weapons/gatling.ogg index ad3170e8eb..0f8045560d 100644 Binary files a/sound/weapons/gatling.ogg and b/sound/weapons/gatling.ogg differ