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

[READY] Fireman carry QoL changes (#49733)

Browse Source 
* Fireman carry

* Change requests.

* doc
This commit is contained in:
Rohesie
2020-03-22 18:00:56 -04:00
committed by GitHub
parent c7ea74be12
commit 906d6f3d24
5 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+28
View File
@@ -175,6 +175,34 @@
return
// If the tray IS empty, continue on (tray will be placed on the table like other items)
if(istype(I, /obj/item/riding_offhand))
var/obj/item/riding_offhand/riding_item = I
var/mob/living/carried_mob = riding_item.rider
if(carried_mob == user) //Piggyback user.
return
switch(user.a_intent)
if(INTENT_HARM)
user.unbuckle_mob(carried_mob)
tableheadsmash(user, carried_mob)
if(INTENT_HELP)
var/tableplace_delay = 3.5 SECONDS
var/skills_space = ""
if(HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
tableplace_delay = 2 SECONDS
skills_space = " expertly"
else if(HAS_TRAIT(user, TRAIT_QUICK_CARRY))
tableplace_delay = 2.75 SECONDS
skills_space = " quickly"
carried_mob.visible_message("<span class='notice'>[user] begins to[skills_space] place [carried_mob] onto [src]...</span>",
"<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)
tableplace(user, carried_mob)
else
user.unbuckle_mob(carried_mob)
tablepush(user, carried_mob)
return TRUE
if(user.a_intent != INTENT_HARM && !(I.item_flags & ABSTRACT))
if(user.transferItemToLoc(I, drop_location(), silent = FALSE))
var/list/click_params = params2list(params)