Revert "Major codebase improvements + widescreen" (Foundation-19#1771)

Revert "Major codebase improvements + widescreen (Foundation-19#1745)"

This reverts commit 7309155.

.github/workflows/test.yml

@@ -9,22 +9,28 @@ on:
       - dev
 env:
   BYOND_MAJOR: "515"
-  BYOND_MINOR: "1641"
+  BYOND_MINOR: "1623"
   SPACEMAN_DMM_VERSION: suite-1.9
 
 jobs:
   DreamChecker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - name: Install Tools
-        run: |
-          pip3 install setuptools
-          bash tools/ci/install_node.sh
-          bash tools/ci/install_spaceman_dmm.sh dreamchecker
-          tools/bootstrap/python -c ''
+      - name: Setup Cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        with:
+          path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
+          key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
+      - name: Install Dreamchecker
+        run:  scripts/install-spaceman-dmm.sh dreamchecker
       - name: Run Dreamchecker
-        run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
+        run: ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1
+      - name: Annotate Lints
+        uses: yogstation13/DreamAnnotate@8ef04ef7fbb4ac63ee2daca222af91599e0af5e1
+        if: always()
+        with:
+          outputFile: output-annotations.txt
       - name: Run Failure Webhook
         env:
           JOB_STATUS: ${{ job.status }}
@@ -37,19 +43,26 @@ jobs:
           chmod +x send.sh
           ./send.sh failure $WEBHOOK_URL
   Code:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
+      - name: Setup Cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        with:
+          path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
+          key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
       - name: Install Dependencies
         run: sudo apt-get install -y uchardet
+      - name: Install RUST_G Deps
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install libssl1.1:i386
+          ldd librust_g.so
       - name: Run Tests
         env:
           TEST: CODE
-        run: |
-          bash tools/ci/install_byond.sh
-          bash tools/ci/install_rust_g.sh
-          source $HOME/BYOND/byond/bin/byondsetup
-          bash test/run-test.sh
+        run: test/run-test.sh
       - name: Run Failure Webhook
         env:
           JOB_STATUS: ${{ job.status }}
@@ -62,21 +75,28 @@ jobs:
           chmod +x send.sh
           ./send.sh failure $WEBHOOK_URL
   Maps:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         map_path: [site53]
     steps:
       - uses: actions/checkout@v4
+      - name: Setup Cache
+        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
+        with:
+          path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
+          key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
+      - name: Install RUST_G Deps
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install libssl1.1:i386
+          ldd librust_g.so
       - name: Run Tests
         env:
           TEST: MAP
           MAP_PATH: ${{ matrix.map_path }}
-        run: |
-          bash tools/ci/install_byond.sh
-          bash tools/ci/install_rust_g.sh
-          source $HOME/BYOND/byond/bin/byondsetup
-          bash test/run-test.sh
+        run: test/run-test.sh
       - name: Run Failure Webhook
         env:
           JOB_STATUS: ${{ job.status }}

.gitignore

@@ -22,20 +22,6 @@ atupdate
 config/*
 sql/test_db
 
-# byond-tracy, we intentionally do not ship this and do not want to maintain it
-# https://github.com/mafemergency/byond-tracy/
-prof.dll
-libprof.so
-
-# Tracy can read source files when it is in the root folder, even without absolute paths.
-# If you're interested, run this hack:
-# https://gist.github.com/Mothblocks/db5462aa84d7d6b1d1b1276b820f62da
-Tracy.exe
-
-
-# Ignore compiled linux libs in the root folder, e.g. librust_g.so
-/*.so
-
 # VisualStudioCode
 *.code-workspace
 

baystation12.dme

@@ -10,8 +10,7 @@
 #define DEBUG
 // END_PREFERENCES
 // BEGIN_INCLUDE
-#include "code\__byond_version_compat.dm"
-#include "code\_compile_options.dm"
+#include "code\_byond_version_compat.dm"
 #include "code\_debugger.dm"
 #include "code\_macros.dm"
 #include "code\_spaceman_dmm.dm"
@@ -23,6 +22,7 @@
 #include "code\__datastructures\globals.dm"
 #include "code\__datastructures\priority_queue.dm"
 #include "code\__datastructures\stack.dm"
+#include "code\__defines\__compile_options.dm"
 #include "code\__defines\_click.dm"
 #include "code\__defines\_helpers.dm"
 #include "code\__defines\_lists.dm"
@@ -94,7 +94,6 @@
 #include "code\__defines\research.dm"
 #include "code\__defines\ruin_tags.dm"
 #include "code\__defines\rust_g.dm"
-#include "code\__defines\rust_g_overrides.dm"
 #include "code\__defines\SCP.dm"
 #include "code\__defines\shields.dm"
 #include "code\__defines\shuttle.dm"
@@ -185,7 +184,6 @@
 #include "code\_helpers\unsorted.dm"
 #include "code\_helpers\vector.dm"
 #include "code\_helpers\verbs.dm"
-#include "code\_helpers\view.dm"
 #include "code\_helpers\washing.dm"
 #include "code\_helpers\sorts\__main.dm"
 #include "code\_helpers\sorts\TimSort.dm"
@@ -301,6 +299,7 @@
 #include "code\controllers\subsystems\initialization\codex.dm"
 #include "code\controllers\subsystems\initialization\cuisine.dm"
 #include "code\controllers\subsystems\initialization\culture.dm"
+#include "code\controllers\subsystems\initialization\customitems.dm"
 #include "code\controllers\subsystems\initialization\fabrication.dm"
 #include "code\controllers\subsystems\initialization\materials.dm"
 #include "code\controllers\subsystems\initialization\misc.dm"
@@ -2377,6 +2376,7 @@
 #include "code\modules\mob\living\silicon\pai\software_modules.dm"
 #include "code\modules\mob\living\silicon\robot\analyzer.dm"
 #include "code\modules\mob\living\silicon\robot\component.dm"
+#include "code\modules\mob\living\silicon\robot\custom_sprites.dm"
 #include "code\modules\mob\living\silicon\robot\death.dm"
 #include "code\modules\mob\living\silicon\robot\examine.dm"
 #include "code\modules\mob\living\silicon\robot\inventory.dm"
@@ -3494,6 +3494,7 @@
 #include "code\modules\ZAS\Variable Settings.dm"
 #include "code\modules\ZAS\Zone.dm"
 #include "code\procs\announce.dm"
+#include "code\procs\dbcore.dm"
 #include "code\procs\hud.dm"
 #include "code\procs\radio.dm"
 #include "code\unit_tests\_defines.dm"
@@ -3553,8 +3554,8 @@
 #include "maps\site53\items\bullets.dm"
 #include "maps\site53\items\clothes.dm"
 #include "maps\site53\items\guns.dm"
-#include "maps\site53\items\paperwork_dataserver.dm"
 #include "maps\site53\items\sciprc_server.dm"
+#include "maps\site53\items\paperwork_dataserver.dm"
 #include "maps\site53\items\SCP_dataserver.dm"
 #include "maps\site53\items\storage.dm"
 #include "maps\site53\items\toys.dm"

code/_compile_options.dm → code/__defines/__compile_options.dm

@@ -12,10 +12,6 @@
 #warn Consider switching to VSCode editor instead, where you can press Ctrl+Shift+B to build.
 #endif
 
-// If this is uncommented, will attempt to load and initialize prof.dll/libprof.so.
-// We do not ship byond-tracy. Build it yourself here: https://github.com/mafemergency/byond-tracy/
-//#define USE_BYOND_TRACY
-
 ///Used to find the sources of harddels, quite laggy, don't be surpised if it freezes your client for a good while
 //#define REFERENCE_TRACKING
 #ifdef REFERENCE_TRACKING
@@ -31,30 +27,5 @@
 #ifdef GC_FAILURE_HARD_LOOKUP
 #define FIND_REF_NO_CHECK_TICK
 #endif //ifdef GC_FAILURE_HARD_LOOKUP
-#endif //ifdef REFERENCE_TRACKING
-
-/// If this is uncommented, we set up the ref tracker to be used in a live environment
-/// And to log events to [log_dir]/harddels.log
-//#define REFERENCE_DOING_IT_LIVE
-#ifdef REFERENCE_DOING_IT_LIVE
-// compile the backend
-#define REFERENCE_TRACKING
-// actually look for refs
-#define GC_FAILURE_HARD_LOOKUP
-// Log references in their own file
-#define REFERENCE_TRACKING_LOG_APART
-#endif // REFERENCE_DOING_IT_LIVE
 
-/// Sets up the reftracker to be used locally, to hunt for hard deletions
-/// Errors are logged to [log_dir]/harddels.log
-//#define REFERENCE_TRACKING_STANDARD
-#ifdef REFERENCE_TRACKING_STANDARD
-// compile the backend
-#define REFERENCE_TRACKING
-// actually look for refs
-#define GC_FAILURE_HARD_LOOKUP
-// spend ALL our time searching, not just part of it
-#define FIND_REF_NO_CHECK_TICK
-// Log references in their own file
-#define REFERENCE_TRACKING_LOG_APART
-#endif // REFERENCE_TRACKING_STANDARD
+#endif //ifdef REFERENCE_TRACKING

code/__defines/_click.dm

@@ -1,45 +1,9 @@
-//Defines file for byond click related parameters
-//this is mostly for ease of use and for finding all the things that use say RIGHT_CLICK rather then just searching "right"
-
-//Mouse buttons held
+//Mouse buttons pressed/held/released
 #define RIGHT_CLICK "right"
 #define MIDDLE_CLICK "middle"
 #define LEFT_CLICK "left"
 
-///Mouse button that was just clicked/released
-///if(modifiers[BUTTON] == LEFT_CLICK)
-#define BUTTON "button"
-
 //Keys held down during the mouse action
 #define CTRL_CLICK "ctrl"
 #define ALT_CLICK "alt"
 #define SHIFT_CLICK "shift"
-
-//Cells involved if using a Grid control
-#define DRAG_CELL "drag-cell"
-#define DROP_CELL "drop-cell"
-
-//The button used for dragging (only sent for unrelated mouse up/down messages during a drag)
-#define DRAG "drag"
-
-//If the mouse is over a link in maptext, or this event is related to clicking such a link
-#define LINK "link"
-
-//Pixel coordinates relative to the icon's position on screen
-#define VIS_X "vis-x"
-#define VIS_Y "vis-y"
-
-//Pixel coordinates within the icon, in the icon's coordinate space
-#define ICON_X "icon-x"
-#define ICON_Y "icon-y"
-
-//Pixel coordinates in screen_loc format ("[tile_x]:[pixel_x],[tile_y]:[pixel_y]")
-#define SCREEN_LOC "screen-loc"
-
-//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
-/// Objects will ignore being clicked on regardless of their transparency (used in parallax, lighting effects, holograms, lasers, etc.)
-#define MOUSE_OPACITY_TRANSPARENT 0
-/// Objects will be clicked on if it is the topmost object and the pixel isn't transparent at the position of the mouse (default behavior for 99.99% of game objects)
-#define MOUSE_OPACITY_ICON 1
-/// Objects will be always be clicked on regardless of pixel transparency or other objects at that location (used in space vines, megafauna, storage containers)
-#define MOUSE_OPACITY_OPAQUE 2

code/__defines/_planes+layers.dm

@@ -244,7 +244,7 @@ What is the naming convention for planes or layers?
 
 /atom/movable/screen/plane_master
 	appearance_flags = PLANE_MASTER
-	screen_loc = "CENTER"
+	screen_loc = "CENTER,CENTER"
 	globalscreen = 1
 
 /atom/movable/screen/plane_master/ghost_master

code/__defines/client.dm

@@ -1,2 +1,2 @@
 #define CLIENT_MIN_FPS 0
-#define CLIENT_MAX_FPS 360
+#define CLIENT_MAX_FPS 1000

code/__defines/dcs/signals.dm

@@ -103,11 +103,6 @@
 
 /// Called on `/mob/living/say` (/mob/living, message, /datum/language)
 #define COMSIG_LIVING_TREAT_MESSAGE "living_treat_message"
-	#define SPEECH_ARG_MESSAGE 1
-	#define SPEECH_ARG_LANGUAGE 2
-	#define SPEECH_ARG_VERB 3
-	#define SPEECH_ARG_ALT_NAME 4
-	#define SPEECH_ARG_WHISPERING 5
 
 /// Called on `/obj/item/proc/dropped` (/mob, /obj)
 #define COMSIG_MOB_DROPPED_ITEM "mob_dropped_item"

code/__defines/misc.dm

@@ -31,6 +31,11 @@
 #define SEE_INVISIBLE_MINIMUM 	5
 #define INVISIBILITY_MAXIMUM 	100
 
+//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
+#define MOUSE_OPACITY_TRANSPARENT 	0
+#define MOUSE_OPACITY_ICON 			1
+#define MOUSE_OPACITY_OPAQUE 		2
+
 // Some arbitrary defines to be used by self-pruning global lists. (see master_controller)
 #define PROCESS_KILL 26 // Used to trigger removal from a processing list.
 
@@ -97,6 +102,24 @@
 //Ruin map template flags
 #define TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED 32 // Ruin is not available during spawning unless another ruin permits it.
 
+// Convoluted setup so defines can be supplied by Bay12 main server compile script.
+// Should still work fine for people jamming the icons into their repo.
+#ifndef CUSTOM_ITEM_CONFIG
+#define CUSTOM_ITEM_CONFIG "config/custom_items/"
+#endif
+#ifndef CUSTOM_ITEM_SYNTH_CONFIG
+#define CUSTOM_ITEM_SYNTH_CONFIG "config/custom_sprites.txt"
+#endif
+#ifndef CUSTOM_ITEM_OBJ
+#define CUSTOM_ITEM_OBJ 'icons/obj/custom_items_obj.dmi'
+#endif
+#ifndef CUSTOM_ITEM_MOB
+#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi'
+#endif
+#ifndef CUSTOM_ITEM_SYNTH
+#define CUSTOM_ITEM_SYNTH 'icons/mob/custom_synthetic.dmi'
+#endif
+
 #define WALL_CAN_OPEN 1
 #define WALL_OPENING 2