cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Placing a fireman carried person onto a table no longer harms them (#58147)

Browse Source 
Previously, clicking on a table with a fireman carried person while not in combat mode would start a do_after(), then harmfully smash the person you fireman carrying into the table. This harmful smash has been replaced by your character merely placing the fireman carried person onto the table, like what happens when you click on a table while not in combat mode while you have someone in a grab. You can still click on a table with a fireman carried person while in combat mode to perform a limb smash, if you wish.
This commit is contained in:
ATH1909
2021-04-05 11:54:56 -05:00
committed by GitHub
parent 30ddbcc825
commit 1b68ca0a34
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+2 -2
View File
@@ -82,7 +82,7 @@
else
pushed_mob.visible_message("<span class='notice'>[user] begins to place [pushed_mob] onto [src]...</span>", \
"<span class='userdanger'>[user] begins to place [pushed_mob] onto [src]...</span>")
if(do_after(user, 35, target = pushed_mob))
if(do_after(user, 3.5 SECONDS, target = pushed_mob))
tableplace(user, pushed_mob)
else
return
@@ -210,7 +210,7 @@
"<span class='userdanger'>[user] begins to[skills_space] place [carried_mob] onto [src]...</span>")
if(do_after(user, tableplace_delay, target = carried_mob))
user.unbuckle_mob(carried_mob)
tablepush(user, carried_mob)
tableplace(user, carried_mob)
return TRUE
if(!user.combat_mode && !(I.item_flags & ABSTRACT))