From 7fdc689fbf43ed694c63e4f25f7ff7f73d408193 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 8 Jul 2021 00:41:28 -0400 Subject: [PATCH 1/4] Fix runtime on custom thing when not equipped --- code/modules/vore/fluffstuff/custom_clothes_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 7ff0d97769..7cba0803a3 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2319,7 +2319,7 @@ Departamental Swimsuits, for general use item_state = "rgb" overlay_state = "rgb" to_chat(user, "The polychromic plates in your cloak activate, turning it white.") - has_suit.update_clothing_icon() + has_suit?.update_clothing_icon() /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/verb/color_verb() set name = "Swap color" From a32b1975ee1f78f34aef9fe92cc822f0a65ebf19 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 8 Jul 2021 00:41:40 -0400 Subject: [PATCH 2/4] Fix stack_trace caught when doing rig seals --- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index f442ecff07..d518848dc2 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -335,7 +335,7 @@ if("helmet") to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") M.update_inv_head() - if(helmet) + if(helmet?.light_system == STATIC_LIGHT) helmet.update_light(wearer) //sealed pieces become airtight, protecting against diseases From f0d0970895787c4e9dd76f11d4e2da089e2d83e2 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 8 Jul 2021 00:42:12 -0400 Subject: [PATCH 3/4] Everything can be gone by the time this spawn ends Maybe this should be a timer with a callback, but it sure is a lot of logic to handle that --- code/modules/food/food/snacks.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 7a0daebe5f..5d2c6f3ca9 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -1014,7 +1014,9 @@ /obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() if (src.warm) - spawn(4200) + spawn(420 SECONDS) + if(!src?.reagents) + return src.warm = 0 for(var/reagent in heated_reagents) src.reagents.del_reagent(reagent) From 846b0bfd9c46fac49c838a9739bff9c74a3acfa4 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 8 Jul 2021 00:42:25 -0400 Subject: [PATCH 4/4] Missing an indent here --- code/modules/reagents/holder/holder.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm index cdb602ad70..8ddf4752b5 100644 --- a/code/modules/reagents/holder/holder.dm +++ b/code/modules/reagents/holder/holder.dm @@ -123,7 +123,7 @@ add_reagent_id = "[item]juice" if(add_reagent_id) //If we did find it, add it to our list of reagents to add, and add the number to our total. add_reagents[add_reagent_id] += data[item] - totalnum += data[item] + totalnum += data[item] if(totalnum) var/multconst = amount/totalnum //We're going to add these extra reagents so that they share the ratio described, but only add up to 1x the existing amount at the most