Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"

This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.

code/modules/mob/living/carbon/carbon.dm

@@ -28,8 +28,8 @@
 		if(prob(40))
 			if(prob(25))
 				audible_message("<span class='warning'>You hear something rumbling inside [src]'s stomach...</span>", \
-							 "<span class='warning'>You hear something rumbling.</span>", 4,\
-							  "<span class='userdanger'>Something is rumbling inside your stomach!</span>")
+								"<span class='warning'>You hear something rumbling.</span>", 4,\
+							    "<span class='userdanger'>Something is rumbling inside your stomach!</span>")
 			var/obj/item/I = user.get_active_held_item()
 			if(I && I.force)
 				var/d = rand(round(I.force / 4), I.force)
@@ -625,12 +625,21 @@
 			if(M.name == XRAY)
 				sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
 				see_in_dark = max(see_in_dark, 8)
+
+	if(HAS_TRAIT(src, TRAIT_TRUE_NIGHT_VISION))
+		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
+		see_in_dark = max(see_in_dark, 8)
+
+	if(HAS_TRAIT(src, TRAIT_MESON_VISION))
+		sight |= SEE_TURFS
+		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
+
 	if(HAS_TRAIT(src, TRAIT_THERMAL_VISION))
-		sight |= (SEE_MOBS)
+		sight |= SEE_MOBS
 		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
 
 	if(HAS_TRAIT(src, TRAIT_XRAY_VISION))
-		sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
+		sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
 		see_in_dark = max(see_in_dark, 8)
 
 	if(see_override)

code/modules/mob/living/carbon/carbon_movement.dm

@@ -16,9 +16,15 @@
 	if(istype(T) && movement_dir && T.allow_thrust(0.01))
 		return 1
 
-	var/obj/item/tank/jetpack/J = get_jetpack()
-	if(istype(J) && (movement_dir || J.stabilizers) && J.allow_thrust(0.01, src))
-		return 1
+	var/obj/item/I = get_jetpack()
+	if(istype(I, /obj/item/tank/jetpack))
+		var/obj/item/tank/jetpack/J = I
+		if((movement_dir || J.stabilizers) && J.allow_thrust(0.01, src))
+			return 1
+	else if(istype(I, /obj/item/mod/module/jetpack))
+		var/obj/item/mod/module/jetpack/J = I
+		if((movement_dir || J.stabilizers) && J.allow_thrust())
+			return 1
 
 /mob/living/carbon/Moved()
 	. = ..()

code/modules/mob/living/carbon/human/inventory.dm

@@ -308,7 +308,14 @@
 		if(equip_to_slot_if_possible(thing, ITEM_SLOT_BACK))
 			update_inv_hands()
 		return
-	if(!SEND_SIGNAL(equipped_back, COMSIG_CONTAINS_STORAGE)) // not a storage item
+	var/datum/component/storage/storage = equipped_back.GetComponent(/datum/component/storage)
+	if(istype(equipped_back, /obj/item/mod/control))
+		var/obj/item/mod/control/C = equipped_back
+		for(var/obj/item/mod/module/storage/S in C.modules)
+			if(S.stored)
+				equipped_back = S.stored
+				storage = S.stored.GetComponent(/datum/component/storage)
+	if(!storage)
 		if(!thing)
 			equipped_back.attack_hand(src)
 		else
@@ -318,10 +325,11 @@
 		if(!SEND_SIGNAL(equipped_back, COMSIG_TRY_STORAGE_INSERT, thing, src))
 			to_chat(src, "<span class='warning'>You can't fit anything in!</span>")
 		return
-	if(!equipped_back.contents.len) // nothing to take out
-		to_chat(src, "<span class='warning'>There's nothing in your backpack to take out!</span>")
+	var/atom/real_location = storage.real_location()
+	if(!real_location.contents.len) // nothing to take out
+		to_chat(src, "<span class='warning'>There's nothing in your [equipped_back.name] to take out!</span>")
 		return
-	var/obj/item/stored = equipped_back.contents[equipped_back.contents.len]
+	var/obj/item/stored = real_location.contents[real_location.contents.len]
 	if(!stored || stored.on_found(src))
 		return
 	stored.attack_hand(src) // take out thing from backpack