Merge Upstream 17.08.2024 [IDB IGNORE]

CODE_OF_CONDUCT.md

@@ -18,24 +18,34 @@ Headcoders reserve the right to permanently revoke access from the repository if
 
 ### PR Approval/Objection Info
 
-Headcoders (who will take into account the votes from both the Design and Balance teams) have the final say on Pull Requests. While thumbsup/thumbsdown reaction ratios are generally taken into account, they do not dictate whether or not a PR will be merged.
+Headcoders (who will take into account the votes from the relevant teams) have the final say on Pull Requests. While thumbsup/thumbsdown reaction ratios are generally taken into account, they do not dictate whether or not a PR will be merged.
 
 After a twenty four hour minimum waiting period, Pull Requests can be merged once they receive approval from the relevant team. An exception is made for refactors and fixes, which may be merged by any member with commit access' discretion with no waiting period.
 
-While normally provided, Design and Balance team members are not obligated to publicly state their objections to a Pull Request. Attacking or berating either of these roles over an objection will not be tolerated. Additionally, whining over the closure of a PR, the existence of an objection, or similar behaviour, will not be tolerated.
+While normally provided, voting team members are not obligated to publicly state their objections to a Pull Request. Attacking or berating a voting team member over an objection will not be tolerated. Additionally, whining over the closure of a PR, the existence of an objection, or similar behaviour, will not be tolerated.
 
 Headcoders may close your PR at their discretion if your PR history has little focus on improving repo maintainability (ie: making nothing but 20 balance or feature PRs). Likewise, balance PRs may be closed if the PR author has little-to-no time played on the server. This is to ensure balance changes are made by people actually in-touch with the server atmosphere.
 
 ### PR Expectations
 
-All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception.
-
-It is expected that contributors discuss larger changes on the forums or repository discussion tab prior to starting work on a Pull Request. The amount of time spent on any given Pull Request is not relevant. Repo staff are not responsible for contributors wasting their time creating features nobody asked for. Be sure to inform the corresponding teams about the forum post or discussion.
+Contributors may only have a maximum of **2** feature or balance Pull Requests open at any given time. Any additional Pull Requests beyond this limit will be closed at the discretion of the Headcoders. The Headcoders may grant an exemption to this limit on a case-by-case basis, as the need arises.
 
-In addition, discussing any change with the relevant teams is strongly advised. For large changes, changes which have a lot of impact (balance or design), species changes (however minor), or other changes that might be controversial, you should always discuss this with the relevant teams. Failure to do so might result in your PR being closed.
+All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception.
 
 Barring highly specific circumstances (such as single line changes, submissions from advanced users, or changes to repo documentation), we will not accept Pull Requests utilising the web editor.
 
 Pull Requests regarding heavy-handed nerfs, particularly immediately after said mechanic was used, will be tagged with `I ded pls nerf`. A bad experience with a particular mechanic is not a justification for nerfing it.
 
 Reactionary revert PRs are not tolerated under any circumstances. Posting a revert immediately after a Pull Request is merged will result in a repoban.
+
+It is expected that contributors discuss larger changes on the [Paradise Station forums](https://www.paradisestation.org/forum/91-code-discussion/), [GitHub discussions tab](https://github.com/ParadiseSS13/Paradise/discussions), or the [Discord project-discussion forum](https://discord.com/channels/145533722026967040/1110966752898207824) prior to starting work on a Pull Request. The amount of time spent on any given Pull Request is not relevant. Repo staff are not responsible for contributors wasting their time creating features nobody asked for. Be sure to inform the corresponding teams about the forum post or discussion.
+
+For changes to content listed below, contributors **must** obtain approval from a headcoder or a member of either the balance, design, mapping, or sprite team (depending on which teams are relevant to the changes) before opening their Pull Request. This approval must be displayed in the Pull Request description body in the form of a screenshot. The Headcoders may grant an exemption to this requirement on a case-by-case basis, as the need arises.
+
+### Currently, changes to the following types of content requires pre-approval:
+  - Security content (excluding fixes, code improvement, refactors, sprites, and mapping changes)
+  - Antagonist content (excluding fixes, code improvement, refactors, sprites, and mapping changes)
+  - Species content (excluding fixes, code improvement, and refactors)
+  - Large changes (for example PRs that touch multiple systems, many files, many lines of code)
+  - Changes that might be controversial
+  - Changes with wide-ranging balance or design implications

README.md

@@ -1,7 +1,3 @@
-> [!IMPORTANT]
-> We are currently in a period of focus on "Quality releases", this means no new balance or feature PRs are permitted without prior approval.</br>
-> [For more info, see the following discord post on our public discord](https://discord.com/channels/145533722026967040/499000353312735233/1256632472196878337)
-
 <a href="#"><img src=".github/assets/paradise.png" alt="Paradise Station"></a>
 
 ##	<p align="center">Добро пожаловать в репозиторий Paradise WyccStation SS220 по игре [Space Station 13](https://spacestation13.com/).</p>

_maps/map_files/EventStructures/thunderdome_catwalk_chasm_fake.dmm

@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "E" = (
-/turf/simulated/floor/chasm/straight_down,
+/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air,
 /area/tdome/arena)
 "R" = (
 /turf/simulated/floor/catwalk,

_maps/map_files/EventStructures/thunderdome_hiero_default.dmm

@@ -3,10 +3,10 @@
 /turf/simulated/wall/indestructible/hierophant,
 /area/tdome/arena)
 "I" = (
-/turf/simulated/floor/indestructible/hierophant/two,
+/turf/simulated/floor/indestructible/hierophant/two/normal_air,
 /area/tdome/arena)
 "R" = (
-/turf/simulated/floor/indestructible/hierophant,
+/turf/simulated/floor/indestructible/hierophant/normal_air,
 /area/tdome/arena)
 
 (1,1,1) = {"

_maps/map_files/EventStructures/thunderdome_hiero_pandora.dmm

@@ -1,16 +1,16 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "h" = (
 /mob/living/simple_animal/hostile/asteroid/elite/pandora,
-/turf/simulated/floor/indestructible/hierophant/two,
+/turf/simulated/floor/indestructible/hierophant/two/normal_air,
+/area/tdome/arena)
+"m" = (
+/turf/simulated/floor/indestructible/hierophant/two/normal_air,
 /area/tdome/arena)
 "F" = (
 /turf/simulated/wall/indestructible/hierophant,
 /area/tdome/arena)
-"I" = (
-/turf/simulated/floor/indestructible/hierophant/two,
-/area/tdome/arena)
 "R" = (
-/turf/simulated/floor/indestructible/hierophant,
+/turf/simulated/floor/indestructible/hierophant/normal_air,
 /area/tdome/arena)
 
 (1,1,1) = {"
@@ -19,7 +19,7 @@ R
 R
 R
 R
-R
+m
 R
 "}
 (2,1,1) = {"
@@ -43,81 +43,81 @@ R
 (4,1,1) = {"
 R
 R
-I
-I
-I
+m
+m
+m
 R
 R
 "}
 (5,1,1) = {"
 R
 R
-I
-I
-I
+m
+m
+m
 R
 R
 "}
 (6,1,1) = {"
 R
-I
-I
-I
-I
-I
+m
+m
+m
+m
+m
 R
 "}
 (7,1,1) = {"
 R
-I
-I
-I
-I
-I
+m
+m
+m
+m
+m
 R
 "}
 (8,1,1) = {"
 F
 F
-I
+m
 h
-I
+m
 F
 F
 "}
 (9,1,1) = {"
 R
-I
-I
-I
-I
-I
+m
+m
+m
+m
+m
 R
 "}
 (10,1,1) = {"
 R
-I
-I
-I
-I
-I
+m
+m
+m
+m
+m
 R
 "}
 (11,1,1) = {"
 R
 R
-I
-I
-I
+m
+m
+m
 R
 R
 "}
 (12,1,1) = {"
 R
 R
-I
-I
-I
+m
+m
+m
 R
 R
 "}