Skip to content

Commit

Permalink
Merge pull request #1019 from NopemanMcHalt/pr-ex/WOWTETRIS
Browse files Browse the repository at this point in the history
Rare Tetris Jumpscare, but also an action button to squeak the squeaky bones
  • Loading branch information
MosleyTheMalO authored Dec 19, 2023
2 parents 2a4ac19 + 0758ebe commit 554b322
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions modular_splurt/code/game/machinery/computer/arcade/tetris.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// jojoel
/obj/machinery/computer/arcade/tetris/prizevend(usr, reward_count)
if(prob(1))
playsound(src, 'modular_splurt/sound/misc/GOT_TETRIS.ogg', 50, FALSE, extrarange = -3)
. = ..()
3 changes: 3 additions & 0 deletions modular_splurt/code/game/objects/items/fluff.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Adds squeak action button for squeaky bones (like the one tennis balls have)
/obj/item/toy/fluff/bone_poly/squeak
actions_types = list(/datum/action/item_action/squeeze)
Binary file added modular_splurt/sound/misc/GOT_TETRIS.ogg
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4495,6 +4495,7 @@
#include "modular_splurt\code\game\machinery\limbgrower.dm"
#include "modular_splurt\code\game\machinery\research_table.dm"
#include "modular_splurt\code\game\machinery\computer\slavery.dm"
#include "modular_splurt\code\game\machinery\computer\arcade\tetris.dm"
#include "modular_splurt\code\game\machinery\doors\brigdoors.dm"
#include "modular_splurt\code\game\machinery\doors\poddoor.dm"
#include "modular_splurt\code\game\machinery\doors\shutters.dm"
Expand All @@ -4509,6 +4510,7 @@
#include "modular_splurt\code\game\objects\items\armor_kits.dm"
#include "modular_splurt\code\game\objects\items\cards_ids.dm"
#include "modular_splurt\code\game\objects\items\cosmetics.dm"
#include "modular_splurt\code\game\objects\items\fluff.dm"
#include "modular_splurt\code\game\objects\items\granters.dm"
#include "modular_splurt\code\game\objects\items\holy_weapons.dm"
#include "modular_splurt\code\game\objects\items\manuals.dm"
Expand Down

0 comments on commit 554b322

Please sign in to comment.