Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
This commit is contained in:
kevinz000
2017-08-24 21:07:58 -07:00
committed by GitHub
parent 188193eb61
commit c638386507
219 changed files with 40493 additions and 56328 deletions
@@ -110,17 +110,17 @@
return 1
/obj/structure/closet/proc/dump_contents()
var/turf/T = get_turf(src)
var/atom/L = drop_location()
for(var/atom/movable/AM in src)
AM.forceMove(T)
AM.forceMove(L)
if(throwing) // you keep some momentum when getting out of a thrown closet
step(AM, dir)
if(throwing)
throwing.finalize(FALSE)
/obj/structure/closet/proc/take_contents()
var/turf/T = get_turf(src)
for(var/atom/movable/AM in T)
var/atom/L = drop_location()
for(var/atom/movable/AM in L)
if(AM != src && insert(AM) == -1) // limit reached
break
@@ -448,3 +448,6 @@
/obj/structure/closet/singularity_act()
dump_contents()
..()
/obj/structure/closet/AllowDrop()
return TRUE