From 12c538ea0eebe8e5c79fbbbb6a8dd6638608c7fc Mon Sep 17 00:00:00 2001 From: warior4356 Date: Sun, 14 Oct 2018 03:26:42 -0700 Subject: [PATCH] Used Wrap incorrectly, max is exclusive --- code/game/objects/structures/safe.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index aad0486bbd0..b0df47bcbd7 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -32,10 +32,10 @@ FLOOR SAFES tumbler_1_pos = rand(0, 99) do tumbler_1_open = rand(0, 99) - while(tumbler_1_open > Wrap(tumbler_2_open +48, 0, 99) && tumbler_1_open < Wrap(tumbler_2_open + 53, 0, 99)) // prevents a combination that wont open + while(tumbler_1_open > Wrap(tumbler_2_open +48, 0, 100) && tumbler_1_open < Wrap(tumbler_2_open + 53, 0, 100)) // prevents a combination that wont open do open_pos = rand(0,99) - while(open_pos > Wrap(tumbler_1_open - 2, 0, 99) && open_pos < Wrap(tumbler_1_open + 2, 0, 99)) // prevents a combination that wont open + while(open_pos > Wrap(tumbler_1_open - 2, 0, 100) && open_pos < Wrap(tumbler_1_open + 2, 0, 100)) // prevents a combination that wont open var/num1 = tumbler_2_open + 54 if(num1 > 99) num1 = num1 - 100 @@ -145,12 +145,12 @@ FLOOR SAFES return for(var/i=1 to ticks) if(!check_unlocked()) - dial = Wrap(dial - 1, 0 ,99) + dial = Wrap(dial - 1, 0 ,100) if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 99) - tumbler_1_pos = Wrap(tumbler_1_pos - 1, 0, 99) + tumbler_1_pos = Wrap(tumbler_1_pos - 1, 0, 100) tum1_turns++ if(tumbler_1_pos == tumbler_2_pos + 51 || tumbler_1_pos == tumbler_2_pos - 49) - tumbler_2_pos = Wrap(tumbler_1_pos - 1, 0, 99) + tumbler_2_pos = Wrap(tumbler_2_pos - 1, 0, 100) tum2_turns++ check_unlocked() make_noise(tum1_turns, tum2_turns, user, canhear) @@ -164,12 +164,12 @@ FLOOR SAFES return for(var/i=1 to ticks) check_unlocked() - dial = Wrap(dial + 1, 0, 99) + dial = Wrap(dial + 1, 0, 100) if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 99) - tumbler_1_pos = Wrap(tumbler_1_pos + 1, 0, 99) + tumbler_1_pos = Wrap(tumbler_1_pos + 1, 0, 100) tum1_turns++ if(tumbler_1_pos == tumbler_2_pos - 51 || tumbler_1_pos == tumbler_2_pos + 49) - tumbler_2_pos = Wrap(tumbler_2_pos + 1, 0, 99) + tumbler_2_pos = Wrap(tumbler_2_pos + 1, 0, 100) tum2_turns++ make_noise(tum1_turns, tum2_turns, user, canhear) .=1