diff --git a/code/game/area/areas/ruins/_ruins.dm b/code/game/area/areas/ruins/_ruins.dm
index 0f55dba751..6699e94129 100644
--- a/code/game/area/areas/ruins/_ruins.dm
+++ b/code/game/area/areas/ruins/_ruins.dm
@@ -8,7 +8,7 @@
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	ambientsounds = RUINS
 	sound_environment = SOUND_ENVIRONMENT_STONEROOM
-	valid_territory = FALSE // hey so what if we did not allow things like cult summons to appear on ruins
+	var/valid_territory = FALSE // hey so what if we did not allow things like cult summons to appear on ruins
 
 
 /area/ruin/unpowered
diff --git a/code/modules/antagonists/space_ninja/space_ninja.dm b/code/modules/antagonists/space_ninja/space_ninja.dm
index 4cc8d043c8..1deb37eb56 100644
--- a/code/modules/antagonists/space_ninja/space_ninja.dm
+++ b/code/modules/antagonists/space_ninja/space_ninja.dm
@@ -85,7 +85,7 @@
 	var/datum/objective/plant_explosive/bombobjective = new /datum/objective/plant_explosive()
 	for(var/sanity in 1 to 100) // 100 checks at most.
 		var/area/selected_area = pick(GLOB.sortedAreas)
-		if(!is_station_level(selected_area.z) || !selected_area.valid_territory)
+		if(!is_station_level(selected_area.z) || !selected_area.area_flags == VALID_TERRITORY)
 			continue
 		bombobjective.detonation_location = selected_area
 		break
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
index a8d03fa487..7fb0f65d08 100644
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ b/code/modules/ninja/suit/ninjaDrainAct.dm
@@ -317,15 +317,11 @@
 		DefaultCombatKnockdown(ninja_gloves.stunforce, override_hardstun = 0)
 		apply_effect(EFFECT_STUTTER, ninja_gloves.stunforce)
 		SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK)
-
-<<<<<<< HEAD
 		lastattacker = ninja.real_name
 		lastattackerckey = ninja.ckey
 		log_combat(ninja, src, "stunned")
-=======
-		set_last_attacker(H)
-		log_combat(H, src, "stunned")
->>>>>>> 6887e2d097b9ba361e455deccb57c6ac35c8fc79
+		set_last_attacker(ninja)
+		log_combat(ninja, src, "stunned")
 
 		playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
 
diff --git a/icons/mob/clothing/feet_digi.dmi b/icons/mob/clothing/feet_digi.dmi
index 43244e99b9..77c1896af8 100644
Binary files a/icons/mob/clothing/feet_digi.dmi and b/icons/mob/clothing/feet_digi.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index b8cc073a38..91e7a04e8d 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/mask_muzzled.dmi b/icons/mob/clothing/mask_muzzled.dmi
index ad88bb7086..f8ecf6d6d6 100644
Binary files a/icons/mob/clothing/mask_muzzled.dmi and b/icons/mob/clothing/mask_muzzled.dmi differ
diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi
index 4510b5f9bd..be64f66ff9 100644
Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index c3cf25e628..0f6e5784cb 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ