From fefa8e37c58e2185bf159d2bb185aa6e7d8e868d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 26 Dec 2016 05:50:52 -0600 Subject: [PATCH] table SLAM --- code/game/objects/structures/tables_racks.dm | 31 ++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index c16605b126..f3478a54c2 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -302,6 +302,26 @@ for(var/obj/item/weapon/shard/S in debris) S.color = NARSIE_WINDOW_COLOUR +/obj/structure/table/glass/attack_hand(mob/living/carbon/human/M, mob/living/user) + var/mob/living/carbon/human/H = M + if (ishuman(M) && (M.a_intent == "harm")) +// if(!H.gloves && !(PIERCEIMMUNE in H.dna.species.specflags)) + //if (istype(H.w_uniform, /obj/item/clothing/under/misc/lawyer)) + src.visible_message("[H] slams their palms against [src]!") + visible_message("[src] breaks!") + playsound(src.loc, "shatter", 50, 1) + new frame(src.loc) + new /obj/item/weapon/shard(src.loc) + qdel(src) + H << "[src] cuts into your hand!" + var/organ = (H.hand ? "l_" : "r_") + "arm" + var/obj/item/bodypart/affecting = H.get_bodypart(organ) + if(affecting && affecting.take_damage(force / 2)) + H.update_damage_overlays(0) + else if(ismonkey(user)) + M << "[src] cuts into your hand!" + M.adjustBruteLoss(force / 2) + /* * Wooden tables */ @@ -333,6 +353,17 @@ /obj/structure/table/wood/poker/narsie_act() new /obj/structure/table/wood(src.loc) +/obj/structure/table/attack_hand(mob/living/carbon/human/M, mob/living/user) + if (ishuman(M) && (M.a_intent == "harm")) + var/mob/living/carbon/human/H = M + //if (istype(H.w_uniform, /obj/item/clothing/under/misc/lawyer)) + src.visible_message("[H] slams their palms against [src]!") + playsound(src.loc, 'sound/effects/meteorimpact.ogg', 50, 1) + //for (var/mob/M in AIviewers(usr, null)) + // if (M.client) + // shake_camera(M, 4, 1, 0.5) + return + /* * Reinforced tables */