From 4fd26f4de8c261b6dcb9a22afb2f7eb7fb9fdc44 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 5 Apr 2024 14:03:53 +0200 Subject: [PATCH 1/5] init --- code/modules/projectiles/gun.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 3f7533f26620..0252ed8ca38e 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -26,6 +26,7 @@ flags_atom = FPRINT|CONDUCT flags_item = TWOHANDED light_system = DIRECTIONAL_LIGHT + interup_tactical_Reload = INTERRUPT_INCAPACITATED var/accepted_ammo = list() ///Determines what kind of bullet is created when the gun is unloaded - used to match rounds to magazines. Set automatically when reloading. From e025c1e3ae649ec5ed26421598c98bcd3acaaec4 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 5 Apr 2024 14:05:10 +0200 Subject: [PATCH 2/5] eh --- code/modules/projectiles/gun_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 781db8fc1222..4ded70972fc0 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -312,7 +312,7 @@ DEFINES in setup.dm, referenced here. var/tac_reload_time = 15 if(user.skills) tac_reload_time = max(15 - 5*user.skills.get_skill_level(SKILL_FIREARMS), 5) - if(do_after(user,tac_reload_time, INTERRUPT_ALL, BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) + if(do_after(user,tac_reload_time, src.interup_tactical_Reload, BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) if(isstorage(magazine.loc)) var/obj/item/storage/master_storage = magazine.loc master_storage.remove_from_storage(magazine) From 2408b0283193e54c4fc7788b58ab0bea69c2940a Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 5 Apr 2024 14:08:49 +0200 Subject: [PATCH 3/5] r --- code/modules/projectiles/gun.dm | 2 +- code/modules/projectiles/gun_helpers.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0252ed8ca38e..0ec9a067f89a 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -26,7 +26,7 @@ flags_atom = FPRINT|CONDUCT flags_item = TWOHANDED light_system = DIRECTIONAL_LIGHT - interup_tactical_Reload = INTERRUPT_INCAPACITATED + interup_tactical_reload = INTERRUPT_INCAPACITATED var/accepted_ammo = list() ///Determines what kind of bullet is created when the gun is unloaded - used to match rounds to magazines. Set automatically when reloading. diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index 4ded70972fc0..ed92f7e4e092 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -312,7 +312,7 @@ DEFINES in setup.dm, referenced here. var/tac_reload_time = 15 if(user.skills) tac_reload_time = max(15 - 5*user.skills.get_skill_level(SKILL_FIREARMS), 5) - if(do_after(user,tac_reload_time, src.interup_tactical_Reload, BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) + if(do_after(user,tac_reload_time, src.interup_tactical_reload , BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) if(isstorage(magazine.loc)) var/obj/item/storage/master_storage = magazine.loc master_storage.remove_from_storage(magazine) From ec40f45833e18346a6607de83fd60866f3161e17 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 5 Apr 2024 14:12:03 +0200 Subject: [PATCH 4/5] var --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0ec9a067f89a..ffbfcce2d3ab 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -26,7 +26,7 @@ flags_atom = FPRINT|CONDUCT flags_item = TWOHANDED light_system = DIRECTIONAL_LIGHT - interup_tactical_reload = INTERRUPT_INCAPACITATED + var/interup_tactical_reload = INTERRUPT_INCAPACITATED var/accepted_ammo = list() ///Determines what kind of bullet is created when the gun is unloaded - used to match rounds to magazines. Set automatically when reloading. From ca632cd8acd404e14a384f68b08fd0a6ea5405a4 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Fri, 5 Apr 2024 16:42:47 +0200 Subject: [PATCH 5/5] hardcodes new proper checks into the function --- code/modules/projectiles/gun.dm | 1 - code/modules/projectiles/gun_helpers.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index ffbfcce2d3ab..3f7533f26620 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -26,7 +26,6 @@ flags_atom = FPRINT|CONDUCT flags_item = TWOHANDED light_system = DIRECTIONAL_LIGHT - var/interup_tactical_reload = INTERRUPT_INCAPACITATED var/accepted_ammo = list() ///Determines what kind of bullet is created when the gun is unloaded - used to match rounds to magazines. Set automatically when reloading. diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm index ed92f7e4e092..1f407081f033 100644 --- a/code/modules/projectiles/gun_helpers.dm +++ b/code/modules/projectiles/gun_helpers.dm @@ -312,7 +312,7 @@ DEFINES in setup.dm, referenced here. var/tac_reload_time = 15 if(user.skills) tac_reload_time = max(15 - 5*user.skills.get_skill_level(SKILL_FIREARMS), 5) - if(do_after(user,tac_reload_time, src.interup_tactical_reload , BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) + if(do_after(user,tac_reload_time, (INTERRUPT_ALL & (~INTERRUPT_MOVED)) , BUSY_ICON_FRIENDLY) && magazine.loc == old_mag_loc && !current_mag) if(isstorage(magazine.loc)) var/obj/item/storage/master_storage = magazine.loc master_storage.remove_from_storage(magazine)