diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
index 70d386deaa..58c26cc38a 100644
--- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
+++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
@@ -148,6 +148,7 @@
 /mob/living/simple_mob/humanoid/eclipse/solar/bullet_act(obj/item/projectile/P)
 	if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
 		visible_message("<font color='orange'><B>[P] seems ineffective!.</B></font>")
+		..()
 	else
 		..()
 
@@ -174,8 +175,8 @@
 /mob/living/simple_mob/humanoid/eclipse/solar/firemoff
 	name = "Solar Eclipse Inferno Moth"
 	desc = "A moth like creature cladded in armor, wisps of flames swirling around it. Protected from lasers and energy."
-	health = 37
-	maxHealth = 37
+	health = 35
+	maxHealth = 35
 	icon_state = "eclipse_moth"
 	icon_living = "eclipse_moth"
 	reload_max = 10
@@ -260,6 +261,11 @@
 	icon_state = "eclipse_rad"
 	icon_living = "eclipse_rad"
 
+	glow_color = "#14ff20"
+	light_color = "#14ff20"
+	glow_range = 5
+	glow_intensity = 3
+
 	projectiletype = /obj/item/projectile/energy/declone/burn
 	var/rads = 5
 
@@ -283,6 +289,7 @@
 /mob/living/simple_mob/humanoid/eclipse/lunar/bullet_act(obj/item/projectile/P)
 	if(istype(P, /obj/item/projectile/bullet))
 		visible_message("<font color='orange'><B>[P] seems ineffective!.</B></font>")
+		..()
 	else
 		..()
 
@@ -328,8 +335,8 @@
 /mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner //wuff with shotgun
 	name = "Lunar Eclipse Shotgunner"
 	desc = "A Vulpkanin or the like in a red-purple flashing rigsuit, it defending them from physical damage of close and long ranges."
-	health = 37
-	maxHealth = 37
+	health = 35
+	maxHealth = 35
 	reload_max = 2
 
 	icon_state = "eclipse_shotwuff"
@@ -359,8 +366,8 @@
 /mob/living/simple_mob/humanoid/eclipse/lunar/ravanger //Tanky boi. Very deadly melee
 	name = "Lunar Eclipse Ravanger"
 	desc = "An individual wearing strange armor that seems to be living, and breathing while providing protection from bullets and swords."
-	health = 62
-	maxHealth = 62
+	health = 60
+	maxHealth = 60
 	icon_state = "eclipse_ravanger"
 	icon_living = "eclipse_ravanger"
 
@@ -535,7 +542,7 @@
 	reload_max = 5
 	size_multiplier = 1.5
 	melee_attack_delay = 3 SECOND
-	var/shock_chance = 40
+	var/shock_chance = 25
 	base_attack_cooldown = 6
 	hovering = TRUE
 	ranged_cooldown_time = 1.5
@@ -569,6 +576,9 @@
 	icon_state = "aeroblaster"
 	icon_living = "aeroblaster"
 
+	reload_max = 1
+	reload_time = 1.5 SECONDS
+
 	ranged_attack_delay = 1.5 SECONDS
 	hovering = TRUE
 
@@ -749,7 +759,7 @@
 	only_submunitions = 1
 	range = 0
 	embed_chance = 0
-	submunition_spread_max = 1800
+	submunition_spread_max = 1200
 	submunition_spread_min = 500
 	submunitions = list(/obj/item/projectile/energy/frostsphere = 4)
 
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm
index 21d5304b2f..7f835a0b59 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm
@@ -3,10 +3,17 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/floor_decal/corner/grey/diagonal,
+/turf/simulated/floor/tiled/steel,
+/area/submap/eclipsemountain)
+"bu" = (
+/obj/machinery/door/airlock,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "bN" = (
 /mob/living/simple_mob/humanoid/eclipse/solar/firemoff,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "bY" = (
@@ -27,6 +34,7 @@
 	dir = 8
 	},
 /obj/structure/window/phoronreinforced,
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "do" = (
@@ -35,6 +43,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "dt" = (
@@ -58,6 +67,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "fX" = (
@@ -65,6 +75,7 @@
 /obj/machinery/button/remote/blast_door{
 	id = "puzzlemtC"
 	},
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "hw" = (
@@ -89,18 +100,29 @@
 	temperature = 243.15
 	},
 /area/submap/eclipsemountain)
+"jK" = (
+/obj/machinery/door/airlock,
+/obj/structure/fans/hardlight/colorable/abductor,
+/turf/simulated/floor/tiled/steel,
+/area/submap/eclipsemountain)
 "ki" = (
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
+"kx" = (
+/obj/effect/floor_decal/corner/grey/diagonal,
+/turf/simulated/floor/tiled/steel,
+/area/submap/eclipsemountain)
 "kR" = (
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "kX" = (
 /obj/structure/table/steel,
 /obj/random/material/precious,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "la" = (
@@ -111,6 +133,7 @@
 /obj/machinery/porta_turret/ai_defense{
 	faction = "eclipse"
 	},
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "lX" = (
@@ -124,12 +147,14 @@
 /obj/structure/window/phoronreinforced{
 	dir = 4
 	},
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "mL" = (
 /obj/structure/table/steel,
 /obj/random/medical/pillbottle,
 /obj/random/material,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "nL" = (
@@ -148,16 +173,19 @@
 /obj/machinery/door/blast/regular{
 	id = "eclipsegate"
 	},
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "qn" = (
 /obj/machinery/light,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "qv" = (
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "qO" = (
@@ -174,10 +202,19 @@
 /obj/machinery/telecomms/relay/preset,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
+"sy" = (
+/obj/structure/table/gold,
+/obj/random/ammo,
+/obj/random/maintenance/security,
+/obj/random/maintenance/research,
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/turf/simulated/floor/tiled/yellow,
+/area/submap/eclipsemountain)
 "sC" = (
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "tI" = (
@@ -193,6 +230,7 @@
 /area/submap/eclipsemountain)
 "tQ" = (
 /mob/living/simple_mob/humanoid/eclipse/lunar/ravanger,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "tS" = (
@@ -222,13 +260,19 @@
 /area/submap/eclipsemountain)
 "uz" = (
 /mob/living/simple_mob/humanoid/eclipse/lunar/pummler,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
+"uC" = (
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/red,
+/area/submap/eclipsemountain)
 "vb" = (
 /obj/structure/table/steel,
 /obj/machinery/button/remote/blast_door{
 	id = "eclipsegate"
 	},
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "vx" = (
@@ -244,6 +288,7 @@
 /area/submap/eclipsemountain)
 "vC" = (
 /mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "vO" = (
@@ -259,12 +304,14 @@
 "xO" = (
 /obj/structure/bed/double/padded,
 /obj/item/weapon/bedsheet/purpledouble,
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "yy" = (
 /obj/structure/table/steel,
 /obj/random/firstaid,
 /obj/random/material/refined,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "yY" = (
@@ -297,6 +344,7 @@
 /area/submap/eclipsemountain)
 "AR" = (
 /mob/living/simple_mob/humanoid/eclipse/lunar/wheel,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "Cy" = (
@@ -313,6 +361,7 @@
 /obj/machinery/button/remote/blast_door{
 	id = "puzzlemtB"
 	},
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "Ec" = (
@@ -384,6 +433,7 @@
 /area/submap/eclipsemountain)
 "IQ" = (
 /mob/living/simple_mob/humanoid/eclipse/solar/hellhound,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "Jg" = (
@@ -391,6 +441,7 @@
 /area/template_noop)
 "JK" = (
 /obj/structure/table/steel,
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "JO" = (
@@ -410,6 +461,7 @@
 /obj/structure/table/steel,
 /obj/random/medical/pillbottle,
 /obj/random/material/refined,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "LT" = (
@@ -420,9 +472,11 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "LV" = (
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "Mr" = (
@@ -431,6 +485,7 @@
 /obj/random/maintenance/security,
 /obj/random/maintenance/research,
 /obj/machinery/light,
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "Ms" = (
@@ -461,6 +516,7 @@
 /area/submap/eclipsemountain)
 "Nv" = (
 /obj/machinery/door/window/southright,
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "Oa" = (
@@ -476,6 +532,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "OM" = (
@@ -492,6 +549,7 @@
 /area/submap/eclipsemountain)
 "PL" = (
 /obj/machinery/light,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "PP" = (
@@ -503,6 +561,7 @@
 	dir = 4
 	},
 /obj/structure/window/phoronreinforced,
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "QT" = (
@@ -565,9 +624,15 @@
 /obj/random/ammo,
 /obj/random/maintenance/security,
 /obj/random/maintenance/research,
+/obj/item/weapon/paper{
+	info = "Our radio array is set up. Bits are pieces are unstable, although we remedied that by bouncing rare signals up to southern cross. They hopefully won't notice a few stray signals.";
+	name = "Status Report"
+	},
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "VM" = (
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "Wd" = (
@@ -608,6 +673,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "XQ" = (
@@ -619,6 +685,7 @@
 	dir = 4
 	},
 /obj/structure/window/phoronreinforced,
+/obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipsemountain)
 "Yh" = (
@@ -628,6 +695,7 @@
 /obj/structure/table/steel,
 /obj/random/mainttoyloot/nofail,
 /obj/random/material/refined,
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "YO" = (
@@ -636,6 +704,7 @@
 /area/submap/eclipsemountain)
 "YQ" = (
 /mob/living/simple_mob/humanoid/eclipse/solar/radiation,
+/obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "Zr" = (
@@ -643,6 +712,7 @@
 /obj/machinery/button/remote/blast_door{
 	id = "puzzlemtA"
 	},
+/obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 
@@ -887,10 +957,10 @@ Cz
 Cz
 Cz
 Tb
-iU
-iU
-iU
-iU
+kx
+kx
+kx
+kx
 tQ
 MM
 hw
@@ -929,11 +999,11 @@ Cz
 Cz
 Cz
 MM
-iU
-iU
+kx
+kx
 Ov
-iU
-iU
+kx
+kx
 MM
 hw
 Cz
@@ -1013,11 +1083,11 @@ Cz
 Cz
 Cz
 MM
-ki
+uC
 JK
 cW
-iU
-iU
+kx
+kx
 MM
 hw
 Cz
@@ -1058,7 +1128,7 @@ MM
 do
 vb
 XQ
-iU
+kx
 PL
 MM
 hw
@@ -1097,11 +1167,11 @@ la
 Cz
 Cz
 MM
-ki
-ki
+uC
+uC
 Nv
-iU
-iU
+kx
+kx
 MM
 hw
 Cz
@@ -1176,7 +1246,7 @@ MM
 MM
 MM
 MM
-Tb
+jK
 MM
 MM
 XK
@@ -1210,16 +1280,16 @@ Cz
 Cz
 Cz
 MM
-iU
+kx
 sC
-iU
-iU
+kx
+kx
 sC
-iU
+kx
 MM
-iU
+kx
 LV
-iU
+kx
 MM
 hw
 Cz
@@ -1294,16 +1364,16 @@ JO
 JO
 JO
 MM
-iU
+kx
 LV
 yy
 Ln
 LV
-iU
+kx
 MM
-iU
+kx
 LV
-iU
+kx
 MM
 hw
 Cz
@@ -1335,14 +1405,14 @@ JO
 JO
 JO
 JO
-Tb
+jK
 AR
 LV
 mL
 mL
 LV
 YQ
-Tb
+bu
 LV
 LV
 LV
@@ -1378,16 +1448,16 @@ JO
 JO
 jt
 MM
-iU
+kx
 LV
 Ln
 YC
 LV
-iU
+kx
 MM
-iU
+kx
 LV
-iU
+kx
 MM
 hw
 Cz
@@ -1462,16 +1532,16 @@ Tc
 bY
 Tp
 MM
-iU
+kx
 qv
-iU
-iU
+kx
+kx
 qv
-iU
+kx
 MM
-iU
+kx
 LV
-iU
+kx
 MM
 hw
 Cz
@@ -1540,11 +1610,11 @@ Cz
 yY
 Cz
 MM
-Vp
+sy
 VM
 ec
 xO
-Vp
+sy
 Yh
 Yh
 My
@@ -1553,9 +1623,9 @@ Yh
 Od
 Od
 MM
-iU
+kx
 LV
-iU
+kx
 MM
 hw
 Cz
@@ -1583,7 +1653,7 @@ yY
 Cz
 MM
 xO
-iU
+kx
 VM
 vC
 xO
@@ -1637,9 +1707,9 @@ qO
 iU
 iU
 nL
-iU
+kx
 uz
-iU
+kx
 MM
 hw
 Cz
@@ -1669,7 +1739,7 @@ MM
 xO
 IQ
 VM
-iU
+kx
 xO
 Yh
 MK
@@ -1708,11 +1778,11 @@ Cz
 Cz
 yY
 MM
-Vp
+sy
 VM
 LT
 xO
-Vp
+sy
 Yh
 Yh
 EA
@@ -1793,9 +1863,9 @@ Cz
 yY
 Cz
 MM
-iU
-iU
-iU
+kx
+kx
+kx
 ls
 MM
 dJ
@@ -1836,8 +1906,8 @@ yY
 Cz
 MM
 al
-iU
-iU
+kx
+kx
 PL
 MM
 dJ
@@ -1878,9 +1948,9 @@ yY
 Cz
 MM
 ls
-iU
-iU
-iU
+kx
+kx
+kx
 Tb
 dJ
 rJ