From 9bf58de009430e41df3e2de7ed6268cbd145fb79 Mon Sep 17 00:00:00 2001 From: TheVekter Date: Tue, 3 Feb 2015 08:25:50 -0600 Subject: [PATCH 1/4] Added red button --- code/game/machinery/computer/arcade.dm | 3 ++- code/game/objects/items/toys.dm | 27 +++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index b0f9f5fb88e..7f1f9bdb3ed 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -28,7 +28,8 @@ /obj/item/toy/nuke = 2, /obj/item/toy/minimeteor = 2, /obj/item/toy/carpplushie = 2, - /obj/item/toy/foamblade = 2 + /obj/item/toy/foamblade = 2, + /obj/item/toy/redbutton = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index db374f48f67..b93e780dfbf 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1091,4 +1091,29 @@ obj/item/toy/cards/deck/syndicate desc = "An adorable stuffed toy that resembles a space carp." icon = 'icons/obj/toy.dmi' icon_state = "carpplushie" - w_class = 2.0 \ No newline at end of file + w_class = 2.0 + +/* + * Toy big red button + */ +/obj/item/toy/redbutton + name = "big red button" + desc = "A big, plastic red button. Reads 'From HonkCo Pranksİ' on the back." + icon = 'icons/obj/assemblies.dmi' + icon_state = "bigred" + w_class = 2.0 + var/cooldown = 0 + +/obj/item/toy/redbutton/attack_self(mob/user) + if (cooldown < world.time) + cooldown = (world.time + 300) // Sets cooldown at 30 seconds + user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") + //spawn(5) //gia said so + playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, surround = 0) + for(var/mob/M in range(10, src)) // Checks range + if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI + sleep(8) // Short delay to match up with the explosion sound + shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. + + else + user << "Nothing happens." \ No newline at end of file From de0175bfee44d42ac100de7a35bebd359fe25fb4 Mon Sep 17 00:00:00 2001 From: TheVekter Date: Tue, 3 Feb 2015 08:37:48 -0600 Subject: [PATCH 2/4] Blargh removed commented code I'm fuckin' tired --- code/game/objects/items/toys.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b93e780dfbf..6c21bea8066 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -14,6 +14,7 @@ * Fake meteor * Carp plushie * Foam armblade + * Toy big red button */ @@ -1108,7 +1109,6 @@ obj/item/toy/cards/deck/syndicate if (cooldown < world.time) cooldown = (world.time + 300) // Sets cooldown at 30 seconds user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") - //spawn(5) //gia said so playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, surround = 0) for(var/mob/M in range(10, src)) // Checks range if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI From e5ff40b4e87e697c9367cf2fc0e360fd3ee83cab Mon Sep 17 00:00:00 2001 From: TheVekter Date: Wed, 4 Feb 2015 02:37:10 -0600 Subject: [PATCH 3/4] haw I forgot the changelog --- html/changelogs/Vekter-PR-7526.yml | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 html/changelogs/Vekter-PR-7526.yml diff --git a/html/changelogs/Vekter-PR-7526.yml b/html/changelogs/Vekter-PR-7526.yml new file mode 100644 index 00000000000..990821084e5 --- /dev/null +++ b/html/changelogs/Vekter-PR-7526.yml @@ -0,0 +1,37 @@ + +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscdel (general adding of nice things) +# rscadd (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Vekter + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +#delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added a toy red button to the Arcade cabinets." \ No newline at end of file From 0af739eeed9b705640e80109bead25ff5da00403 Mon Sep 17 00:00:00 2001 From: TheVekter Date: Wed, 4 Feb 2015 03:13:20 -0600 Subject: [PATCH 4/4] Update Vekter-PR-7526.yml --- html/changelogs/Vekter-PR-7526.yml | 35 ++---------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/html/changelogs/Vekter-PR-7526.yml b/html/changelogs/Vekter-PR-7526.yml index 990821084e5..e6166381f0c 100644 --- a/html/changelogs/Vekter-PR-7526.yml +++ b/html/changelogs/Vekter-PR-7526.yml @@ -1,37 +1,6 @@ - -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscdel (general adding of nice things) -# rscadd (general deleting of nice things) -# imageadd -# imagedel -# spellcheck (typo fixes) -# experiment -# tgs (TG-ported fixes?) -################################# - -# Your name. author: Vekter -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -#delete-after: True +delete-after: True -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Added a toy red button to the Arcade cabinets." \ No newline at end of file + - rscadd: "Added a toy red button to the Arcade cabinets."