cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tabling Changes (#7858)

Browse Source 
Tabling isn't instant anymore, it now needs to timer on the grab to be full. (The action itself is still instant)
    Clicking on a table with harm intent with a grab will now smash the person's face into the table.

Oh, also, I wouldn't recommend smashing a colleague's face onto a table that has shards on it, might turn out messy.
This commit is contained in:
Geeves
2020-01-02 20:41:36 +02:00
committed by Erki
parent 859aa26741
commit 2d3fb2df4c
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tables/interactions.dm
+16 -12
View File
@@ -142,7 +142,7 @@
// Handle harm intent grabbing/tabling.
if(istype(W, /obj/item/grab) && get_dist(src,user)<2)
var/obj/item/grab/G = W
if (istype(G.affecting, /mob/living))
if(istype(G.affecting, /mob/living))
var/mob/living/M = G.affecting
var/obj/occupied = turf_is_crowded()
if(occupied)
@@ -150,7 +150,7 @@
return
if(!user.Adjacent(M))
return
if (G.state < GRAB_AGGRESSIVE)
if(G.state > GRAB_AGGRESSIVE || (G.state != GRAB_PASSIVE && world.time >= (G.last_action + UPGRADE_COOLDOWN)))
if(user.a_intent == I_HURT)
var/blocked = M.run_armor_check(BP_HEAD, "melee")
if (prob(30 * BLOCKED_MULT(blocked)))
@@ -161,21 +161,26 @@
playsound(loc, material.tableslam_noise, 50, 1)
else
playsound(loc, 'sound/weapons/tablehit1.ogg', 50, 1)
var/list/L = take_damage(rand(1,5))
// Shards. Extra damage, plus potentially the fact YOU LITERALLY HAVE A PIECE OF GLASS/METAL/WHATEVER IN YOUR FACE
for(var/obj/item/material/shard/S in L)
var/sanity_counter = 0
for(var/obj/item/material/shard/S in get_turf(src))
if(prob(50))
M.visible_message("<span class='danger'>\The [S] slices [M]'s face messily!</span>",
"<span class='danger'>\The [S] slices your face messily!</span>")
"<span class='danger'>\The [S] slices your face messily!</span>")
M.apply_damage(10, BRUTE, BP_HEAD, blocked)
M.standard_weapon_hit_effects(S, G.assailant, 10, blocked, BP_HEAD)
sanity_counter++
if(sanity_counter >= 3)
break
G.last_action = world.time
else
to_chat(user, "<span class='danger'>You need a better grip to do that!</span>")
return
G.affecting.forceMove(src.loc)
G.affecting.Weaken(rand(2,4))
visible_message("<span class='danger'>[G.assailant] puts [G.affecting] on \the [src].</span>")
qdel(W)
return
else
G.affecting.forceMove(src.loc)
G.affecting.Weaken(rand(2,4))
visible_message("<span class='danger'>[G.assailant] puts [G.affecting] on \the [src].</span>")
to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
return
qdel(W)
return
@@ -238,4 +243,3 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
/obj/structure/table/do_simple_ranged_interaction(var/mob/user)
return