mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
-Shuttles inflict heavy brute damage instead of instagibbing
-Behaviour extended to supply shuttle
This commit is contained in:
@@ -21,23 +21,7 @@ datum/shuttle_manager/proc/move_shuttle(var/override_delay)
|
||||
fromArea = locate(location) //the location of the shuttle
|
||||
toArea = locate(fromArea.destination)
|
||||
|
||||
var/list/dstturfs = list()
|
||||
var/throwy = world.maxy
|
||||
|
||||
for(var/turf/T in toArea)
|
||||
dstturfs += T
|
||||
if(T.y < throwy)
|
||||
throwy = T.y
|
||||
|
||||
// Destroy everything in the destination area
|
||||
for(var/turf/T in dstturfs)
|
||||
for(var/atom/movable/AM as mob|obj in T)
|
||||
AM.ex_act(1) //splat
|
||||
if(AM)
|
||||
qdel(AM)
|
||||
|
||||
if(istype(T, /turf/simulated))
|
||||
del(T)
|
||||
toArea.clear_docking_area()
|
||||
|
||||
fromArea.move_contents_to(toArea)
|
||||
location = toArea.type
|
||||
@@ -64,8 +48,6 @@ datum/shuttle_manager/proc/move_shuttle(var/override_delay)
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/machinery/computer/shuttle
|
||||
name = "Shuttle Console"
|
||||
icon = 'icons/obj/computer.dmi'
|
||||
|
||||
Reference in New Issue
Block a user