From 23b4f2837a8d820ffe7ad98fd7eab0fde75978e7 Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Wed, 18 Sep 2024 22:25:58 -0400 Subject: [PATCH] revenants can now flip tables (#26747) --- .../miniantags/revenant/revenant_abilities.dm | 12 ++++++++++++ code/game/objects/structures/tables_racks.dm | 2 ++ 2 files changed, 14 insertions(+) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index 4e0dad4425f..9f033e7a997 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -9,6 +9,18 @@ if(modifiers["middle"]) MiddleClickOn(A) return + if(modifiers["middle"] && modifiers["shift"] && modifiers["ctrl"]) + MiddleShiftControlClickOn(A) + return + if(modifiers["middle"] && modifiers["shift"]) + MiddleShiftClickOn(A) + return + if(modifiers["shift"] && modifiers["ctrl"]) + CtrlShiftClickOn(A) + return + if(modifiers["shift"] && modifiers["alt"]) + AltShiftClickOn(A) + return if(modifiers["shift"]) ShiftClickOn(A) return diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index b084ed71f87..4046c481c47 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -359,6 +359,8 @@ return 0 SECONDS // sure if(!issimple_animal(flipper)) return 0 SECONDS + if(istype(flipper, /mob/living/simple_animal/revenant)) + return 0 SECONDS // funny ghost table switch(flipper.mob_size) if(MOB_SIZE_TINY) return 30 SECONDS // you can do it but you gotta *really* work for it