Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to listeningpostruinpr
shiptest-ss13 · Jun 12, 2024 · 3682d05 · 3682d05
2 parents 9e3d6c4 + 3365e60
commit 3682d05
Show file tree

Hide file tree

Showing 114 changed files with 13,677 additions and 4,281 deletions.
diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm
@@ -150,7 +150,7 @@
 	pixel_x = -5;
 	pixel_y = 12
 	},
-/obj/item/clothing/head/helmet/chaplain/ancient{
+/obj/item/clothing/head/witchunter{
 	pixel_y = 13;
 	pixel_x = -5
 	},