diff --git a/code/__DEFINES/_flags/_flags.dm b/code/__DEFINES/_flags/_flags.dm
index 0bdf362e20..895f37a7a9 100644
--- a/code/__DEFINES/_flags/_flags.dm
+++ b/code/__DEFINES/_flags/_flags.dm
@@ -214,17 +214,5 @@ GLOBAL_LIST_INIT(bitflags, list(
 ///Turns the dir by 180 degrees
 #define DIRFLIP(d)       turn(d, 180)
 
-// timed_action_flags parameter for `/proc/do_after_mob`, `/proc/do_mob` and `/proc/do_after`
-/// Can do the action even if mob moves location
-#define IGNORE_USER_LOC_CHANGE (1<<0)
-/// Can do the action even if the target moves location
-#define IGNORE_TARGET_LOC_CHANGE (1<<1)
-/// Can do the action even if the item is no longer being held
-#define IGNORE_HELD_ITEM (1<<2)
-/// Can do the action even if the mob is incapacitated (ex. handcuffed)
-#define IGNORE_INCAPACITATED (1<<3)
-/// Used to prevent important slowdowns from being abused by drugs like kronkaine
-#define IGNORE_SLOWDOWNS (1<<4)
-
 /// 33554431 (2^24 - 1) is the maximum value our bitflags can reach.
 #define MAX_BITFLAG_DIGITS 8
diff --git a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
index 0fd09d9063..5d2a471c0a 100644
--- a/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
+++ b/code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
@@ -1,6 +1,2 @@
 ///From base of mob/living/MobBump() (mob/living)
 #define COMSIG_LIVING_MOB_BUMP "living_mob_bump"
-
-///From base of mob/living/ZImpactDamage() (mob/living, levels, turf/t)
-#define COMSIG_LIVING_Z_IMPACT "living_z_impact"
-	#define NO_Z_IMPACT_DAMAGE (1<<0)
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 96b0bc4d33..2d313fd38a 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -158,9 +158,6 @@
 #define TRAIT_CALCIUM_HEALER	"calcium_healer"
 #define TRAIT_MAGIC_CHOKE		"magic_choke"
 #define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"
-/// Prevents plasmamen from self-igniting
-#define TRAIT_NOSELFIGNITION "no_selfignition"
-#define TRAIT_NOSELFIGNITION_HEAD_ONLY "no_selfignition_head_only"
 /// Like antimagic, but doesn't block the user from casting
 #define TRAIT_ANTIMAGIC_NO_SELFBLOCK "anti_magic_no_selfblock"
 /// Gives us turf, mob and object vision through walls
@@ -171,8 +168,6 @@
 #define TRAIT_MESON_VISION "meson_vision"
 /// Gives us Night vision
 #define TRAIT_TRUE_NIGHT_VISION "true_night_vision"
-/// Negates our gravity, letting us move normally on floors in 0-g
-#define TRAIT_NEGATES_GRAVITY "negates_gravity"
 /// Lets us scan reagents
 #define TRAIT_REAGENT_SCANNER "reagent_scanner"
 #define TRAIT_ABDUCTOR_TRAINING "abductor-training"
diff --git a/code/__DEFINES/wiremod.dm b/code/__DEFINES/wiremod.dm
deleted file mode 100644
index c242bcc7d6..0000000000
--- a/code/__DEFINES/wiremod.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define SHELL_FLAG_CIRCUIT_UNREMOVABLE (1<<0)
-
-/// Whether a circuit is not able to be modified
-#define SHELL_FLAG_CIRCUIT_UNMODIFIABLE (1<<5)
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index d94f078f8a..503e2a9473 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -26,16 +26,18 @@
 	user.visible_message("<span class='suicide'>[user] is trying to upload [user.p_them()]self into [src]! That's not going to work out well!</span>")
 	return BRUTELOSS
 
-/obj/item/aicard/pre_attack(atom/target, mob/living/user, params)
+/obj/item/aicard/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	if(!proximity || !target)
+		return
 	if(AI) //AI is on the card, implies user wants to upload it.
+		log_combat(user, AI, "carded", src)
 		target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
 	else //No AI on the card, therefore the user wants to download one.
 		target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
 		if(AI)
-			log_combat(user, AI, "uploaded", src, "to [target].")
-			return TRUE
-	update_appearance() //Whatever happened, update the card's state (icon, name) to match.
-	return ..()
+			log_combat(user, AI, "carded", src)
+	update_icon() //Whatever happened, update the card's state (icon, name) to match.
 
 /obj/item/aicard/update_icon()
 	cut_overlays()
diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm
index 77dee74711..b9d66a5bd0 100644
--- a/code/game/objects/items/singularityhammer.dm
+++ b/code/game/objects/items/singularityhammer.dm
@@ -53,13 +53,7 @@
 			var/atom/movable/A = X
 			if(A == wielder)
 				continue
-			if(isliving(A))
-				var/mob/living/vortexed_mob = A
-				if(vortexed_mob.mob_negates_gravity())
-					continue
-				else
-					vortexed_mob.Paralyze(2 SECONDS)
-			if(!A.anchored && !isobserver(A))
+			if(A && !A.anchored && !ishuman(X))
 				step_towards(A,pull)
 				step_towards(A,pull)
 				step_towards(A,pull)
diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm
index b3705889f1..660f0311d1 100644
--- a/code/modules/mod/mod_activation.dm
+++ b/code/modules/mod/mod_activation.dm
@@ -1,5 +1,3 @@
-#define MOD_ACTIVATION_STEP_FLAGS IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED
-
 /// Creates a radial menu from which the user chooses parts of the suit to deploy/retract. Repeats until all parts are extended or retracted.
 /obj/item/mod/control/proc/choose_deploy(mob/user)
 	if(!length(mod_parts))
@@ -246,5 +244,3 @@
 	for(var/obj/item/part in mod_parts)
 		seal_part(part, seal = TRUE)
 	finish_activation(on = TRUE)
-
-#undef MOD_ACTIVATION_STEP_FLAGS
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index 1d460cfaed..cc0a6812f1 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -58,7 +58,6 @@
 	if(!.)
 		return
 	mod.boots.clothing_flags |= NOSLIP
-	ADD_TRAIT(mod.wearer, TRAIT_NEGATES_GRAVITY, MOD_TRAIT)
 	ADD_TRAIT(mod.wearer, TRAIT_NOSLIPWATER, MOD_TRAIT)
 	mod.slowdown += slowdown_active
 	mod.wearer.update_gravity(mod.wearer.has_gravity())
@@ -69,7 +68,6 @@
 	if(!.)
 		return
 	mod.boots.clothing_flags &= ~NOSLIP
-	REMOVE_TRAIT(mod.wearer, TRAIT_NEGATES_GRAVITY, MOD_TRAIT)
 	REMOVE_TRAIT(mod.wearer, TRAIT_NOSLIPWATER, MOD_TRAIT)
 	mod.slowdown -= slowdown_active
 	mod.wearer.update_gravity(mod.wearer.has_gravity())
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 9e6075d157..f2713d4c9c 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -319,31 +319,7 @@
 	drain_power(use_power_cost)
 	return dispensed
 
-///Longfall - Nullifies fall damage, removing charge instead.
-/obj/item/mod/module/longfall
-	name = "MOD longfall module"
-	desc = "Useful for protecting both the suit and the wearer, \
-		utilizing commonplace systems to convert the possible damage from a fall into kinetic charge, \
-		as well as internal gyroscopes to ensure the user's safe falling. \
-		Useful for mining, monorail tracks, or even skydiving!"
-	icon_state = "longfall"
-	complexity = 1
-	use_power_cost = DEFAULT_CHARGE_DRAIN * 5
-	incompatible_modules = list(/obj/item/mod/module/longfall)
-
-/obj/item/mod/module/longfall/on_suit_activation()
-	RegisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT, .proc/z_impact_react)
-
-/obj/item/mod/module/longfall/on_suit_deactivation(deleting = FALSE)
-	UnregisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT)
-
-/obj/item/mod/module/longfall/proc/z_impact_react(datum/source, levels, turf/fell_on)
-	if(!drain_power(use_power_cost*levels))
-		return
-	new /obj/effect/temp_visual/mook_dust(fell_on)
-	mod.wearer.Stun(levels * 1 SECONDS)
-	to_chat(mod.wearer, span_notice("[src] protects you from the damage!"))
-	return NO_Z_IMPACT_DAMAGE
+///Longfall
 
 ///Thermal Regulator - Naw.
 
diff --git a/code/modules/research/designs/mod_designs.dm b/code/modules/research/designs/mod_designs.dm
index 289a9d007b..eeba525494 100644
--- a/code/modules/research/designs/mod_designs.dm
+++ b/code/modules/research/designs/mod_designs.dm
@@ -306,14 +306,6 @@
 	build_type = PROTOLATHE
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
-/datum/design/module/mod_longfall
-	name = "Longfall Module"
-	id = "mod_longfall"
-	materials = list(/datum/material/iron = 1000)
-	build_path = /obj/item/mod/module/longfall
-	build_type = PROTOLATHE
-	departmental_flags = DEPARTMENTAL_FLAG_CARGO
-
 /datum/design/module/mod_bikehorn
 	name = "Bike Horn Module"
 	id = "mod_bikehorn"
diff --git a/code/modules/research/techweb/nodes/mod_nodes.dm b/code/modules/research/techweb/nodes/mod_nodes.dm
index 93fbe703e3..9cad736db0 100644
--- a/code/modules/research/techweb/nodes/mod_nodes.dm
+++ b/code/modules/research/techweb/nodes/mod_nodes.dm
@@ -14,7 +14,6 @@
 		"mod_welding",
 		"mod_mouthhole",
 		"mod_flashlight",
-		"mod_longfall",
 	)
 
 /datum/techweb_node/mod_advanced
diff --git a/tgstation.dme b/tgstation.dme
index df50f2c197..fefd282bcf 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -137,7 +137,6 @@
 #include "code\__DEFINES\vote.dm"
 #include "code\__DEFINES\vv.dm"
 #include "code\__DEFINES\wall_dents.dm"
-#include "code\__DEFINES\wiremod.dm"
 #include "code\__DEFINES\wires.dm"
 #include "code\__DEFINES\wounds.dm"
 #include "code\__DEFINES\_flags\_flags.dm"