Merge remote-tracking branch 'upstream/master'

Author: SyncIt21

.github/workflows/auto_changelog.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Generate App Token
         id: app-token-generation
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
         with:
           app-id: ${{ secrets.APP_ID }}

.github/workflows/compile_changelogs.yml

@@ -56,7 +56,7 @@ jobs:
 
       - name: Generate App Token
         id: app-token-generation
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
         with:
           app-id: ${{ secrets.APP_ID }}

.github/workflows/generate_client_storage.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Generate App Token
         id: app-token-generation
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
         with:
           app-id: ${{ secrets.APP_ID }}

.github/workflows/stale.yml

@@ -37,10 +37,10 @@ jobs:
           operations-per-run: 300
       - name: Filter staled pull requests for announcement
         id: filter-prs
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
-            return JSON.parse(context.job.steps.stale.outputs.staled-issues-prs).filter(issue => !!issue.pull_request)
+            return JSON.parse('${{steps.stale.outputs.staled-issues-prs}}').filter(issue => !!issue.pull_request)
 
   announce:
     runs-on: ubuntu-24.04

.github/workflows/update_tgs_dmapi.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Generate App Token
         id: app-token-generation
-        uses: actions/create-github-app-token@v2
+        uses: actions/create-github-app-token@v3
         if: env.APP_PRIVATE_KEY != '' && env.APP_ID != ''
         with:
           app-id: ${{ secrets.APP_ID }}

code/__DEFINES/dcs/signals/signals_medical.dm

@@ -26,3 +26,6 @@
 #define COMSIG_LIVING_OPERATING_ON "living_operating_on"
 /// Sent from /mob/living/perform_surgery: (mob/living/surgeon, list/possible_operations)
 #define COMSIG_ATOM_BEING_OPERATED_ON "atom_being_operated_on"
+
+/// From /obj/item/ph_meter/interact_with_atom(): (atom/source, mob/user)
+#define COMSIG_ON_REAGENT_SCAN "on_reagent_scan"

code/__DEFINES/dcs/signals/signals_spell.dm

@@ -14,6 +14,10 @@
 	/// Return from before cast signals to prevent the spell from going on cooldown before aftercast.
 	#define SPELL_NO_IMMEDIATE_COOLDOWN (1 << 2)
 
+/// Sent from /datum/action/cooldown/spell/can_cast_check() to the spell: (feedback)
+#define COMSIG_SPELL_CAN_CAST_CHECK "can_cast_spell"
+	// Return SPELL_CANCEL_CAST to prevent the spell from being cast
+
 /// Sent to an mob when a [/datum/action/cooldown/spell] calls try_invoke() to the caster: (datum/action/cooldown/spell/spell, feedback)
 #define COMSIG_MOB_TRY_INVOKE_SPELL "try_invoke_spell"
 	/// The spell gets canceled

code/__DEFINES/monkeys.dm

@@ -35,5 +35,10 @@
 /// probability of reducing aggro by one when the monkey attacks
 #define MONKEY_HATRED_REDUCTION_PROB 20
 
+/// Monkey was calmed, such as from weed
+#define MONKEY_CALMED_HATRED_AMOUNT -2
+/// Monkey was angered, such as from alcohol
+#define MONKEY_ANGERED_HATRED_AMOUNT 2
+
 ///Monkey recruit cooldown
 #define MONKEY_RECRUIT_COOLDOWN (1 MINUTES)

code/__DEFINES/traits/declarations.dm

@@ -1462,6 +1462,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_BEAST_EMPATHY "beast_empathy" // you're good with animals, such as with taming them
 #define TRAIT_STURDY_FRAME "sturdy_frame" // you suffer much lesser effects from equipment that slows you down
 
+/// Has this mob been tamed?
+#define TRAIT_TAMED "tamed"
+
 /// This item cannot be selected for or used by a theft objective (Spies, Traitors, etc.)
 #define TRAIT_ITEM_OBJECTIVE_BLOCKED "item_objective_blocked"
 /// This trait lets you attach limbs to any player without surgery.

code/_globalvars/traits/_traits.dm

@@ -587,6 +587,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_TACKLING_WINGED_ATTACKER" = TRAIT_TACKLING_WINGED_ATTACKER,
 		"TRAIT_TACTICALLY_CAMOUFLAGED" = TRAIT_TACTICALLY_CAMOUFLAGED,
 		"TRAIT_TAGGER" = TRAIT_TAGGER,
+		"TRAIT_TAMED" = TRAIT_TAMED,
 		"TRAIT_TEMPORARY_BODY" = TRAIT_TEMPORARY_BODY,
 		"TRAIT_TENACIOUS" = TRAIT_TENACIOUS,
 		"TRAIT_TENTACLE_IMMUNE" = TRAIT_TENTACLE_IMMUNE,