diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm deleted file mode 100644 index be1e9b31c8..0000000000 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm +++ /dev/null @@ -1,3 +0,0 @@ -/// from base of atom/movable/Process_Spacemove(): (movement_dir) -#define COMSIG_MOVABLE_SPACEMOVE "spacemove" - #define COMSIG_MOVABLE_STOP_SPACEMOVE (1<<0) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 642dc79076..25e2f1a292 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -23,21 +23,6 @@ QDEL_NULL(ion_trail) return ..() -/obj/item/tank/jetpack/item_action_slot_check(slot) - if(slot == ITEM_SLOT_BACK) - return TRUE - -/obj/item/tank/jetpack/equipped(mob/user, slot, initial) - . = ..() - if(on && slot != ITEM_SLOT_BACK) - turn_off(user) - -/obj/item/tank/jetpack/dropped(mob/user, silent) - . = ..() - if(on) - turn_off(user) - - /obj/item/tank/jetpack/populate_gas() if(gas_type) air_contents.set_moles(gas_type, ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))) @@ -72,7 +57,6 @@ icon_state = "[initial(icon_state)]-on" ion_trail.start() RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/move_react) - RegisterSignal(user, COMSIG_MOVABLE_SPACEMOVE, .proc/spacemove_react) if(full_speed) user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) else @@ -110,13 +94,6 @@ else ..() -/obj/item/tank/jetpack/proc/spacemove_react(mob/user, movement_dir) - SIGNAL_HANDLER - - if(on && (movement_dir || stabilizers)) - return COMSIG_MOVABLE_STOP_SPACEMOVE - - /obj/item/tank/jetpack/improvised name = "improvised jetpack" desc = "A jetpack made from two air tanks, a fire extinguisher and some atmospherics equipment. It doesn't look like it can hold much." diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index f2713d4c9c..1fa49f57e9 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -109,7 +109,6 @@ return ion_trail.start() RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/move_react) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_SPACEMOVE, .proc/spacemove_react, override = TRUE) if(full_speed) mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) else @@ -144,12 +143,6 @@ return FALSE return TRUE -/obj/item/mod/module/jetpack/proc/spacemove_react(mob/user, movement_dir) - SIGNAL_HANDLER - - if(active && (movement_dir || stabilizers)) - return COMSIG_MOVABLE_STOP_SPACEMOVE - /obj/item/mod/module/jetpack/advanced name = "MOD advanced ion jetpack module" desc = "An improvement on the previous model of electric thrusters. This one achieves higher speeds through \ diff --git a/tgstation.dme b/tgstation.dme index 3cf87032ec..c84b3bad03 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -164,7 +164,6 @@ #include "code\__DEFINES\dcs\signals\signals_mod.dm" #include "code\__DEFINES\dcs\signals\signals_reagent.dm" #include "code\__DEFINES\dcs\signals\signals_subsystem.dm" -#include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_movable.dm" #include "code\__DEFINES\dcs\signals\signals_atom\signals_atom_movement.dm" #include "code\__DEFINES\dcs\signals\signals_mob\signals_mob_living.dm" #include "code\__DEFINES\mapping\maploader.dm"