cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

On merge changes and map conflict fixes.

Browse Source
This commit is contained in:
PsiOmega
2015-08-18 18:19:51 +02:00
parent 8138815dc3
commit 75c7313c46
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+2 -4
View File
@@ -290,8 +290,7 @@
set category = "Object"
set src in oview(1)
// TODO : Change to incapacitated() on merge.
if(usr.stat || usr.lying || usr.resting || usr.buckled)
if(usr.incapacitated())
return 0
if(anchored)
@@ -310,8 +309,7 @@
set category = "Object"
set src in oview(1)
// TODO : Change to incapacitated() on merge.
if(usr.stat || usr.lying || usr.resting || usr.buckled)
if(usr.incapacitated())
return 0
if(anchored)