Merge branch 'master' into emote-ports

SPLURT-Station · Aug 14, 2024 · ca943cf · ca943cf
2 parents 6c6ea19 + 5d69a7f
commit ca943cf
Show file tree

Hide file tree

Showing 988 changed files with 57,480 additions and 39,137 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,4 +4,4 @@ about: Suggest an idea for this project
 
 ---
 
-Feature requests are not handled in the repository. The best place to discuss these ideas would be on the /tg/station 13 forums here: https://tgstation13.org/phpBB/viewforum.php?f=9&sid=5153c1c704a4fb1006bf7a265e45e03f
+Feature requests are not handled in the repository, aside from already approved bounties. The best place to suggest and discuss features is on the discord at https://discord.gg/AvjrTqnqEx in the `#suggestions` channel
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)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ about: Suggest an idea for this project

		---

		Feature requests are not handled in the repository. The best place to discuss these ideas would be on the /tg/station 13 forums here: https://tgstation13.org/phpBB/viewforum.php?f=9&sid=5153c1c704a4fb1006bf7a265e45e03f
		Feature requests are not handled in the repository, aside from already approved bounties. The best place to suggest and discuss features is on the discord at https://discord.gg/AvjrTqnqEx in the `#suggestions` channel