Merge pull request #544 from Sea-of-Lost-Souls/upstreammaint

[MDB IGNORE][IDB IGNORE] London Class Maintburg

.github/ISSUE_TEMPLATE/bug_report_form.yml

@@ -0,0 +1,65 @@
+name: Bug Report
+description: Create a report to help reproduce and fix the issue.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        # **Please read the following guidelines. Follow all instructions or else your issue is subject to closure.**
+        ## If you use the "Report Issue" button in the top-right corner of the game, it will automatically fill in some of the information below.
+
+        If you are reporting an issue found in another branch or codebase, you _must_ link the branch or codebase repo in your issue report or it will be closed.
+        For branches, If you have not pushed your code up, please either reproduce it on master or push your code up before making an issue report.
+        For other codebases, if you do not have a public code repository you will be refused help unless you can completely reproduce the issue on our master branch.
+  - type: input
+    id: reporting-version
+    attributes:
+      label: "Client Version:"
+      description: |
+        The BYOND version you are using to report this issue. You can find this information in the bottom left corner of the "About BYOND" window in the BYOND client.
+        It is strongly recommended that you include this, especially for concerns on the visual aspects of the game.
+      placeholder: "xxx.xxxx"
+    validations:
+      required: false
+  - type: textarea
+    id: issue-summary
+    attributes:
+      label: "Issue Summary:"
+      description: |
+        Briefly explain your issue in a few plain sentences. You may copy and paste the issue title here if it is suitable.
+      placeholder: |
+        "When I do X, Y happens instead of Z."
+        "X on Y map has Z issue."
+    validations:
+      required: true
+  - type: input
+    id: round-id
+    attributes:
+      label: "Round ID:"
+      description: |
+        If you discovered this issue from playing tgstation hosted servers, the Round ID can be found in the Status panel or retrieved from https://statbus.space/
+        The Round ID lets us look up valuable information and logs for the round the bug happened. Leave this blank if there is no round ID.
+      placeholder: "XXXXXX"
+    validations:
+      required: false
+  - type: textarea
+    id: test-merges
+    attributes:
+      label: "Test Merge Information:"
+      description: |
+        If you're certain the issue is to be caused by a test merge [OOC Tab -> Show Server Revision], report it in the pull request's comment section rather than on the tracker.
+        If you're unsure you can refer to the issue number by prefixing said number with #. The issue number can be found beside the title after submission of this form.
+    validations:
+      required: false
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: "Reproduction Steps:"
+      description: |
+        Describe the steps to reproduce the issue in detail. Include any relevant information, such as the map, round type, and any other factors that may be relevant.
+        If it is a runtime-related error, please include the runtime here as that is pertient information. Issues are not for oddities introduced by admin varedits, ensure these occur in normal circumstances.
+      placeholder: |
+        1. Go to the X location
+        2. Do Y action
+        3. Observe Z result
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: Feature Requests
+    url: https://github.com/Skyrat-SS13/Skyrat-tg/discussions
+    about: Post feature requests and suggestions on the repository, a maintainer will look over them.

.gitignore

@@ -25,6 +25,8 @@
 # Ignore compiled linux libs in the root folder, e.g. librust_g.so
 /*.so
 
+#
+
 #Ignore compiled files and other files generated during compilation.
 *.mdme
 *.mdme.*
@@ -35,6 +37,16 @@
 *.lk
 *.int
 *.backup
+
+# Ignore tools ported over from SpacemanDMM for personal use
+.fingerprint
+build/
+deps/
+incremental/
+dmm-tools.exe
+dmm-tools.d
+git-diagnostics-2024-08-11-1513.zip
+
 ### https://raw.github.com/github/gitignore/cc542de017c606138a87ee4880e5f06b3a306def/Global/Linux.gitignore
 
 *~
@@ -247,3 +259,10 @@ define_sanity_output.txt
 # ezdb
 /db/
 /config/ezdb.txt
+<<<<<<< HEAD
+=======
+
+# Running OpenDream locally
+tgstation.json
+.cargo-lock
+>>>>>>> 5d81843b3302 (Raptor faction fix (#85792))

README.md

@@ -21,6 +21,7 @@ This is Sea of Lost Souls' downstream fork of Skyrat 13 created in byond.
 
 Space Station 13 is a paranoia-laden round-based roleplaying game set against the backdrop of a nonsensical, metal death trap masquerading as a space station, with charming spritework designed to represent the sci-fi setting and its dangerous undertones. Have fun, and survive!
 
+<<<<<<< HEAD
 ## Important note - TEST YOUR PULL REQUESTS
 
 You are responsible for the testing of your content and providing proof of such in your pull request. You should not mark a pull request ready for review until you have actually tested it. If you require a separate client for testing, you can use a guest account by logging out of BYOND and connecting to your test server. Test merges are not for bug finding, they are for stress tests where local testing simply doesn't allow for this.
@@ -30,6 +31,9 @@ You are responsible for the testing of your content and providing proof of such
 ![image](https://i.imgur.com/aJnE4WT.png)
 
 [Modularisation Guide](./modular_skyrat/readme.md)
+=======
+*All github inquiries (such as moderation actions) may be handled via the /tg/station discord [#coding-general](https://discord.com/channels/326822144233439242/326831214667235328). Simply ping the `@Maintainer` role, following the guide on asking questions located in the channel description, with your issue!*
+>>>>>>> 43b48e715e70 (Update README.md to include how to actually get help (#86025))
 
 ## DOWNLOADING
 

_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)