cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 17:43:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes

Browse Source 
A few fixes
This commit is contained in:
variableundefined
2018-10-12 13:48:02 +08:00
committed by GitHub
parent 3a9dfe8521 6c6d35d133
commit 96f5046f19
9 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/crates.dm
+2 -2
View File
@@ -69,8 +69,8 @@
break
if(O.density || O.anchored || istype(O,/obj/structure/closet))
continue
if(istype(O, /obj/structure/stool/bed)) //This is only necessary because of rollerbeds and swivel chairs.
var/obj/structure/stool/bed/B = O
if(istype(O, /obj/structure/bed)) //This is only necessary because of rollerbeds and swivel chairs.
var/obj/structure/bed/B = O
if(B.buckled_mob)
continue
O.forceMove(src)
code/game/objects/structures/plasticflaps.dm
+3 -3
View File
@@ -65,8 +65,8 @@
if(istype(A) && A.checkpass(PASSGLASS))
return prob(60)
var/obj/structure/stool/bed/B = A
if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
var/obj/structure/bed/B = A
if(istype(A, /obj/structure/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
return 0
if(istype(A, /obj/structure/closet/cardboard))
@@ -133,4 +133,4 @@
return ..()
/obj/structure/plasticflaps/mining/CanAtmosPass(turf/T)
return 0
return 0