From 6fc6989b9c4f3a23998a97ffe78abc02bcd7b62d Mon Sep 17 00:00:00 2001 From: LatD Date: Mon, 18 Apr 2016 19:27:28 +0300 Subject: [PATCH 1/4] Update xenobio_camera.dm --- code/modules/research/xenobiology/xenobio_camera.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index dbc201fab83..0bf433fd62b 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -25,6 +25,7 @@ var/list/stored_slimes = list() var/max_slimes = 5 var/monkeys = 0 + var/monkeypart = 0 //5 of these make a monkey icon_screen = "slime_comp" icon_keyboard = "rd_key" @@ -142,7 +143,7 @@ var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc) food.LAssailant = C X.monkeys -- - owner << "[X] now has [X.monkeys] monkeys left." + owner << "[X] now has [X.monkeys + X.monkeypart/5] monkeys left." /datum/action/innate/monkey_recycle @@ -160,5 +161,8 @@ for(var/mob/living/carbon/monkey/M in remote_eye.loc) if(M.stat) M.visible_message("[M] vanishes as they are reclaimed for recycling!") - X.monkeys += 0.2 + X.monkeypart += 1 qdel(M) + if(X.monkeypart = 5) + X.monkeys += 1 + X.monkeypart = 0 From b1ed5c18ff278664d1a2f81d05b21ee7f60ea280 Mon Sep 17 00:00:00 2001 From: LatD Date: Mon, 18 Apr 2016 19:49:21 +0300 Subject: [PATCH 2/4] Fix possible but unlikely exploit --- code/modules/research/xenobiology/xenobio_camera.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 0bf433fd62b..60e2977cba4 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -163,6 +163,6 @@ M.visible_message("[M] vanishes as they are reclaimed for recycling!") X.monkeypart += 1 qdel(M) - if(X.monkeypart = 5) + if(X.monkeypart >= 5) X.monkeys += 1 X.monkeypart = 0 From a17a9a4b14ca0a7085399f286445547daf760045 Mon Sep 17 00:00:00 2001 From: LatD Date: Mon, 18 Apr 2016 21:06:27 +0300 Subject: [PATCH 3/4] Change var to round --- code/modules/research/xenobiology/xenobio_camera.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 60e2977cba4..486ef778305 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -25,7 +25,6 @@ var/list/stored_slimes = list() var/max_slimes = 5 var/monkeys = 0 - var/monkeypart = 0 //5 of these make a monkey icon_screen = "slime_comp" icon_keyboard = "rd_key" @@ -161,8 +160,5 @@ for(var/mob/living/carbon/monkey/M in remote_eye.loc) if(M.stat) M.visible_message("[M] vanishes as they are reclaimed for recycling!") - X.monkeypart += 1 + X.monkeys = round(X.monkeys + 0.2,0.1) qdel(M) - if(X.monkeypart >= 5) - X.monkeys += 1 - X.monkeypart = 0 From 9ff553c77feee9bf7ac561daa636510e04d9cb01 Mon Sep 17 00:00:00 2001 From: LatD Date: Mon, 18 Apr 2016 21:07:08 +0300 Subject: [PATCH 4/4] Forgot to remove one var --- code/modules/research/xenobiology/xenobio_camera.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 486ef778305..9f4680da6d6 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -142,7 +142,7 @@ var/mob/living/carbon/monkey/food = new /mob/living/carbon/monkey(remote_eye.loc) food.LAssailant = C X.monkeys -- - owner << "[X] now has [X.monkeys + X.monkeypart/5] monkeys left." + owner << "[X] now has [X.monkeys] monkeys left." /datum/action/innate/monkey_recycle