Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions modular_darkpack/modules/z_travel/code/helpers.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copypasta of get_z_move_affected
/// Returns a list of movables that should also be affected when src moves through teleporters, and src.
/atom/movable/proc/get_teleport_move_affected()
. = list(src)
if(buckled_mobs)
. |= buckled_mobs
for(var/mob/living/buckled as anything in buckled_mobs)
if(buckled.pulling)
. |= buckled.pulling
if(pulling)
. |= pulling
if (pulling.buckled_mobs)
. |= pulling.buckled_mobs

if (pulling.pulling)
. |= pulling.pulling.get_teleport_move_affected()
8 changes: 5 additions & 3 deletions modular_darkpack/modules/z_travel/code/transfer_point.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,12 @@ GLOBAL_LIST_EMPTY(unallocted_transfer_points)
var/moved_dir = get_dir(arrived, src)
var/turf/exit_turf
exit_turf = get_open_turf_in_dir(exit, moved_dir)
if(exit_turf)
return arrived.forceMove(exit_turf)
if(!exit_turf)
exit_turf = get_turf(exit)

return arrived.forceMove(get_turf(exit))
var/atom/movable/moving_stuff = arrived.get_teleport_move_affected()
for(var/atom/movable/moving in moving_stuff)
moving.forceMove(exit_turf)

// Use inside the umbra. visible
/obj/transfer_point_vamp/umbral
Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for tgstation.dme.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\area_dwelling.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\obj_dwelling.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\weather\code\weather.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\powers\code\discipline\healer_valeren.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\powers\code\discipline\mytherceria.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\bloodpack_adulteration.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\economy\code\stocks_license.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\app.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\app_types.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\computers\code\computer.dm.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.

Expand Down Expand Up @@ -8024,6 +8024,7 @@
#include "modular_darkpack\modules\werewolf_the_apocalypse\code\subsplats\tribes\garou.dm"
#include "modular_darkpack\modules\westfield_mall\code\mall_areas.dm"
#include "modular_darkpack\modules\westfield_mall\code\modular_rooms.dm"
#include "modular_darkpack\modules\z_travel\code\helpers.dm"
#include "modular_darkpack\modules\z_travel\code\manhole.dm"
#include "modular_darkpack\modules\z_travel\code\transfer_point.dm"
// END_INCLUDE
Loading