Merge remote-tracking branch 'upstream/master'

.github/guides/ISSUE_MANAGER.md

@@ -15,10 +15,10 @@ When examining new issues you should immediately notify a maintainer if you see
 - **Server Lagging** [[1]](https://github.com/tgstation/tgstation/issues/60193) [[2]](https://github.com/tgstation/tgstation/issues/51927) [[3]](https://github.com/tgstation/tgstation/issues/32762) - Something that is causing a _severe_ amount of lag during the game
 
 #### Runtime Issue Reports
-If an issue reports a runtime, it must have the actual runtime call stack provided by round logging or in-game debug menu (https://github.com/tgstation/tgstation/issues/70329#issuecomment-1279853883). 
+If an issue reports a runtime, it must have the actual runtime call stack provided by round logging or in-game debug menu (https://github.com/tgstation/tgstation/issues/70329#issuecomment-1279853883).
 <details>
   <summary>Example runtime call stack</summary>
-  
+
   ```
   [2022-10-15 16:12:38.902] runtime error: Cannot execute null.add().
  - proc name: visibility (/datum/cameranet/proc/visibility)
@@ -28,8 +28,8 @@ If an issue reports a runtime, it must have the actual runtime call stack provid
  -   usr.loc: the floor (150,25,4) (/turf/open/floor/circuit)
  -   call stack:
  - Camera Net (/datum/cameranet): visibility(/list (/list), null, /list (/list), 1)
- - AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/camera/ai_eye))
- - Inactive AI Eye (/mob/camera/ai_eye): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
+ - AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/ai_eye))
+ - Inactive AI Eye (/mob/eye/ai_eye): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
  - AI (/mob/living/silicon/ai): create eye()
  - AI (/mob/living/silicon/ai): Initialize(0, null, TagGamerGame2 (/mob/dead/new_player))
  - Atoms (/datum/controller/subsystem/atoms): InitAtom(AI (/mob/living/silicon/ai), 0, /list (/list))

README.md

@@ -39,12 +39,15 @@ Space Station 13 is a paranoia-laden round-based roleplaying game set against th
 
 **[How to compile in VSCode and other build options](tools/build/README.md).**
 
-## Contributors
-[Guides for Contributors](.github/CONTRIBUTING.md)
+## Getting started
 
-[/tg/station HACKMD account](https://hackmd.io/@tgstation) - Design documentation here
+For contribution guidelines refer to the [Guides for Contributors](.github/CONTRIBUTING.md).
 
-[Interested in some starting lore?](https://github.com/tgstation/common_core)
+For getting started (dev env, compilation) see the HackMD document [here](https://hackmd.io/@tgstation/HJ8OdjNBc#tgstation-Development-Guide).
+
+For overall design documentation see [HackMD](https://hackmd.io/@tgstation).
+
+For lore, [see Common Core](https://github.com/tgstation/common_core).
 
 ## LICENSE
 

_maps/RandomRuins/IceRuins/icemoon_underground_hotsprings.dmm

@@ -6,14 +6,22 @@
 /turf/closed/mineral/random/snow,
 /area/icemoon/surface/outdoors/unexplored)
 "c" = (
-/turf/open/water/cursed_spring,
+/turf/open/water/hot_spring/cursed,
 /area/icemoon/surface/outdoors/noteleport)
 "d" = (
 /obj/item/paper/crumpled{
 	default_raw_text = "When one falls into this hot spring, they shall forever be turned into..."
 	},
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors)
+"l" = (
+/obj/structure/chair/plastic,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
+"G" = (
+/obj/item/storage/toolbox/fishing,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/surface/outdoors)
 
 (1,1,1) = {"
 b
@@ -70,7 +78,7 @@ b
 (5,1,1) = {"
 b
 a
-a
+G
 c
 c
 c
@@ -83,7 +91,7 @@ b
 (6,1,1) = {"
 b
 a
-a
+l
 c
 c
 c

_maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm

@@ -62,7 +62,7 @@
 /turf/open/floor/plating/lavaland_atmos,
 /area/ruin/unpowered)
 "l" = (
-/turf/open/water/lavaland_atmos,
+/turf/open/water/hot_spring,
 /area/lavaland/surface)
 "m" = (
 /obj/machinery/door/airlock/survival_pod/glass,