cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-27 14:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/supermatter/supermatter.dm
This commit is contained in:
SoundScopes
2014-11-06 01:25:13 +00:00
parent 7696545af2 3944ec5f5d
commit 4090f46636
31 changed files with 526 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/bed.dm
-2
View File
@@ -109,8 +109,6 @@
M.loc = src.loc
M.dir = src.dir
M.update_canmove()
if(!M.mob_has_gravity(M.loc))
M.float(0)
src.buckled_mob = M
src.add_fingerprint(user)
afterbuckle(M)
code/game/objects/structures/target_stake.dm
+2 -2
View File
@@ -142,8 +142,8 @@
M.loc = src.loc
M.dir = src.dir
M.update_canmove()
if(!M.mob_has_gravity(M.loc))
M.float(0)
// if(!M.mob_has_gravity(M.loc))
// M.float(0)
src.buckled_mob = M
src.add_fingerprint(user)
return