From 2ac8378e7e6eca58db0e10d91d4d41084a96e84d Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 12 Aug 2021 01:57:19 +0200
Subject: [PATCH] [MIRROR] fixes cannons not working (#7511)

* fixes cannons not working (#60757)

* fixes cannons not working

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
---
 code/game/objects/structures/cannons/cannon.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm
index 5277e69cde5..f20c88e26bd 100644
--- a/code/game/objects/structures/cannons/cannon.dm
+++ b/code/game/objects/structures/cannons/cannon.dm
@@ -64,7 +64,7 @@
 		return
 
 	else if(ignition_message)
-		if(!reagents.has_reagent(/datum/reagent/gunpowder,charge_size) || !reagents.has_reagent(/datum/reagent/fuel,charge_size))
+		if(!reagents.has_reagent(/datum/reagent/gunpowder,charge_size) && !reagents.has_reagent(/datum/reagent/fuel,charge_size))
 			balloon_alert(user, "needs [reagents.maximum_volume]u of charge!")
 			return
 		visible_message(ignition_message)