Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sadboysuss committed Aug 22, 2024
2 parents 3102d50 + 491a881 commit a8eb37e
Show file tree
Hide file tree
Showing 637 changed files with 11,400 additions and 7,932 deletions.
29 changes: 0 additions & 29 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

65 changes: 65 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report_form.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
contact_links:
- name: Feature Requests
url: https://tgstation13.org/phpBB/viewforum.php?f=9
about: Post feature requests and suggestions on the forums. This repository does not handle them.
7 changes: 0 additions & 7 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

1 change: 0 additions & 1 deletion _maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@
/area/ruin/pizzeria)
"kr" = (
/obj/structure/table,
/obj/item/trash/waffles,
/obj/effect/turf_decal/tile/blue/opposingcorners{
dir = 1
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,12 +451,8 @@
/area/ruin/comms_agent)
"xq" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/radio/intercom{
pixel_x = 31;
syndie = 1;
freerange = 1;
name = "syndicate radio intercom";
desc = "A custom-made Syndicate-issue intercom used to transmit on all Nanotrasen frequencies. Particularly expensive."
/obj/item/radio/intercom/syndicate/freerange{
pixel_x = 31
},
/obj/structure/table/reinforced,
/obj/machinery/fax{
Expand Down
16 changes: 11 additions & 5 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_crashsite.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@
/area/ruin/unpowered)
"k" = (
/obj/structure/girder,
/turf/open/floor/plating,
/turf/open/floor/plating/lavaland_atmos,
/area/ruin/unpowered)
"l" = (
/turf/open/water,
/turf/open/water/lavaland_atmos,
/area/lavaland/surface)
"m" = (
/obj/machinery/door/airlock/survival_pod/glass,
Expand All @@ -85,6 +85,12 @@
"q" = (
/turf/closed/wall/mineral/titanium/interior,
/area/ruin/unpowered)
"r" = (
/obj/machinery/door/airlock/titanium{
name = "Escape Pod Airlock"
},
/turf/open/floor/mineral/titanium/blue/lavaland_atmos,
/area/ruin/unpowered)
"s" = (
/turf/open/floor/pod/dark,
/area/ruin/powered)
Expand Down Expand Up @@ -119,7 +125,7 @@
dir = 1
},
/obj/effect/mob_spawn/corpse/human/engineer,
/turf/open/floor/mineral/titanium/blue,
/turf/open/floor/mineral/titanium/blue/lavaland_atmos,
/area/ruin/unpowered)
"z" = (
/obj/item/book/manual/fish_catalog,
Expand Down Expand Up @@ -154,7 +160,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/mineral/titanium/blue,
/turf/open/floor/mineral/titanium/blue/lavaland_atmos,
/area/ruin/unpowered)
"J" = (
/obj/machinery/smartfridge/survival_pod{
Expand Down Expand Up @@ -476,7 +482,7 @@ o
O
y
I
b
r
a
a
R
Expand Down
Loading

0 comments on commit a8eb37e

Please sign in to comment.