Merge branch 'master' into heartburger

shiptest-ss13 · Jun 15, 2024 · bf5b092 · bf5b092
2 parents 99f73d6 + f855059
commit bf5b092
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/_maps/shuttles/pgf/pgf_crying_sun.dmm b/_maps/shuttles/pgf/pgf_crying_sun.dmm
@@ -6124,6 +6124,9 @@
 	pixel_y = -9;
 	pixel_x = -3
 	},
+/obj/item/clothing/head/helmet/gezena{
+	pixel_y = -11
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/dorm/dormtwo)
 "Wc" = (

diff --git a/html/changelogs/AutoChangeLog-pr-3096.yml b/html/changelogs/AutoChangeLog-pr-3096.yml
@@ -0,0 +1,4 @@
+author: DIB-DOG
+changes:
+  - {rscadd: Added 1 Raksha Helmet to the sergeant's locker on the PGFN Crying Sun}
+delete-after: true