Skip to content

Commit

Permalink
Merge pull request #796 from LikeLakers2/allow-open-if-strong-grabbed…
Browse files Browse the repository at this point in the history
…-by-opener

Allow those with H.A.U.L. Gauntlets to open their pulled crate, without stopping their pull
  • Loading branch information
wraith-54321 authored Dec 28, 2023
2 parents 1c5e186 + dc9409d commit 1cdfff1
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion code/game/objects/structures/crates_lockers/closets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,10 @@
return TRUE
if(welded || locked)
return FALSE
if(strong_grab)
//MONKESTATION EDIT START - Allow a strong grabber to open their own pulled closet
//if(strong_grab) //MONKESTATION EDIT ORIGINAL
if(strong_grab && pulledby != user)
//MONKESTATION EDIT END
to_chat(user, span_danger("[pulledby] has an incredibly strong grip on [src], preventing it from opening."))
return FALSE
var/turf/T = get_turf(src)
Expand Down

0 comments on commit 1cdfff1

Please sign in to comment.