Merge branch 'update_upstream' of https://github.com/Dripstation-Dev/…

…Dripstation

.github/workflows/turdis.yml

@@ -57,6 +57,25 @@ jobs:
         with:
           outputFile: output-annotations.txt
 
+  odlint:
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
+    name: "Lint with OpenDream"
+    runs-on: ubuntu-22.04
+    concurrency:
+      group: odlint-${{ github.head_ref || github.run_id }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v4
+      - uses: robinraju/[email protected]
+        with:
+          repository: "OpenDreamProject/OpenDream"
+          tag: "latest"
+          fileName: "DMCompiler_linux-x64.tar.gz"
+          extract: true
+      - name: Run OpenDream
+        run: |
+          ./DMCompiler_linux-x64/DMCompiler yogstation.dme --suppress-unimplemented --define=CIBUILDING
+
   compile:
     name: Compile All Maps
     runs-on: ubuntu-20.04
@@ -165,7 +184,7 @@ jobs:
       - name: Compile
         run: |
           tools/build/build --ci dm -DCIBUILDING
-          tools/travis/dm.sh -DTRAVISBUILDING -DANSICOLORS yogstation.dme || travis_terminate 1
+          tools/travis/dm.sh -DCIBUILDING -DANSICOLORS yogstation.dme || travis_terminate 1
 
       - name: Prepare Artifacts
         run: |

.gitignore

@@ -222,3 +222,6 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
 # ezdb
 /db/
 /config/ezdb.txt
+
+# Running OpenDream locally
+tgstation.json

__odlint.dm

@@ -0,0 +1,10 @@
+// This file is included right at the start of the DME.
+// Its purpose is to enable multiple lints (pragmas) that are supported by OpenDream to better validate the codebase
+// These are essentially nitpicks the DM compiler should pick up on but doesnt
+
+#if !defined(SPACEMAN_DMM) && defined(OPENDREAM)
+// This is in a separate file as a hack to avoid SpacemanDMM
+// evaluating the #pragma lines, even if its outside a block it cares about
+// (Also so people can code-own it. Shoutout to AA)
+#include "tools/ci/od_lints.dm"
+#endif

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

@@ -563,7 +563,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
-/obj/item/clothing/under/suit_jacket/tan,
+/obj/item/clothing/under/suit/tan,
 /turf/open/floor/wood,
 /area/ruin/powered)
 

_maps/RandomRuins/JungleRuins/jungleland_swamp_syndicatestation.dmm

@@ -4952,15 +4952,15 @@
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered/syndicate_lava_base/engineering)
 "SV" = (
-/obj/machinery/computer/shuttle{
+/obj/machinery/computer/terminal{
 	desc = "Occasionally used to call in a resupply shuttle if one is in range.";
+	name = "syndicate resupply shuttle console";
 	icon_keyboard = "syndie_key";
 	icon_screen = "syndishuttle";
-	light_color = "#FA8282";
-	name = "syndicate cargo shuttle terminal";
-	possible_destinations = "syndielavaland_cargo";
-	req_access_txt = "150";
-	shuttleId = "syndie_cargo"
+	upperinfo = "Syndicate Resupply Terminal - Jungleland Research Outpost";
+	content = list("This terminal is currently locked due to no supply shuttles being in range. For resupply, please contact Syndicate Command via your onboard red phone.");
+	tguitheme = "syndicate";
+	light_color = "#FA8282"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/powered/syndicate_lava_base/cargo)

_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm

@@ -1368,20 +1368,20 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/powered/syndicate_lava_base/medbay)
 "gV" = (
-/obj/machinery/computer/shuttle{
-	desc = "Occasionally used to call in a resupply shuttle if one is in range.";
-	icon_keyboard = "syndie_key";
-	icon_screen = "syndishuttle";
-	light_color = "#FA8282";
-	name = "syndicate cargo shuttle terminal";
-	possible_destinations = "syndielavaland_cargo";
-	req_access_txt = "150";
-	shuttleId = "syndie_cargo"
-	},
 /obj/machinery/airalarm/syndicate{
 	dir = 8;
 	pixel_x = 24
 	},
+/obj/machinery/computer/terminal{
+	desc = "Occasionally used to call in a resupply shuttle if one is in range.";
+	name = "syndicate resupply shuttle console";
+	icon_keyboard = "syndie_key";
+	icon_screen = "syndishuttle";
+	upperinfo = "Syndicate Resupply Terminal - Lavaland Research Outpost";
+	content = list("This terminal is currently locked due to no supply shuttles being in range. For resupply, please contact Syndicate Command via your onboard red phone.");
+	tguitheme = "syndicate";
+	light_color = "#FA8282"
+	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/syndicate_lava_base/cargo)
 "gW" = (

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -1273,7 +1273,7 @@
 	},
 /obj/structure/closet/crate,
 /obj/item/clothing/head/centhat/admiral,
-/obj/item/clothing/under/rank/centcom_admiral,
+/obj/item/clothing/under/rank/centcom/admiral,
 /obj/item/clothing/gloves/color/captain/centcom/admiral,
 /obj/item/paper/fluff/ruins/caravanambush/admiral,
 /turf/open/floor/plasteel/airless/dark,

_maps/RandomRuins/SpaceRuins/crashedship.dmm

@@ -2272,7 +2272,7 @@
 /area/awaymission/BMPship/Aft)
 "gP" = (
 /obj/structure/closet,
-/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
 /obj/item/clothing/suit/apron,
 /turf/open/floor/plasteel,
 /area/awaymission/BMPship/Aft)

_maps/RandomRuins/SpaceRuins/oldAIsat.dmm

@@ -572,7 +572,7 @@
 "bU" = (
 /obj/effect/decal/cleanable/blood,
 /obj/structure/chair,
-/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/under/rank/centcom/officer,
 /obj/item/restraints/handcuffs,
 /obj/effect/decal/remains/human,
 /turf/open/floor/plating/airless,