cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Snaxi Areas (#25542)

Browse Source 
* Snaxi Areas

* Fixed
This commit is contained in:
Kurfursten
2020-01-01 15:11:40 -06:00
committed by adrian
parent 022ebb0dea
commit ed66586b98
6 changed files with 127 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/datums/shuttle.dm
View File

@@ -541,6 +541,12 @@
occupants.Add(L)
return occupants
/proc/get_refill_area(var/obj/docking_port/destination/D)
if(ispath(D.refill_area))
return locate(D.refill_area)
else
return get_space_area()
//The proc that does most of the work
//RETURNS: 1 if everything is good, 0 if everything is bad
/datum/shuttle/proc/move_area_to(var/turf/our_center, var/turf/new_center, var/rotate = 0)
@@ -559,11 +565,12 @@
//For displacing
var/throwy = world.maxy
var/area/space
var/obj/docking_port/destination/D = linked_port.docked_with
var/area/refill_area //the area that will be stamped over where the shuttle left
space = get_space_area()
if(!space)
warning("Unable to find space area for shuttle [src.type]")
refill_area = get_refill_area(D)
if(!refill_area)
warning("Unable to find refill area for shuttle [src.type]")
//Make a list of coordinates of turfs to move, and associate the coordinates with the turfs they represent
var/list/turfs_to_move = list()
@@ -650,9 +657,9 @@
else
AM.forceMove(displace_to)
var/area/old_area = get_area(new_turf)
var/area/old_area = get_area(new_turf) //this is the area that is being replaced by shuttle area in the destination
if(!old_area)
old_area = space
old_area = get_space_area()
for(var/O in old_turf.overlays)
var/image/I = O
@@ -674,13 +681,13 @@
//***Remove old turf from shuttle's area****
space.contents.Add(old_turf)
old_turf.change_area(linked_area,space)
refill_area.contents.Add(old_turf)
old_turf.change_area(linked_area,refill_area)
//All objects which can't be moved by the shuttle have their area changed to space!
//All objects which can't be moved by the shuttle have their area changed to refill_area!
for(var/atom/movable/AM in old_turf.contents)
if(!AM.can_shuttle_move(src))
AM.change_area(linked_area,space)
AM.change_area(linked_area,refill_area)
//****Move all variables from the old turf over to the new turf****
@@ -752,7 +759,6 @@
//Delete the old turf
var/replacing_turf_type = old_turf.get_underlying_turf()
var/obj/docking_port/destination/D = linked_port.docked_with
if(D && istype(D))
replacing_turf_type = D.base_turf_type