diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm
deleted file mode 100644
index a83f02135c..0000000000
--- a/code/__DEFINES/ai.dm
+++ /dev/null
@@ -1,6 +0,0 @@
-///Mob the MOD is trying to attach to
-#define BB_MOD_TARGET "BB_mod_target"
-///The implant the AI was created from
-#define BB_MOD_IMPLANT "BB_mod_implant"
-///Range for a MOD AI controller.
-#define MOD_AI_RANGE 100
diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm
index 0718e54cab..e85a29ae6e 100755
--- a/code/datums/outfit.dm
+++ b/code/datums/outfit.dm
@@ -79,10 +79,6 @@
 	//Type path of item to go in left hand
 	var/r_hand = null
 
-
-	///ID of the slot containing a gas tank
-	var/internals_slot = null
-
 	/// Any clothing accessory item
 	var/accessory = null
 
@@ -105,6 +101,9 @@
 	  */
 	var/list/implants = null
 
+	///ID of the slot containing a gas tank
+	var/internals_slot = null
+
 	//skyrat edit
 	///Slot for underwear like boxers and panties
 	var/underwear = null
@@ -170,6 +169,8 @@
 		H.equip_to_slot_or_del(new uniform(H), ITEM_SLOT_ICLOTHING, TRUE)
 	if(suit)
 		H.equip_to_slot_or_del(new suit(H), ITEM_SLOT_OCLOTHING, TRUE)
+	if(back)
+		H.equip_to_slot_or_del(new back(H), ITEM_SLOT_BACK, TRUE)
 	if(belt)
 		H.equip_to_slot_or_del(new belt(H), ITEM_SLOT_BELT, TRUE)
 	if(gloves)
@@ -183,15 +184,25 @@
 	if(neck)
 		H.equip_to_slot_or_del(new neck(H), ITEM_SLOT_NECK, TRUE)
 	if(ears)
-		H.equip_to_slot_or_del(new ears(H), ITEM_SLOT_EARS, TRUE)
+		H.equip_to_slot_or_del(new ears(H), ITEM_SLOT_EARS_LEFT, TRUE) // Sandstorm edit
 	if(glasses)
 		H.equip_to_slot_or_del(new glasses(H), ITEM_SLOT_EYES, TRUE)
-	if(back)
-		H.equip_to_slot_or_del(new back(H), ITEM_SLOT_BACK, TRUE)
 	if(id)
 		H.equip_to_slot_or_del(new id(H), ITEM_SLOT_ID, TRUE)
 	if(suit_store)
 		H.equip_to_slot_or_del(new suit_store(H), ITEM_SLOT_SUITSTORE, TRUE)
+	// Sandstorm edit
+	if(ears_extra)
+		H.equip_to_slot_or_del(new ears_extra(H), ITEM_SLOT_EARS_RIGHT, TRUE)
+	if(underwear)
+		H.equip_to_slot_or_del(new underwear(H), ITEM_SLOT_UNDERWEAR, TRUE)
+	if(socks)
+		H.equip_to_slot_or_del(new socks(H), ITEM_SLOT_SOCKS, TRUE)
+	if(shirt)
+		H.equip_to_slot_or_del(new shirt(H), ITEM_SLOT_SHIRT, TRUE)
+	if(wrists)
+		H.equip_to_slot_or_del(new wrists(H), ITEM_SLOT_WRISTS, TRUE)
+	//
 
 	if(accessory)
 		var/obj/item/clothing/under/U = H.w_uniform
@@ -207,9 +218,9 @@
 
 	if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon.
 		if(l_pocket)
-			H.equip_to_slot_or_del(l_pocket, ITEM_SLOT_LPOCKET, TRUE)
+			H.equip_to_slot_or_del(new l_pocket(H), ITEM_SLOT_LPOCKET, TRUE)
 		if(r_pocket)
-			H.equip_to_slot_or_del(r_pocket, ITEM_SLOT_RPOCKET, TRUE)
+			H.equip_to_slot_or_del(new r_pocket(H), ITEM_SLOT_RPOCKET, TRUE)
 
 		if(box)
 			if(!backpack_contents)
@@ -223,7 +234,11 @@
 				if(!isnum(number))//Default to 1
 					number = 1
 				for(var/i in 1 to number)
-					H.equip_to_slot_or_del(path, ITEM_SLOT_BACKPACK, TRUE)
+					H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE)
+
+	if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit))
+		var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit
+		HS.ToggleHelmet()
 
 	post_equip(H, visualsOnly, preference_source)
 
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 75dfb0e14c..afceabf2a6 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1303,6 +1303,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		if(ITEM_SLOT_FEET)
 			if(H.shoes)
 				return FALSE
+			if( !(I.slot_flags & ITEM_SLOT_FEET) )
+				return FALSE
 			if(num_legs < 2)
 				return FALSE
 			if(DIGITIGRADE in species_traits)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index e6aac9cde9..be6508dd96 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -47,8 +47,6 @@
 	return ..()
 
 /mob/living/proc/ZImpactDamage(turf/T, levels)
-	if(SEND_SIGNAL(src, COMSIG_LIVING_Z_IMPACT, levels, T) & NO_Z_IMPACT_DAMAGE)
-		return
 	visible_message("<span class='danger'>[src] crashes into [T] with a sickening noise!</span>", \
 					"<span class='userdanger'>You crash into [T] with a sickening noise!</span>")
 	adjustBruteLoss((levels * 5) ** 1.5)
@@ -755,8 +753,7 @@
 		return pick("trails_1", "trails_2")
 
 /mob/living/experience_pressure_difference(pressure_difference, direction, pressure_resistance_prob_delta = 0)
-	playsound(src, 'sound/effects/space_wind.ogg', 50, TRUE)
-	if(buckled || mob_negates_gravity())
+	if(buckled)
 		return
 	if(client && client.move_delay >= world.time + world.tick_lag*2)
 		pressure_resistance_prob_delta -= 30
diff --git a/tgstation.dme b/tgstation.dme
index 31ab41768c..24d15d2289 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -26,7 +26,6 @@
 #include "code\__DEFINES\achievements.dm"
 #include "code\__DEFINES\actionspeed_modifiers.dm"
 #include "code\__DEFINES\admin.dm"
-#include "code\__DEFINES\ai.dm"
 #include "code\__DEFINES\antagonists.dm"
 #include "code\__DEFINES\atmospherics.dm"
 #include "code\__DEFINES\bitfields.dm"