From cb29f47adc83ef2d93bd931964fd006b65870e4e Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Wed, 3 Jul 2024 07:30:38 +0300 Subject: [PATCH] ehhh --- code/__DEFINES/dcs/signals/atom/signals_movable.dm | 2 +- code/game/turfs/transit.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/dcs/signals/atom/signals_movable.dm b/code/__DEFINES/dcs/signals/atom/signals_movable.dm index c207ce1468d5..c43001487719 100644 --- a/code/__DEFINES/dcs/signals/atom/signals_movable.dm +++ b/code/__DEFINES/dcs/signals/atom/signals_movable.dm @@ -11,7 +11,7 @@ #define COMPONENT_CANCEL_MOVE (1<<0) /// From /turf/open/gm/river/Entered(): (turf/open/gm/river/river, covered) #define COMSIG_MOVABLE_ENTERED_RIVER "movable_entered_river" -/// From /atom/Cross(): (atom) +/// From /atom/movable/proc/doMove: I think it only works with forceMove so watch out #define COMSIG_MOVABLE_PRE_CROSSED "movable_pre_cross" #define COMPONENT_IGNORE_CROSS (1<<0) diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm index 7d44d34c1bc5..d1094a025a8b 100644 --- a/code/game/turfs/transit.dm +++ b/code/game/turfs/transit.dm @@ -136,7 +136,7 @@ /atom/movable/proc/handle_paradrop(turf/target, dropship_name) clear_active_explosives() - //ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION) + ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_DROPSHIP_INTERACTION) ADD_TRAIT(src, TRAIT_UNDENSE, TRAIT_SOURCE_DROPSHIP_INTERACTION) ADD_TRAIT(src, TRAIT_NO_STRAY, TRAIT_SOURCE_DROPSHIP_INTERACTION) RegisterSignal(src, COMSIG_MOVABLE_PRE_CROSSED, PROC_REF(cancel_cross))