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

Fix roller beds not folding and bodybags runtiming (#68334)

Browse Source 
* Fixes roller beds not folding on right-click and fixes bodybags runtiming.

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
GuillaumePrata
2022-07-15 19:45:02 -04:00
committed by GitHub
co-authored by Mothblocks
parent a50e7fb115
commit 28e9fa308b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/beds_chairs/bed.dm
+4 -3
View File
@@ -88,15 +88,16 @@
/obj/structure/bed/roller/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(!ishuman(user) || !user.canUseTopic(src, BE_CLOSE))
return FALSE
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(has_buckled_mobs())
return FALSE
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
user.visible_message(span_notice("[user] collapses [src]."), span_notice("You collapse [src]."))
var/obj/structure/bed/roller/folding_bed = new foldabletype(get_turf(src))
user.put_in_hands(folding_bed)
qdel(src)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
/obj/structure/bed/roller/post_buckle_mob(mob/living/M)
set_density(TRUE)
code/game/objects/structures/crates_lockers/closets/bodybag.dm
+2 -1
View File
@@ -65,11 +65,12 @@
/obj/structure/closet/body_bag/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(!attempt_fold(user))
return SECONDARY_ATTACK_CONTINUE_CHAIN
perform_fold(user)
qdel(src)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
/**
* Checks to see if we can fold. Return TRUE to actually perform the fold and delete.