From dcf1b572cf5a6d0de53ffe8ea23b51cd72cc5b2a Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 20 Aug 2019 16:39:34 -0700
Subject: [PATCH] Adds support for admin-bused pneumatic cannons that fire non
 /items again (#45957)

About The Pull Request

Adds an isitem check so load_item doesn't runtime when it adds a non /item into the cannon which admins can trigger using fill_with_type
Why It's Good For The Game

It probably isn't but let's pretend it lets us do something fun other than making a singularity cannon.
Changelog

cl
tweak: Pneumatic cannons can be used with non /items again.
/cl
---
 code/game/objects/items/pneumaticCannon.dm | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 1543e828ece..4d92b7eb9a8 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -126,7 +126,10 @@
 	else
 		I.forceMove(src)
 	loadedItems += I
-	loadedWeightClass += I.w_class
+	if(isitem(I))
+		loadedWeightClass += I.w_class
+	else
+		loadedWeightClass++
 	return TRUE
 
 /obj/item/pneumatic_cannon/afterattack(atom/target, mob/living/user, flag, params)
@@ -183,7 +186,7 @@
 		for(var/i in 1 to throw_amount)
 			if(!loadedItems.len)
 				break
-			var/obj/item/I
+			var/atom/movable/I
 			if(fire_mode == PCANNON_FILO)
 				I = loadedItems[loadedItems.len]
 			else
@@ -191,13 +194,17 @@
 			if(!throw_item(target, I, user))
 				break
 
-/obj/item/pneumatic_cannon/proc/throw_item(turf/target, obj/item/I, mob/user)
-	if(!istype(I))
+/obj/item/pneumatic_cannon/proc/throw_item(turf/target, atom/movable/AM, mob/user)
+	if(!istype(AM))
 		return FALSE
-	loadedItems -= I
-	loadedWeightClass -= I.w_class
-	I.forceMove(get_turf(src))
-	I.throw_at(target, pressureSetting * 10 * range_multiplier, pressureSetting * 2, user, spin_item)
+	loadedItems -= AM
+	if(isitem(AM))
+		var/obj/item/I = AM
+		loadedWeightClass -= I.w_class
+	else
+		loadedWeightClass--
+	AM.forceMove(get_turf(src))
+	AM.throw_at(target, pressureSetting * 10 * range_multiplier, pressureSetting * 2, user, spin_item)
 	return TRUE
 
 /obj/item/pneumatic_cannon/proc/get_target(turf/target, turf/starting)
@@ -214,7 +221,10 @@
 	. = ..()
 	if (loadedItems.Remove(A))
 		var/obj/item/I = A
-		loadedWeightClass -= I.w_class
+		if(istype(I))
+			loadedWeightClass -= I.w_class
+		else
+			loadedWeightClass--
 	else if (A == tank)
 		tank = null
 		update_icon()