Merge remote-tracking branch 'upstream/master' into dwayne_rework

shiptest-ss13 · Jun 15, 2024 · 5979b47 · 5979b47
2 parents 2ff9faf + e4e21c8
commit 5979b47
Show file tree

Hide file tree

Showing 126 changed files with 13,771 additions and 4,345 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
 	},