Merge pull request #124 from MistakeNot4892/fork/pyrelight

Updating from Neb dev.

Author: MistakeNot4892

.github/workflows/test.yml

@@ -58,11 +58,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: '3.x'
-      - name: Setup Cache
-        uses: actions/cache@v3
-        with:
-          path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
-          key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
       - name: Install OpenDream
         uses: robinraju/release-downloader@v1.9
         with:
@@ -71,7 +66,7 @@ jobs:
           fileName: "DMCompiler_linux-x64.tar.gz"
           extract: true
       - name: Run OpenDream
-        run: ./DMCompiler_linux-x64/DMCompiler nebula.dme --suppress-unimplemented --skip-anything-typecheck --version=${BYOND_MAJOR}.${BYOND_MINOR} | python tools/od_annotator/__main__.py "$@"
+        run: ./DMCompiler_linux-x64/DMCompiler nebula.dme --define=UNIT_TEST --suppress-unimplemented --skip-anything-typecheck --version=${BYOND_MAJOR}.${BYOND_MINOR} | bash test/annotate_od.sh
   Code:
     runs-on: ubuntu-22.04
     steps:

code/__defines/MC.dm

@@ -24,7 +24,7 @@
 if (Datum.is_processing) {\
 	if(Datum.is_processing != #Processor)\
 	{\
-		PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occured on [#Processor]."); \
+		PRINT_STACK_TRACE("Failed to start processing. [log_info_line(Datum)] is already being processed by [Datum.is_processing] but queue attempt occurred on [#Processor]."); \
 	}\
 } else {\
 	Datum.is_processing = Processor._internal_name;\
@@ -36,7 +36,7 @@ if(Datum.is_processing) {\
 	if(Processor.processing.Remove(Datum)) {\
 		Datum.is_processing = null;\
 	} else {\
-		PRINT_STACK_TRACE("Failed to stop processing. [log_info_line(Datum)] is being processed by [Datum.is_processing] but de-queue attempt occured on [#Processor]."); \
+		PRINT_STACK_TRACE("Failed to stop processing. [log_info_line(Datum)] is being processed by [Datum.is_processing] but de-queue attempt occurred on [#Processor]."); \
 	}\
 }
 

code/__defines/bodytype.dm

@@ -18,7 +18,7 @@
 // Bodytype feature flags
 /// Does not create DNA. Replaces SPECIES_FLAG_NO_SCAN.
 #define BODY_FLAG_NO_DNA          BITFLAG(0)
-/// Cannot suffer halloss/recieves deceptive health indicator.
+/// Cannot suffer halloss/receives deceptive health indicator.
 #define BODY_FLAG_NO_PAIN         BITFLAG(1)
 /// Cannot eat food/drink drinks even if a stomach organ is present.
 #define BODY_FLAG_NO_EAT          BITFLAG(2)

code/__defines/flags.dm

@@ -86,6 +86,7 @@ The latter will result in a linter warning and will not work correctly.
 #define ITEM_FLAG_PADDED                    BITFLAG(13) // When set on gloves, will act like pulling punches in unarmed combat.
 #define ITEM_FLAG_CAN_TAPE                  BITFLAG(14) // Whether the item can be taped onto something using tape
 #define ITEM_FLAG_IS_WEAPON                 BITFLAG(15) // Item is considered a weapon. Currently only used for force-based worth calculation.
+#define ITEM_FLAG_MAGNETISED                BITFLAG(16) // When worn on feet and standing on an appropriate spot, will prevent slipping.
 
 // Flags for pass_flags (/atom/var/pass_flags)
 #define PASS_FLAG_TABLE                     BITFLAG(0)

code/__defines/hud.dm

@@ -1,23 +1,31 @@
-// Keys used to set and retrieve icons from the UI decl system.
-#define UI_ICON_INTERACTION "icon_interaction"
-#define UI_ICON_ZONE_SELECT "icon_zone_sel"
-#define UI_ICON_MOVEMENT    "icon_movement"
-#define UI_ICON_INVENTORY   "icon_inventory"
-#define UI_ICON_ATTACK      "icon_attack"
-#define UI_ICON_HANDS       "icon_hands"
-#define UI_ICON_INTERNALS   "icon_internals"
-#define UI_ICON_HEALTH      "icon_health"
-#define UI_ICON_CRIT_MARKER "icon_crit_marker"
-#define UI_ICON_NUTRITION   "icon_nutrition"
-#define UI_ICON_HYDRATION   "icon_hydration"
-#define UI_ICON_FIRE_INTENT "icon_fire_intent"
-#define UI_ICON_UP_HINT     "icon_uphint"
-#define UI_ICON_STATUS      "icon_status"
-#define UI_ICON_STATUS_FIRE "icon_status_fire"
-#define UI_ICON_CHARGE      "icon_charge"
+// Keys used to create HUD elements, and to set and retrieve icons from the UI decl system.
+#define HUD_STAMINA      /decl/hud_element/stamina
+#define HUD_DROP         /decl/hud_element/drop
+#define HUD_RESIST       /decl/hud_element/resist
+#define HUD_THROW        /decl/hud_element/throw_toggle
+#define HUD_MANEUVER     /decl/hud_element/maneuver
+#define HUD_ZONE_SELECT  /decl/hud_element/zone_selector
+#define HUD_MOVEMENT     /decl/hud_element/movement
+#define HUD_INVENTORY    /decl/hud_element/inventory
+#define HUD_ATTACK       /decl/hud_element/attack
+#define HUD_HANDS        /decl/hud_element/hands
+#define HUD_INTERNALS    /decl/hud_element/internals
+#define HUD_HEALTH       /decl/hud_element/health
+#define HUD_INTENT       /decl/hud_element/intent
+#define HUD_CRIT_MARKER  /decl/hud_element/crit
+#define HUD_NUTRITION    /decl/hud_element/nutrition
+#define HUD_HYDRATION    /decl/hud_element/hydration
+#define HUD_FIRE_INTENT  /decl/hud_element/gun_mode
+#define HUD_UP_HINT      /decl/hud_element/upward
+#define HUD_BODYTEMP     /decl/hud_element/bodytemp
+#define HUD_PRESSURE     /decl/hud_element/pressure
+#define HUD_TOX          /decl/hud_element/toxins
+#define HUD_OXY          /decl/hud_element/oxygen
+#define HUD_FIRE         /decl/hud_element/fire
+#define HUD_CHARGE       /decl/hud_element/charge
+#define HUD_ROBOT_MODULE /decl/hud_element/module_selection
 
 #define GET_HUD_ALERT(M, A)        ((istype(M?.hud_used, /datum/hud) && (A in M.hud_used.alerts)) ? M.hud_used.alerts[A] : 0)
-
 #define CLEAR_HUD_ALERTS(M)        if(istype(M?.hud_used, /datum/hud) && M.hud_used.alerts)                    { M.hud_used.alerts = null; }
 #define SET_HUD_ALERT(M, A, V)     if(istype(M?.hud_used, /datum/hud))                                         { LAZYSET(M.hud_used.alerts, A, V); }
 #define SET_HUD_ALERT_MIN(M, A, V) if(istype(M?.hud_used, /datum/hud) && V < LAZYACCESS(M.hud_used.alerts, A)) { LAZYSET(M.hud_used.alerts, A, V); }

code/__defines/machinery.dm

@@ -155,7 +155,7 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 #define  PART_CARD  	/obj/item/stock_parts/computer/card_slot					// ID Card slot component of this computer. Mostly for HoP modification console that needs ID slot for modification.
 #define  PART_PRINTER  	/obj/item/stock_parts/computer/nano_printer			// Nano Printer component of this computer, for your everyday paperwork needs.
 #define  PART_DRIVE  	/obj/item/stock_parts/computer/hard_drive/portable		// Portable data storage
-#define  PART_AI  		/obj/item/stock_parts/computer/ai_slot							// AI slot, an intellicard housing that allows modifications of AIs.
+#define  PART_AI  		/obj/item/stock_parts/computer/ai_slot							// AI slot, an intelliCard housing that allows modifications of AIs.
 #define  PART_TESLA  	/obj/item/stock_parts/computer/tesla_link					// Tesla Link, Allows remote charging from nearest APC.
 #define  PART_SCANNER  	/obj/item/stock_parts/computer/scanner							// One of several optional scanner attachments.
 #define  PART_D_SLOT	/obj/item/stock_parts/computer/drive_slot				// Portable drive slot.

code/__defines/misc.dm

@@ -142,6 +142,11 @@
 #define CONFIG_SERVER_JOIN_WHITELIST    3
 #define CONFIG_SERVER_CONNECT_WHITELIST 4
 
+// Coating name color config enums
+#define CONFIG_COATING_COLOR_NONE       1
+#define CONFIG_COATING_COLOR_MIXTURE    2
+#define CONFIG_COATING_COLOR_COMPONENTS 3
+
 // Location for server whitelist file to load from.
 #define CONFIG_SERVER_WHITELIST_FILE "config/server_whitelist.txt"
 
@@ -252,6 +257,7 @@
 
 //Inserts 'a' or 'an' before X in ways \a doesn't allow
 #define ADD_ARTICLE(X) "[(lowertext(X[1]) in global.vowels) ? "an" : "a"] [X]"
+#define ADD_ARTICLE_GENDER(X, GENDER) (GENDER == PLURAL ? "some [X]" : ADD_ARTICLE(X))
 
 //Request Console Department Types
 #define RC_ASSIST 1		//Request Assistance
@@ -376,5 +382,11 @@
 #define CRAYON_DRAW_LETTER   "letter"
 #define CRAYON_DRAW_ARROW    "arrow"
 
+// Enum for results of is_space_movement_permitted()
+#define SPACE_MOVE_SUPPORTED (-1)
+#define SPACE_MOVE_FORBIDDEN   0
+#define SPACE_MOVE_PERMITTED   1
+
 // Default UI style applied to client prefs.
 #define DEFAULT_UI_STYLE /decl/ui_style/midnight
+

code/__defines/mobs.dm

@@ -272,8 +272,6 @@
 
 #define SPECIES_HUMAN            "Human"
 #define SPECIES_MONKEY           "Monkey"
-#define SPECIES_ALIEN            "Humanoid"
-#define SPECIES_GOLEM            "Golem"
 
 #define SURGERY_CLOSED 0
 #define SURGERY_OPEN 1

code/__defines/subsystems.dm

@@ -43,14 +43,14 @@
 #define SS_INIT_OVERLAY          1
 #define SS_INIT_DEFAULT          0
 #define SS_INIT_AIR             -1
-#define SS_INIT_VIS_CONTENTS    -2
-#define SS_INIT_MISC_LATE       -3
-#define SS_INIT_MISC_CODEX      -4
-#define SS_INIT_ALARM           -5
-#define SS_INIT_SHUTTLE         -6
-#define SS_INIT_GOALS           -7
-#define SS_INIT_LIGHTING        -8
-#define SS_INIT_WEATHER         -9
+#define SS_INIT_MISC_LATE       -2
+#define SS_INIT_MISC_CODEX      -3
+#define SS_INIT_ALARM           -4
+#define SS_INIT_SHUTTLE         -5
+#define SS_INIT_GOALS           -6
+#define SS_INIT_LIGHTING        -7
+#define SS_INIT_WEATHER         -8
+#define SS_INIT_VIS_CONTENTS    -9
 #define SS_INIT_ZCOPY           -10
 #define SS_INIT_HOLOMAP         -11
 #define SS_INIT_XENOARCH        -12

code/_helpers/animations.dm

@@ -69,11 +69,20 @@
 		animate(time = 1)
 		animate(alpha = 0, time = 3, easing = CIRCULAR_EASING|EASE_OUT)
 
+// Shake animation stolen from Polaris.
+/atom
+	/// How much to shake the atom when struck.
+	/// Larger objs should have smaller numbers or it looks weird.
+	var/shake_animation_degrees = 4
+
 /atom/proc/shake_animation(var/intensity = 8)
 	var/init_px = pixel_x
 	var/shake_dir = pick(-1, 1)
-	animate(src, transform=turn(matrix(), intensity*shake_dir), pixel_x=init_px + 2*shake_dir, time=1)
-	animate(transform=null, pixel_x=init_px, time=6, easing=ELASTIC_EASING)
+	var/matrix/M = matrix()
+	M.Scale(icon_scale_x, icon_scale_y)
+	M.Translate(0, 16*(icon_scale_y-1))
+	animate(src, transform=turn(M, shake_animation_degrees * shake_dir), pixel_x=init_px + 2*shake_dir, time=1)
+	animate(transform=M, pixel_x=init_px, time=6, easing=ELASTIC_EASING)
 
 /atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
 	if(!segments)