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

Mobs are removed from closets first (#15658)

Browse Source
This commit is contained in:
Sancronis
2021-03-28 12:11:03 +01:00
committed by GitHub
parent 9a4f60524c
commit 0a7adc58b0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+7 -3
View File
@@ -75,10 +75,14 @@
/obj/structure/closet/proc/dump_contents()
var/turf/T = get_turf(src)
for(var/atom/movable/AM in src)
AM.forceMove(T)
for(var/mob/AM1 in src) //Does the same as below but removes the mobs first to avoid forcing players to step on items in the locker (e.g. soap) when opened.
AM1.forceMove(T)
if(throwing) // you keep some momentum when getting out of a thrown closet
step(AM, dir)
step(AM1, dir)
for(var/atom/movable/AM2 in src)
AM2.forceMove(T)
if(throwing) // you keep some momentum when getting out of a thrown closet
step(AM2, dir)
if(throwing)
throwing.finalize(FALSE)