From 9ea5ddeba736e004b31a35279ebf5e612a967204 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 22 Aug 2019 12:53:27 +0200 Subject: [PATCH 1/3] Dare/Chaos button Restructure --- code/game/machinery/buttons.dm | 110 ++++++++++++++++----------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index b5f0a5e2c4..322544f2f5 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -56,35 +56,35 @@ var/mob/living/capsuleowner = null //taken from Capsule Code var/sizetouse = 0.25 -/obj/item/device/buttonofnormal/pickup(mob/user) - if(!capsuleowner) - capsuleowner = user + pickup(mob/user) + if(!capsuleowner) + capsuleowner = user -/obj/item/device/buttonofnormal/attack_self(mob/user) - if(colorindex) - nonrandom() - sleep(10) - capsuleowner.resize(sizetouse) - sizetouse = rand(25,200)/100 //randmization occurs after press - -/obj/item/device/buttonofnormal/throw_impact(atom/A, speed, mob/user) - ..() - if(isliving(A)) + attack_self(mob/user) if(colorindex) nonrandom() - sleep(5) - var/mob/living/capsulehit = A - capsulehit.resize(sizetouse) + sleep(10) + capsuleowner.resize(sizetouse) sizetouse = rand(25,200)/100 //randmization occurs after press -/obj/item/device/buttonofnormal/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/pen)) - colorindex += 1 - if(colorindex >= 6) - colorindex = 0 - icon_state = "mobcap[colorindex]" - update_icon() - ..() + throw_impact(atom/A, speed, mob/user) + ..() + if(isliving(A)) + if(colorindex) + nonrandom() + sleep(5) + var/mob/living/capsulehit = A + capsulehit.resize(sizetouse) + sizetouse = rand(25,200)/100 //randmization occurs after press + + attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/weapon/pen)) + colorindex += 1 + if(colorindex >= 6) + colorindex = 0 + icon_state = "mobcap[colorindex]" + update_icon() + ..() /obj/item/device/buttonofnormal/proc/nonrandom() //Secret ball randmoizer rig code switch(colorindex) @@ -110,37 +110,37 @@ var/colorindex = 1 -/obj/item/device/daredevice/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/pen)) - colorindex += 1 - if(colorindex >= 6) - colorindex = 0 - icon_state = "mobcap[colorindex]" - update_icon() - ..() + attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/weapon/pen)) + colorindex += 1 + if(colorindex >= 6) + colorindex = 0 + icon_state = "mobcap[colorindex]" + update_icon() + ..() -/obj/item/device/daredevice/attack_self(mob/user) - var/mob/living/capsuleowner = user - playsound(src, 'sound/effects/splat.ogg', 30, 1) - sleep(100) - 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? - 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) - if(777) new /obj/item/weapon/spacecash/c1000(src.loc) //for rigging - else luckynumber7 = (rand(0,10)) - luckynumber7 = rand(0,10) - sleep(100) - playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) + attack_self(mob/user) + var/mob/living/capsuleowner = user + playsound(src, 'sound/effects/splat.ogg', 30, 1) + sleep(100) + 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? + 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) + if(777) new /obj/item/weapon/spacecash/c1000(src.loc) //for rigging + else luckynumber7 = (rand(0,10)) + luckynumber7 = rand(0,10) + sleep(100) + playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) From e46e9e28f813701d3e6632689b4a7e83b63f2896 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Thu, 22 Aug 2019 12:55:30 +0200 Subject: [PATCH 2/3] Update buttons.dm --- code/game/machinery/buttons.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 322544f2f5..35bd05d49e 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -44,14 +44,11 @@ desc = "It radiates an aura of chaotic size energy." icon = 'icons/obj/mobcap.dmi' icon_state = "mobcap0" - matter = list(DEFAULT_WALL_MATERIAL = 1000) - throwforce = 00 throw_speed = 4 throw_range = 20 force = 0 - var/colorindex = 0 var/mob/living/capsuleowner = null //taken from Capsule Code var/sizetouse = 0.25 @@ -99,15 +96,12 @@ desc = "A strange button, the only distinguishing feature being an engraved text reading 'Suffer to Gain.'." icon = 'icons/obj/mobcap.dmi' icon_state = "mobcap1" - matter = list(DEFAULT_WALL_MATERIAL = 5000) - throwforce = 00 throw_speed = 2 throw_range = 20 force = 0 var/luckynumber7 = 0 - var/colorindex = 1 attackby(obj/item/W, mob/user) @@ -142,5 +136,3 @@ luckynumber7 = rand(0,10) sleep(100) playsound(src.loc, 'sound/machines/slotmachine.ogg', 25, 1) - -