cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev

Browse Source 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
This commit is contained in:
Erthilo
2013-08-31 17:45:31 +01:00
parent 3dd21206f0 2454d72233
commit b75d97a488
52 changed files with 173 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
View File

@@ -35,17 +35,8 @@
src.layer = FLY_LAYER
else
src.layer = OBJ_LAYER
if(buckled_mob)
if(buckled_mob.loc != src.loc)
buckled_mob.buckled = null //Temporary, so Move() succeeds.
if(!buckled_mob.Move(loc))
unbuckle()
buckled_mob = null
else
buckled_mob.buckled = src //Restoring
if(buckled_mob)
buckled_mob.dir = dir
buckled_mob.dir = dir
/obj/structure/stool/bed/chair/verb/rotate()
set name = "Rotate Chair"
@@ -114,6 +105,12 @@
/obj/structure/stool/bed/chair/office/Move()
..()
if(buckled_mob)
buckled_mob.buckled = null //Temporary, so Move() succeeds.
var/moved = buckled_mob.Move(src.loc)
buckled_mob.buckled = src
if(!moved)
unbuckle()
handle_rotation()
/obj/structure/stool/bed/chair/office/light