From a81a3d0661977ee6cdb39e2506a7d13755a49318 Mon Sep 17 00:00:00 2001
From: Tails2091 <40816748+Tails2091@users.noreply.github.com>
Date: Sat, 28 Jul 2018 17:30:52 -0400
Subject: [PATCH 1/2] Fixes Prize Ball dropping single tickets

---
 code/modules/arcade/arcade_prize.dm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index 6af1ca30f36..d9c08c580ea 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -2,7 +2,6 @@
 * Prize balls
 * Prize tickets
 */
-
 /obj/item/toy/prizeball
 	name = "prize ball"
 	desc = "A toy is a toy, but a prize ball could be anything! It could even be a toy!"
@@ -25,7 +24,7 @@
 	var/prize_inside = pick(possible_contents)
 	spawn(10)
 		user.unEquip(src)
-		if(istype(prize_inside, /obj/item/stack))
+		if(prize_inside == /obj/item/stack/tickets)
 			var/amount = pick(5, 10, 15, 25, 50)
 			new prize_inside(user.loc, amount)
 		else
@@ -79,11 +78,12 @@
 
 /obj/item/stack/tickets/update_icon()
 	var/amount = get_amount()
-	if((amount >= 75))
-		icon_state = "tickets_4"
-	else if(amount >=25)
-		icon_state = "tickets_3"
-	else if(amount >= 4)
-		icon_state = "tickets_2"
-	else
-		icon_state = "tickets_1"
+	switch(amount)
+		if(1 to 3)
+			icon_state = "tickets_1"	// One ticket
+		if(4 to 24)
+			icon_state = "tickets_2"	// Couple tickets
+		if(25 to 74)
+			icon_state = "tickets_3"	// Buncha tickets
+		else
+			icon_state = "tickets_4"	// Ticket snake
\ No newline at end of file

From 012b1dded085d43f1f16f3eb5b001fab431e1cd4 Mon Sep 17 00:00:00 2001
From: Tails2091 <40816748+Tails2091@users.noreply.github.com>
Date: Sun, 29 Jul 2018 22:07:47 -0400
Subject: [PATCH 2/2] Changed to ispath and removed unecessary variable

---
 code/modules/arcade/arcade_prize.dm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index d9c08c580ea..94c265848b7 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -24,7 +24,7 @@
 	var/prize_inside = pick(possible_contents)
 	spawn(10)
 		user.unEquip(src)
-		if(prize_inside == /obj/item/stack/tickets)
+		if(ispath(prize_inside,/obj/item/stack))
 			var/amount = pick(5, 10, 15, 25, 50)
 			new prize_inside(user.loc, amount)
 		else
@@ -77,8 +77,7 @@
 	return
 
 /obj/item/stack/tickets/update_icon()
-	var/amount = get_amount()
-	switch(amount)
+	switch(get_amount())
 		if(1 to 3)
 			icon_state = "tickets_1"	// One ticket
 		if(4 to 24)