[MDB IGNORE] [IDB IGNORE] Upstream mirror (#410)

This is an automated pull request to merge the latest changes from the upstream repository. The following files have conflicts: - [x] .github/CONTRIBUTING.md - deleted by us - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/.github/CONTRIBUTING.md#L0-L0) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/.github/CONTRIBUTING.md#L0) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/.github/CONTRIBUTING.md#L0) - [x] .github/workflows/generate_documentation.yml - deleted by us - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/.github/workflows/generate_documentation.yml#L0-L0) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/.github/workflows/generate_documentation.yml#L0) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/.github/workflows/generate_documentation.yml#L0) - [x] README.md - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/README.md#L41-L51) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/README.md#L41) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/README.md#L41) - [x] code/modules/cargo/packs/medical.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/cargo/packs/medical.dm#L195-L210) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/cargo/packs/medical.dm#L195) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/cargo/packs/medical.dm#L195) - [x] code/modules/client/client_defines.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/client/client_defines.dm#L276-L283) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/client/client_defines.dm#L276) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/client/client_defines.dm#L276) - [x] code/modules/mob/living/carbon/human/death.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/mob/living/carbon/human/death.dm#L16-L37) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/mob/living/carbon/human/death.dm#L16) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/mob/living/carbon/human/death.dm#L16) - [x] code/modules/mob/living/carbon/human/dummy.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/mob/living/carbon/human/dummy.dm#L122-L127) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/mob/living/carbon/human/dummy.dm#L122) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/mob/living/carbon/human/dummy.dm#L122) - [x] code/modules/mob/living/silicon/ai/freelook/eye.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/mob/living/silicon/ai/freelook/eye.dm#L19-L37) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/mob/living/silicon/ai/freelook/eye.dm#L19) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/mob/living/silicon/ai/freelook/eye.dm#L19) - [x] code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm#L38-L48) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm#L38) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm#L38) - [x] code/modules/surgery/organ_manipulation.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/surgery/organ_manipulation.dm#L185-L199) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/surgery/organ_manipulation.dm#L185) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/surgery/organ_manipulation.dm#L185) - [x] code/modules/uplink/uplink_items/dangerous.dm - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/code/modules/uplink/uplink_items/dangerous.dm#L42-L48) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/code/modules/uplink/uplink_items/dangerous.dm#L42) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/code/modules/uplink/uplink_items/dangerous.dm#L42) - [x] config/config.txt - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/config/config.txt#L625-L637) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/config/config.txt#L625) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/config/config.txt#L625) - [x] html/changelogs/archive/2024-11.yml - 2 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/html/changelogs/archive/2024-11.yml#L294-L300) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/html/changelogs/archive/2024-11.yml#L294) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/html/changelogs/archive/2024-11.yml#L294) - [x] icons/mob/clothing/ears.dmi - binary file - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/icons/mob/clothing/ears.dmi#L0-L0) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/icons/mob/clothing/ears.dmi#L0) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/icons/mob/clothing/ears.dmi#L0) - [x] tgui/packages/tgui-say/styles/colors.scss - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/tgui/packages/tgui-say/styles/colors.scss#L10-L51) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/tgui/packages/tgui-say/styles/colors.scss#L10) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/tgui/packages/tgui-say/styles/colors.scss#L10) - [x] tgui/packages/tgui/components/DraggableControl.jsx - 1 - [diff](https://github.com/psychonaut-station/PsychonautStation/blob/mirror-75e6ef9ed9b/tgui/packages/tgui/components/DraggableControl.jsx#L139-L156) - [origin](https://github.com/psychonaut-station/PsychonautStation/blob/master/tgui/packages/tgui/components/DraggableControl.jsx#L139) - [upstream](https://github.com/tgstation/tgstation/blob/7e27663517731fe8f3d955477b1a97ace5a6ff83/tgui/packages/tgui/components/DraggableControl.jsx#L139)
psychonaut-station · Nov 23, 2024 · 6f3b2bc · 6f3b2bc
2 parents d21cd34 + a8b8e4d
commit 6f3b2bc
Show file tree

Hide file tree

Showing 1,048 changed files with 14,002 additions and 10,841 deletions.
diff --git a/.github/guides/ISSUE_MANAGER.md b/.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/camera/ai))
+ - Inactive AI Eye (/mob/eye/camera/ai): 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))

diff --git a/README.md b/README.md
@@ -36,9 +36,6 @@ 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)
-
 ## LICENSE
 
 All code after [commit 333c566b88108de218d882840e61928a9b759d8f on 2014/31/12 at 4:38 PM PST](https://github.com/psychonaut-station/PsychonautStation/commit/333c566b88108de218d882840e61928a9b759d8f) is licensed under [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.html).

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_hotsprings.dmm b/_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