From e6c7594bf7943e97128dc279787fb3f44a7c760e Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 27 Aug 2023 06:24:01 +1000 Subject: [PATCH 1/3] Fixes runtime in sentient prize vendor --- code/modules/casino/casino.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index d866a4d1199..f62a3ce4737 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -563,11 +563,12 @@ if("Cancel") return if("Show selected Prize") - if(QDELETED(selected_collar)) - collar_list -= selected_collar - sentientprizes_ckeys_list -= selected_collar.sentientprizeckey + if(!selected_collar || QDELETED(selected_collar)) + if(selected_collar) + collar_list -= selected_collar + sentientprizes_ckeys_list -= selected_collar.sentientprizeckey + selected_collar = null to_chat(user, "No collar is currently selected or the currently selected one has been destroyed or disabled.") - selected_collar = null return to_chat(user, "Sentient Prize information") to_chat(user, "Name: [selected_collar.sentientprizename]") From 6c28e7d272594bbe97067563e8ad91e6ff54575f Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 27 Aug 2023 06:24:23 +1000 Subject: [PATCH 2/3] Slightly improves fix --- code/modules/casino/casino.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index f62a3ce4737..dc4843ca62c 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -563,7 +563,7 @@ if("Cancel") return if("Show selected Prize") - if(!selected_collar || QDELETED(selected_collar)) + if(QDELETED(selected_collar)) if(selected_collar) collar_list -= selected_collar sentientprizes_ckeys_list -= selected_collar.sentientprizeckey From 644ad80d65bf0896482348d8d9a3c1a86058b788 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 27 Aug 2023 06:38:16 +1000 Subject: [PATCH 3/3] Update casino.dm --- code/modules/casino/casino.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/casino/casino.dm b/code/modules/casino/casino.dm index dc4843ca62c..d5516efed1d 100644 --- a/code/modules/casino/casino.dm +++ b/code/modules/casino/casino.dm @@ -133,6 +133,7 @@ var/ball_desc = "a small metal ball" icon = 'icons/obj/casino.dmi' icon_state = "roulette_ball" + w_class = ITEMSIZE_TINY var/cheatball = FALSE