From 433305b967471070d4b489e3d8577f23e13461a0 Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Mon, 26 Sep 2016 20:16:38 -0400 Subject: [PATCH 1/8] Fixed a runtime error when eating a crayon. --- code/game/objects/items/crayons.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index a79ee1e4704..3c881c6358f 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -380,6 +380,9 @@ if(edible && (M == user)) user << "You take a bite of the [src.name]. Delicious!" var/eaten = use_charges(5) + if(eaten == 0) //Prevents divsion by zero + check_empty() + return var/fraction = min(eaten / reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction * volume_multiplier) reagents.trans_to(M, eaten, volume_multiplier) From 3a8c7ecbd74dbe11db5af5e759815d6ddfb62484 Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Tue, 27 Sep 2016 19:24:35 -0400 Subject: [PATCH 2/8] Update crayons.dm Changed to reagents.total_volume --- code/game/objects/items/crayons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 3c881c6358f..9d33f94cb22 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -380,7 +380,7 @@ if(edible && (M == user)) user << "You take a bite of the [src.name]. Delicious!" var/eaten = use_charges(5) - if(eaten == 0) //Prevents divsion by zero + if(!reagents.total_volume) //Prevents divsion by zero check_empty() return var/fraction = min(eaten / reagents.total_volume, 1) From 36e52cf79b99b84f94d6c8c5a5f29ea1ba5edfe5 Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Tue, 27 Sep 2016 20:36:17 -0400 Subject: [PATCH 3/8] Added user as an argument --- code/game/objects/items/crayons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 9d33f94cb22..71a555e2ab2 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -381,7 +381,7 @@ user << "You take a bite of the [src.name]. Delicious!" var/eaten = use_charges(5) if(!reagents.total_volume) //Prevents divsion by zero - check_empty() + check_empty(user) return var/fraction = min(eaten / reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction * volume_multiplier) From 1a554d8bd26853aa7dcd0b480fca9fb3d250bd4c Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Thu, 29 Sep 2016 22:38:38 -0400 Subject: [PATCH 4/8] Removal and grammar fix --- code/game/objects/items/crayons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 71a555e2ab2..aa67fb00673 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -137,7 +137,7 @@ if(charges == -1) . = FALSE else if(!charges_left) - user << "There is no more of [src.name] \ + user << "There is no more of the [src.name] \ left!" if(self_contained) qdel(src) @@ -381,7 +381,7 @@ user << "You take a bite of the [src.name]. Delicious!" var/eaten = use_charges(5) if(!reagents.total_volume) //Prevents divsion by zero - check_empty(user) + check_empty() return var/fraction = min(eaten / reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction * volume_multiplier) From b88a4572a4b77f40a6fa1d6283871b580c2e5900 Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Fri, 30 Sep 2016 00:45:12 -0400 Subject: [PATCH 5/8] Changed to \the --- code/game/objects/items/crayons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index aa67fb00673..a905557fd4f 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -137,7 +137,7 @@ if(charges == -1) . = FALSE else if(!charges_left) - user << "There is no more of the [src.name] \ + user << "There is no more of \the [src.name] \ left!" if(self_contained) qdel(src) From f916e7c331931f801f28e61b75e0558fcd61142a Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Sun, 2 Oct 2016 20:50:29 -0400 Subject: [PATCH 6/8] Suggestion by optimumtact (fix) --- code/game/objects/items/crayons.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index a905557fd4f..ddb33295209 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -130,7 +130,7 @@ // When eating a crayon, check_empty() can be called twice producing // two messages unless we check for being deleted first if(!qdeleted(src)) - . = TRUE + return TRUE . = FALSE // -1 is unlimited charges @@ -381,7 +381,7 @@ user << "You take a bite of the [src.name]. Delicious!" var/eaten = use_charges(5) if(!reagents.total_volume) //Prevents divsion by zero - check_empty() + check_empty(user) return var/fraction = min(eaten / reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction * volume_multiplier) From 7889593e80bdb80a49f4c86c91811c58c08bee48 Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Sun, 2 Oct 2016 20:51:15 -0400 Subject: [PATCH 7/8] Forgot stuff --- code/game/objects/items/crayons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ddb33295209..377d8041a8a 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -129,7 +129,7 @@ /obj/item/toy/crayon/proc/check_empty(mob/user) // When eating a crayon, check_empty() can be called twice producing // two messages unless we check for being deleted first - if(!qdeleted(src)) + if(qdeleted(src)) return TRUE . = FALSE From 494bf90f9071552b175b8cb43a924bfaba48342e Mon Sep 17 00:00:00 2001 From: TheCarlSaganExpress Date: Sun, 2 Oct 2016 23:35:35 -0400 Subject: [PATCH 8/8] TEACH ME YOUR WAYS MAINTAINERS --- code/game/objects/items/crayons.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 377d8041a8a..181fc8d2753 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -380,8 +380,7 @@ if(edible && (M == user)) user << "You take a bite of the [src.name]. Delicious!" var/eaten = use_charges(5) - if(!reagents.total_volume) //Prevents divsion by zero - check_empty(user) + if(check_empty(user)) //Prevents divsion by zero return var/fraction = min(eaten / reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction * volume_multiplier)