From f8aba186fbaaa2e745c5b41e1660b9388c8d4025 Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:26:49 -0400
Subject: [PATCH 1/6] Fixes 4824
---
code/game/objects/items/storage/large_holster.dm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index b4a6c3a8c1af..4f9929136bba 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -249,6 +249,10 @@
if(!ishuman(user) || user.is_mob_incapacitated())
return FALSE
+ if(user.back != src)
+ to_chat(usr, "The [src] must be equipped before you can switch types")
+ return
+
var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand()
if(!istype(F))
to_chat(usr, "You must be holding the M240-T incinerator unit to use [src]")
From b3f8c6b483d2b27563c5d8a10f72b73b5cf3f6aa Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:33:32 -0400
Subject: [PATCH 2/6] Update code/game/objects/items/storage/large_holster.dm
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
---
code/game/objects/items/storage/large_holster.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 4f9929136bba..e65ab1b2fb44 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -255,7 +255,7 @@
var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand()
if(!istype(F))
- to_chat(usr, "You must be holding the M240-T incinerator unit to use [src]")
+ to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
return
if(!active_fuel)
From e1e106c9a88129d0f65535c0fb4a05bbedac817b Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:34:02 -0400
Subject: [PATCH 3/6] Update code/game/objects/items/storage/large_holster.dm
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
---
code/game/objects/items/storage/large_holster.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index e65ab1b2fb44..549a1b141771 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -253,8 +253,8 @@
to_chat(usr, "The [src] must be equipped before you can switch types")
return
- var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand()
- if(!istype(F))
+ var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
+ if(!istype(flamer))
to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
return
From 335402ce8ac4159a2cd089fa36729f62a7e30376 Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:34:09 -0400
Subject: [PATCH 4/6] Update code/game/objects/items/storage/large_holster.dm
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
---
code/game/objects/items/storage/large_holster.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 549a1b141771..6555a1d7eb8e 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -250,7 +250,7 @@
return FALSE
if(user.back != src)
- to_chat(usr, "The [src] must be equipped before you can switch types")
+ to_chat(user, "The [src] must be equipped before you can switch types")
return
var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
From 62bd6dda553a885fba82dc238840b1d9e5c98d30 Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:48:28 -0400
Subject: [PATCH 5/6] kills single-letter var
---
code/game/objects/items/storage/large_holster.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index 6555a1d7eb8e..b7e799324f72 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -271,14 +271,14 @@
else
active_fuel = fuelB
- for(var/X in actions)
- var/datum/action/A = X
- A.update_button_icon()
+ for(var/action in actions)
+ var/datum/action/action_added = action
+ action_added.update_button_icon()
to_chat(user, "You switch the fuel tank to [active_fuel.caliber]")
playsound(src, 'sound/machines/click.ogg', 25, TRUE)
- F.current_mag = active_fuel
- F.update_icon()
+ flamer.current_mag = active_fuel
+ flamer.update_icon()
return TRUE
From 27e3a1fdcbcdcf3715db18131b956b7238253a99 Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Thu, 2 Nov 2023 01:52:44 -0400
Subject: [PATCH 6/6] better loop
---
code/game/objects/items/storage/large_holster.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index b7e799324f72..b95479dff79d 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -271,8 +271,7 @@
else
active_fuel = fuelB
- for(var/action in actions)
- var/datum/action/action_added = action
+ for(var/datum/action/action_added as anything in actions)
action_added.update_button_icon()
to_chat(user, "You switch the fuel tank to [active_fuel.caliber]")