From cc4cc991428a3ece4704a9bef8e7749f8cc1e289 Mon Sep 17 00:00:00 2001 From: Manatee Date: Tue, 14 Jun 2022 20:02:19 -0500 Subject: [PATCH 1/9] BRRRRRRRRT --- .../projectiles/guns/ballistic/minigun.dm | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 11c740f869c5..bf6e8292012b 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -113,7 +113,8 @@ slot_flags = null w_class = WEIGHT_CLASS_HUGE materials = list() - burst_size = 3 + burst_size = 5 + var/select = 1 automatic = FALSE fire_delay = 1 recoil = 0.5 @@ -122,6 +123,7 @@ weapon_weight = WEAPON_HEAVY fire_sound = 'sound/weapons/gunshot.ogg' mag_type = /obj/item/ammo_box/magazine/internal/minigunosprey + actions_types = list(/datum/action/item_action/toggle_firemode) tac_reloads = FALSE casing_ejector = FALSE item_flags = NEEDS_PERMIT | SLOWS_WHILE_IN_HAND @@ -172,3 +174,25 @@ /obj/item/gun/ballistic/minigunosprey/dropped(mob/living/user) . = ..() ammo_pack.attach_gun(user) + +/obj/item/gun/ballistic/minigunosprey/ui_action_click(mob/user, actiontype) + if(istype(actiontype, /datum/action/item_action/toggle_firemode)) + burst_select() + else + ..() + +/obj/item/gun/ballistic/minigunosprey/proc/burst_select() + var/mob/living/carbon/human/user = usr + switch(select) + if(0) + select = 1 + burst_size = initial(burst_size) + fire_delay = initial(fire_delay) + to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) + if(1) + select = 0 + burst_size = 10 + fire_delay = initial(fire_delay) + to_chat(user, span_notice("You switch to [burst_size]-rnd burst. BRRRRRRRT.")) + playsound(user, 'sound/weapons/empty.ogg', 100, 1) + return From 4f6c881db7f30c1565df14585628c57c53ed544c Mon Sep 17 00:00:00 2001 From: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:00:38 -0500 Subject: [PATCH 2/9] Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic/minigun.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index bf6e8292012b..4142b5ace088 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -184,15 +184,13 @@ /obj/item/gun/ballistic/minigunosprey/proc/burst_select() var/mob/living/carbon/human/user = usr switch(select) - if(0) - select = 1 + if(!select) + select = TRUE burst_size = initial(burst_size) - fire_delay = initial(fire_delay) to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) - if(1) - select = 0 + else + select = FALSE burst_size = 10 - fire_delay = initial(fire_delay) to_chat(user, span_notice("You switch to [burst_size]-rnd burst. BRRRRRRRT.")) - playsound(user, 'sound/weapons/empty.ogg', 100, 1) + playsound(user, 'sound/weapons/empty.ogg', 100, TRUE) return From 72a599341121d52d6ab46a20f6e5fab1ed4321c4 Mon Sep 17 00:00:00 2001 From: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:00:47 -0500 Subject: [PATCH 3/9] Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic/minigun.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 4142b5ace088..b83427cdd812 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -178,8 +178,7 @@ /obj/item/gun/ballistic/minigunosprey/ui_action_click(mob/user, actiontype) if(istype(actiontype, /datum/action/item_action/toggle_firemode)) burst_select() - else - ..() + . = ..() /obj/item/gun/ballistic/minigunosprey/proc/burst_select() var/mob/living/carbon/human/user = usr From 4327f7f08895d9daf7d14960e75594ac4ee79473 Mon Sep 17 00:00:00 2001 From: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:00:57 -0500 Subject: [PATCH 4/9] Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic/minigun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index b83427cdd812..c6f8787db31f 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -114,7 +114,7 @@ w_class = WEIGHT_CLASS_HUGE materials = list() burst_size = 5 - var/select = 1 + var/select = TRUE automatic = FALSE fire_delay = 1 recoil = 0.5 From d4875e48e239c9aa084c77cce677dc3773ae0297 Mon Sep 17 00:00:00 2001 From: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:01:04 -0500 Subject: [PATCH 5/9] Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic/minigun.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index c6f8787db31f..0e44abe0ef7f 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -182,7 +182,6 @@ /obj/item/gun/ballistic/minigunosprey/proc/burst_select() var/mob/living/carbon/human/user = usr - switch(select) if(!select) select = TRUE burst_size = initial(burst_size) From d40985a616a7a7053c886c1d2c334e27ad8a5248 Mon Sep 17 00:00:00 2001 From: Manatee <74586965+MajManatee@users.noreply.github.com> Date: Tue, 14 Jun 2022 22:01:11 -0500 Subject: [PATCH 6/9] Update code/modules/projectiles/guns/ballistic/minigun.dm Co-authored-by: tattax <71668564+tattax@users.noreply.github.com> --- code/modules/projectiles/guns/ballistic/minigun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 0e44abe0ef7f..492eea009cb0 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -181,7 +181,7 @@ . = ..() /obj/item/gun/ballistic/minigunosprey/proc/burst_select() - var/mob/living/carbon/human/user = usr + var/mob/living/carbon/user = usr if(!select) select = TRUE burst_size = initial(burst_size) From 3d46f904a39bb9234c34966d2f88a4933a2eabe4 Mon Sep 17 00:00:00 2001 From: Theos Date: Wed, 15 Jun 2022 17:22:05 -0400 Subject: [PATCH 7/9] Update minigun.dm --- .../projectiles/guns/ballistic/minigun.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 492eea009cb0..cf27d273454a 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -182,13 +182,13 @@ /obj/item/gun/ballistic/minigunosprey/proc/burst_select() var/mob/living/carbon/user = usr - if(!select) - select = TRUE - burst_size = initial(burst_size) - to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) - else - select = FALSE - burst_size = 10 - to_chat(user, span_notice("You switch to [burst_size]-rnd burst. BRRRRRRRT.")) + if(!select) + select = TRUE + burst_size = initial(burst_size) + to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) + else + select = FALSE + burst_size = 10 + to_chat(user, span_notice("You switch to [burst_size]-rnd burst. BRRRRRRRT.")) playsound(user, 'sound/weapons/empty.ogg', 100, TRUE) return From 5dacb9c9567104bf7d8f265062b01c6bfa07f9f4 Mon Sep 17 00:00:00 2001 From: Manatee Date: Tue, 21 Jun 2022 16:49:47 -0500 Subject: [PATCH 8/9] nerfs fun --- code/modules/projectiles/guns/ballistic/minigun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index cf27d273454a..06c77fedf4cb 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -188,7 +188,7 @@ to_chat(user, span_notice("You switch to [burst_size]-rnd burst.")) else select = FALSE - burst_size = 10 + burst_size = 7 to_chat(user, span_notice("You switch to [burst_size]-rnd burst. BRRRRRRRT.")) playsound(user, 'sound/weapons/empty.ogg', 100, TRUE) return From 74b8e500f83b2f616c16d6f73cb60d60b91f9f62 Mon Sep 17 00:00:00 2001 From: Manatee Date: Tue, 21 Jun 2022 17:03:40 -0500 Subject: [PATCH 9/9] spread reduction --- code/modules/projectiles/guns/ballistic/minigun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/minigun.dm b/code/modules/projectiles/guns/ballistic/minigun.dm index 06c77fedf4cb..2559f6567a91 100644 --- a/code/modules/projectiles/guns/ballistic/minigun.dm +++ b/code/modules/projectiles/guns/ballistic/minigun.dm @@ -118,7 +118,7 @@ automatic = FALSE fire_delay = 1 recoil = 0.5 - spread = 34 + spread = 30 fire_sound_volume = 60 weapon_weight = WEAPON_HEAVY fire_sound = 'sound/weapons/gunshot.ogg'