cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Transit Tubes Use Forcemove (#11688)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-18 17:08:39 -07:00
committed by GitHub
parent 3c99ad60e0
commit c5e6bc7d7e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/objects/structures/transit_tubes.dm
View File

@@ -42,7 +42,7 @@
/obj/structure/transit_tube_pod/Destroy() /obj/structure/transit_tube_pod/Destroy()
for(var/atom/movable/AM in contents) for(var/atom/movable/AM in contents)
AM.loc = loc AM.forceMove(get_turf(src))
. = ..() . = ..()
@@ -53,7 +53,7 @@
switch(severity) switch(severity)
if(1.0) if(1.0)
for(var/atom/movable/AM in contents) for(var/atom/movable/AM in contents)
AM.loc = loc AM.forceMove(get_turf(src))
AM.ex_act(severity++) AM.ex_act(severity++)
qdel(src) qdel(src)
@@ -61,7 +61,7 @@
if(2.0) if(2.0)
if(prob(50)) if(prob(50))
for(var/atom/movable/AM in contents) for(var/atom/movable/AM in contents)
AM.loc = loc AM.forceMove(get_turf(src))
AM.ex_act(severity++) AM.ex_act(severity++)
qdel(src) qdel(src)
@@ -96,7 +96,7 @@
to_chat(AM, span_warning("The tube's support pylons block your way.")) to_chat(AM, span_warning("The tube's support pylons block your way."))
return ..() return ..()
else else
AM.loc = src.loc AM.forceMove(get_turf(src))
to_chat(AM, span_info("You slip under the tube.")) to_chat(AM, span_info("You slip under the tube."))
/obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj) /obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj)
@@ -106,7 +106,7 @@
to_chat(AM, span_notice("The pod is already occupied.")) to_chat(AM, span_notice("The pod is already occupied."))
return return
else if(!pod.moving && (pod.dir in directions())) else if(!pod.moving && (pod.dir in directions()))
AM.loc = pod AM.forceMove(pod)
return return
@@ -313,7 +313,7 @@
last_delay = current_tube.enter_delay(src, next_dir) last_delay = current_tube.enter_delay(src, next_dir)
sleep(last_delay) sleep(last_delay)
set_dir(next_dir) set_dir(next_dir)
loc = next_loc // When moving from one tube to another, skip collision and such. forceMove(next_loc) // When moving from one tube to another, skip collision and such.
density = current_tube.density density = current_tube.density
if(current_tube && current_tube.should_stop_pod(src, next_dir)) if(current_tube && current_tube.should_stop_pod(src, next_dir))
@@ -366,7 +366,7 @@
if(istype(mob, /mob) && mob.client) if(istype(mob, /mob) && mob.client)
// If the pod is not in a tube at all, you can get out at any time. // If the pod is not in a tube at all, you can get out at any time.
if(!(locate(/obj/structure/transit_tube) in loc)) if(!(locate(/obj/structure/transit_tube) in loc))
mob.loc = loc mob.forceMove(get_turf(src))
mob.client.Move(get_step(loc, direction), direction) mob.client.Move(get_step(loc, direction), direction)
//if(moving && istype(loc, /turf/space)) //if(moving && istype(loc, /turf/space))
@@ -379,7 +379,7 @@
if(!station.pod_moving) if(!station.pod_moving)
if(direction == station.dir) if(direction == station.dir)
if(station.icon_state == "open") if(station.icon_state == "open")
mob.loc = loc mob.forceMove(get_turf(src))
mob.client.Move(get_step(loc, direction), direction) mob.client.Move(get_step(loc, direction), direction)
else else