Merge branch 'master' into translate

ss220club · Apr 24, 2024 · 09930a5 · 09930a5
2 parents f70b34d + 71dc290
commit 09930a5
Show file tree

Hide file tree

Showing 663 changed files with 7,711 additions and 5,751 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -586,6 +586,26 @@ SS13 has a lot of legacy code that's never been updated. Here are some examples
 
 - Files and path accessed and referenced by code above simply being #included should be strictly lowercase to avoid issues on filesystems where case matters.
 
+#### Modular Code in a File
+
+Code should be modular where possible; if you are working on a new addition, then strongly consider putting it in its own file unless it makes sense to put it with similar ones (i.e. a new tool would go in the `tools.dm` file)
+
+Our codebase also has support for checking files so that they only contain one specific typepath, including none of its subtypes. This can be done by adding a specific header at the beginning of the file, which the CI will look for when running. An example can be seen below. You can also run this test locally using `/tools/ci/restrict_file_types.py`
+
+```dm
+RESTRICT_TYPE(/datum/foo)
+
+/datum/proc/do_thing() // Error: '/datum' proc found in a file restricted to '/datum/foo'
+
+/datum/foo
+
+/datum/foo/do_thing()
+
+/datum/foo/bar // Error: '/datum/foo/bar' type definition found in a file restricted to '/datum/foo'
+
+/datum/foo/bar/do_thing() // Error: '/datum/foo/bar' proc found in a file restricted to '/datum/foo'
+```
+
 ### SQL
 
 - Do not use the shorthand sql insert format (where no column names are specified) because it unnecessarily breaks all queries on minor column changes and prevents using these tables for tracking outside related info such as in a connected site/forum.
@@ -679,7 +699,6 @@ SS13 has a lot of legacy code that's never been updated. Here are some examples
 
 ### Other Notes
 
-- Code should be modular where possible; if you are working on a new addition, then strongly consider putting it in its own file unless it makes sense to put it with similar ones (i.e. a new tool would go in the `tools.dm` file)
 - Bloated code may be necessary to add a certain feature, which means there has to be a judgement over whether the feature is worth having or not. You can help make this decision easier by making sure your code is modular.
 
 - You are expected to help maintain the code that you add, meaning that if there is a problem then you are likely to be approached in order to fix any issues, runtimes, or bugs.
@@ -815,8 +834,10 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 `Commit Access` members have write access to the repository and can merge your PRs. People included in this role are:
 
 - [AffectedArc07](https://github.com/AffectedArc07)
+- [Burzah](https://github.com/Burzah)
 - [Charliminator](https://github.com/hal9000PR)
 - [Contrabang](https://github.com/Contrabang)
+- [DGamerL](https://github.com/DGamerL)
 - [lewcc](https://github.com/lewcc)
 
 ---
@@ -827,6 +848,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c
 - [Charliminator](https://github.com/hal9000PR)
 - [Contrabang](https://github.com/Contrabang)
 - [DGamerL](https://github.com/DGamerL)
+- [FunnyMan3595](https://github.com/FunnyMan3595)
 - [Henri215](https://github.com/Henri215)
 - [lewcc](https://github.com/lewcc)
 - [Sirryan2002](https://github.com/Sirryan2002)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,6 +48,7 @@ jobs:
           python tools/ci/unticked_files.py ${GITHUB_WORKSPACE}
           python tools/ci/illegal_dme_files.py ${GITHUB_WORKSPACE}
           python tools/ci/define_sanity.py
+          python tools/ci/restrict_file_types.py
           python -m tools.ci.check_icon_conflicts
           python -m tools.ci.check_icon_dupenames
           python -m tools.maplint.source --github

diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -27,6 +27,7 @@ CREATE TABLE `characters` (
   `real_name` varchar(55) COLLATE utf8mb4_unicode_ci NOT NULL,
   `name_is_always_random` tinyint(1) NOT NULL,
   `gender` varchar(11) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `body_type` varchar(11) COLLATE utf8mb4_unicode_ci NOT NULL,
   `age` smallint(4) NOT NULL,
   `species` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL,
   `language` varchar(45) COLLATE utf8mb4_unicode_ci NOT NULL,

diff --git a/SQL/updates/54-55.sql b/SQL/updates/54-55.sql
@@ -0,0 +1,9 @@
+# Updating DB from 54-55 - lewc
+# Adds a new `body_type` (gender sprite) column to the `characters` table
+
+# Add the new column next to the existing `gender` one
+ALTER TABLE `characters`
+	ADD COLUMN `body_type` varchar(11) COLLATE utf8mb4_unicode_ci NOT NULL AFTER `gender`;
+
+# Set the `body_type` column to whatever's already in `gender`, so that it doesn't change existing characters
+UPDATE `characters` SET `body_type` = `gender` WHERE `gender` IS NOT NULL
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
@@ -259,7 +259,6 @@
 /area/ruin/space/onehalf/hallway)
 "aM" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment,
 /obj/machinery/door/poddoor{
 	id_tag = "bayint1";
 	name = "mining drone bay blast door"
@@ -636,9 +635,6 @@
 /area/ruin/space/onehalf/hallway)
 "bA" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -653,15 +649,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/drone_bay)
-"bC" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel,
-/area/ruin/space/onehalf/drone_bay)
 "bD" = (
 /obj/structure/disposalpipe/junction{
 	dir = 8
@@ -1643,7 +1630,7 @@ aD
 aq
 aX
 bm
-bC
+bn
 bT
 aa
 cn

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
@@ -214,7 +214,6 @@
 /area/ruin/space/wreck_cargoship)
 "jb" = (
 /obj/structure/table,
-/obj/structure/table,
 /obj/item/paper{
 	name = "management's directive";
 	info = "Good day Captain Hardie. Your ship has been assigned to carry an extremely delicate cargo due to an unfortunate scheduling issue in behalf of our custormers. You will find the additional information on transporting procedure of this extremely delicate cargo attached to it. Management believes you will not mind this rather unconvenient last minute change after what happened last time. Make sure you and your crew doesn't mess it up this time as we hate to compensate the expenses from our esteemed already-in-debt employees. Pick the cargo from next destination and safely deliver it where it has to go."

diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -52972,7 +52972,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment,
 /obj/structure/sign/securearea{
 	pixel_x = -32
 	},
@@ -74887,7 +74886,6 @@
 /area/station/maintenance/apmaint)
 "owP" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plating/airless,
 /area/station/maintenance/asmaint)
 "oxe" = (