Merge branch 'master' into upstream-merge-27773

code/modules/clothing/glasses/glasses.dm

@@ -39,8 +39,9 @@
 	vision_flags = SEE_TURFS
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/lightgreen
-	var/static/list/meson_mining_failure_excuses = list("seismic activity", "excessive lava", "ambient radiation", "electromagnetic storms", "bluespace disruption", \
-	"gravity", "dust", "dense rock", "ash", "badly understood science", "radiant heat")
+	var/static/list/meson_mining_failure_excuses = list("badly understood science", "damaged meson generators", "electromagnetic storms", "bluespace disruption", "ancient structures", \
+	"ambient radiation", "seismic activity", "extreme weather", "strange signals", "excessive lava", "giant monsters", "a loose wire", "lens warping", "radiant heat", "volcanic ash", \
+	"budget cuts","alien life","dense rock", "gravity", "dust")
 	var/picked_excuse
 	var/mesons_on = TRUE
 
@@ -65,7 +66,7 @@
 
 	if(iscarbon(user)) //only carbons can wear glasses
 		var/mob/living/carbon/C = user
-		if(!mesons_on)
+		if(mesons_on)
 			to_chat(C, "<span class='notice'>Your Meson Scanners have reactivated.</span>")
 		else if(picked_excuse)
 			to_chat(C, "<span class='warning'>Due to [picked_excuse], your Meson Scanners will not be able to display terrain layouts in this area.</span>")

code/modules/clothing/suits/armor.dm

@@ -100,7 +100,6 @@
 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
-	flags_inv = HIDEJUMPSUIT
 	strip_delay = 80
 	put_on_delay = 60