cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-27 03:22:15 -04:00
parent b9adc37685
commit 0c391cc252
3 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/gravemarker.dm
-10
View File
@@ -129,16 +129,6 @@
return
if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
return
<<<<<<< HEAD
else
if(ismouse(usr))
return
if(!usr || !isturf(usr.loc))
return
if(usr.stat || usr.restrained())
return
=======
>>>>>>> 8ec3691... Merge pull request #5770 from Atermonera/standard_rotation
src.set_dir(turn(src.dir, 270))
return
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
-12
View File
@@ -75,21 +75,9 @@
if(!usr || !isturf(usr.loc))
return
<<<<<<< HEAD
else
if(istype(usr,/mob/living/simple_mob/animal/passive/mouse))
return
if(!usr || !isturf(usr.loc))
return
if(usr.stat || usr.restrained())
return
src.set_dir(turn(src.dir, 90))
=======
if(usr.stat || usr.restrained())
return
if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
>>>>>>> 8ec3691... Merge pull request #5770 from Atermonera/standard_rotation
return
src.set_dir(turn(src.dir, 270))