Merge branch 'master' into extra-inventory

SPLURT-Station · Aug 9, 2024 · 1ca88ae · 1ca88ae
2 parents 26649ce + b26ec60
commit 1ca88ae
Show file tree

Hide file tree

Showing 926 changed files with 67,200 additions and 50,342 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
@@ -25,8 +25,8 @@
 /obj/item/clothing/shoes/galoshes{
 	pixel_y = -5
 	},
-/obj/item/flashlight/eyelight{
-	pixel_y = 11
+/obj/item/flashlight{
+	pixel_y = 8
 	},
 /turf/open/floor/plating/icemoon,
 /area/ruin/plasma_facility/operations)