From 630c3b613b111503046d0415a9819192180b3317 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 19 Aug 2019 14:11:34 +0200 Subject: [PATCH 1/4] New Dare results. Switchblades, Syringes, Shady looking size guns. More bad results to balance the good. Randomization now operates differently. sahoc rising. --- code/game/machinery/buttons.dm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 2eacaf6dd9..8fa9a44551 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -106,6 +106,7 @@ throw_speed = 2 throw_range = 20 force = 0 + var/luckynumber7 var/colorindex = 1 @@ -120,15 +121,24 @@ /obj/item/device/buttonofnormal/attack_self(mob/user) var/mob/living/capsuleowner = user - //playsound(fate.ogg,100,0) //need to find an omnious noise + playsound(src, 'sound/effects/splat.ogg', 30, 1) sleep(100) - var/fate = rand(0,100) - switch(fate) - if(0 to 20) capsuleowner.resize(RESIZE_TINY) //Loss Shrinking! - if(21 to 40) capsuleowner.apply_damage(5, BRUTE) //Loss Damaging! - if(41 to 60) capsuleowner.Weaken(5) //Loss Knee spaghetti! - if(61 to 80) capsuleowner.hallucination += 66 //loss woah, dude. - if(81 to 100) new /obj/item/weapon/reagent_containers/food/snacks/cookie(src.loc) //Win! - + switch(luckynumber7) + if(1) capsuleowner.resize(RESIZE_TINY) //Loss Shrinking! + if(2) capsuleowner.apply_damage(5, BRUTE) //Loss Damaging! + if(3) capsuleowner.Weaken(5) //Loss Knee spaghetti! + if(4) capsuleowner.hallucination += 66 //loss woah, dude. + if(5) new /obj/item/weapon/reagent_containers/food/snacks/cookie(src.loc) //Win! + //if(6) new /obj/item/weapon/spacecasinocash(src.loc) //Win? Waiting for perm to use. + if(7) + new /obj/item/weapon/material/butterfly/switchblade(src.loc) + capsuleowner.apply_damage(10, BRUTE) //Loss Damaging! WIN KNIVE! + if(8) new /obj/item/weapon/reagent_containers/syringe/drugs(src.loc) + if(9) + new /obj/item/weapon/gun/energy/sizegun/not_advanced(src.loc) + qdel(src) + else luckynumber7 = (rand(0,10)) + luckynumber7 = rand(0,10) + playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) From 5c81200266e91f1302e80626d76448259b87e713 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 19 Aug 2019 14:22:13 +0200 Subject: [PATCH 2/4] VAR FIX --- code/game/machinery/buttons.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 8fa9a44551..73d17303d1 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -106,7 +106,7 @@ throw_speed = 2 throw_range = 20 force = 0 - var/luckynumber7 + var/luckynumber7 = 0 var/colorindex = 1 @@ -119,7 +119,7 @@ update_icon() ..() -/obj/item/device/buttonofnormal/attack_self(mob/user) +/obj/item/device/daredevice/attack_self(mob/user) var/mob/living/capsuleowner = user playsound(src, 'sound/effects/splat.ogg', 30, 1) sleep(100) @@ -139,6 +139,7 @@ qdel(src) else luckynumber7 = (rand(0,10)) luckynumber7 = rand(0,10) + sleep(100) playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) From d9ea50b97ce0cd9b7d84f494481d6dc39c622ba0 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 19 Aug 2019 14:25:00 +0200 Subject: [PATCH 3/4] RIG --- code/game/machinery/buttons.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 73d17303d1..3017e5ebed 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -137,6 +137,7 @@ if(9) new /obj/item/weapon/gun/energy/sizegun/not_advanced(src.loc) qdel(src) + if(777) new /obj/item/weapon/spacecash/c1000(src.loc) //for rigging else luckynumber7 = (rand(0,10)) luckynumber7 = rand(0,10) sleep(100) From e83306b8ad5a2577f28f653fccb6062de7f82572 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 19 Aug 2019 14:28:20 +0200 Subject: [PATCH 4/4] include casino --- code/game/machinery/buttons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 3017e5ebed..b5f0a5e2c4 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -129,7 +129,7 @@ if(3) capsuleowner.Weaken(5) //Loss Knee spaghetti! if(4) capsuleowner.hallucination += 66 //loss woah, dude. if(5) new /obj/item/weapon/reagent_containers/food/snacks/cookie(src.loc) //Win! - //if(6) new /obj/item/weapon/spacecasinocash(src.loc) //Win? Waiting for perm to use. + if(6) new /obj/item/weapon/spacecasinocash(src.loc) //Win? if(7) new /obj/item/weapon/material/butterfly/switchblade(src.loc) capsuleowner.apply_damage(10, BRUTE) //Loss Damaging! WIN KNIVE!