shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds table slamming as a right click interaction for tables (#7006)

Browse Source 
* Adds table slamming as a right click interaction for tables

* and the DME, too. fuck.

* fixes compiling errors
This commit is contained in:
deathride58
2018-06-05 18:16:17 +00:00
committed by kevinz000
parent 8a971eaa06
commit 4076078210
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/objects/structures/tables_racks.dm
+10
View File
@@ -0,0 +1,10 @@
/obj/structure/table/alt_attack_hand(mob/user)
if(user && Adjacent(user) && !user.incapacitated())
if(istype(user) && user.a_intent == INTENT_HARM)
user.visible_message("<span class='warning'>[user] slams [p_their()] palms down on [src].</span>", "<span class='warning'>You slam your palms down on [src].</span>")
playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
else
user.visible_message("<span class='notice'>[user] slaps [p_their()] hands on [src].</span>", "<span class='notice'>You slap your hands on [src].</span>")
playsound(src, 'sound/weapons/tap.ogg', 50, 1)
user.do_attack_animation(src)
return TRUE
tgstation.dme
+1
View File
@@ -2726,6 +2726,7 @@
#include "modular_citadel\code\game\objects\items\melee\eutactic_blades.dm"
#include "modular_citadel\code\game\objects\items\melee\transforming.dm"
#include "modular_citadel\code\game\objects\items\storage\firstaid.dm"
#include "modular_citadel\code\game\objects\structures\tables_racks.dm"
#include "modular_citadel\code\game\objects\structures\beds_chairs\chair.dm"
#include "modular_citadel\code\game\objects\structures\beds_chairs\sofa.dm"
#include "modular_citadel\code\game\objects\structures\crates_lockers\closets\fitness.dm"