Merge branch 'master' into fix-Beretta's-worldmodel-fix

ss220club · Oct 29, 2023 · b00b99c · b00b99c
2 parents 02a5c2e + 763454c
commit b00b99c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/_maps/map_files220/delta/delta.dmm b/_maps/map_files220/delta/delta.dmm
@@ -99521,7 +99521,12 @@
 /area/station/science/research)
 "wXz" = (
 /obj/structure/table/wood,
-/obj/item/megaphone,
+/obj/item/megaphone{
+	pixel_y = 9
+	},
+/obj/item/stamp/hos{
+	pixel_y = -4
+	},
 /turf/simulated/floor/carpet/red,
 /area/station/command/office/hos)
 "wXE" = (