cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update living.dm

Browse Source
This commit is contained in:
Novacat
2020-02-22 09:50:36 -05:00
committed by GitHub
parent 11eed81b92
commit 6385766328
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/living.dm
View File

@@ -774,12 +774,7 @@ default behaviour is:
to_chat(usr, "[src] does not have any stored infomation!")
else
to_chat(usr, "OOC Metadata is not supported by this server!")
<<<<<<< HEAD
//VOREStation Edit End - Making it so SSD people have prefs with fallback to original style.
=======
>>>>>>> 48eba82... Merge pull request #6710 from Cerebulon/precisionplacement
return
/mob/living/Move(a, b, flag)
if (buckled && buckled.loc != a) //not updating position