Merge

.git-blame-ignore-revs

@@ -26,3 +26,9 @@
 bf996203dfc4b09f8dc4dd73b532f9ee49691776
 bfa20cdc17d1794969331c4272c4a8d7ad523a44
 bca4aa1184eca550a6d9543a93d720ba6dc10b20
+
+# obj/effect/ -> obj/
+8cd28ed954d5873c1b20f35ce58aa5820803ec4c
+
+# datum/effect/effect/system & datum/effect/system -> datum/effect
+96f09a4736ccdc33d9651aa9f162d27e3263b127

.github/workflows/cancel.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 3
     steps:
-      - uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5
+      - uses: styfle/cancel-workflow-action@01ce38bf961b4e243a6342cbade0dbc8ba3f0432
         with:
           workflow_id: 3545321
           access_token: ${{ github.token }}

.github/workflows/changelog_generation.yml

@@ -16,13 +16,13 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           fetch-depth: 0 # Otherwise, we will fail to push refs
           ref: dev-sierra
           token: ${{ secrets.BOT_TOKEN }}
       - name: Python setup
-        uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/check_changelog.yml

@@ -19,7 +19,7 @@ jobs:
           wget https://raw.githubusercontent.com/SierraBay/SierraBay12/dev-sierra/tools/changelog/sierra_check_changelog.py
           wget https://raw.githubusercontent.com/SierraBay/SierraBay12/dev-sierra/tools/changelog/tags.yml
       - name: Установка Python
-        uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
         with:
           python-version: '3.x'
       - name: Установка зависимостей

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/generate_documentation.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: paths-filter
         uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
         id: filter
@@ -37,7 +37,7 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:

.github/workflows/make_changelogs.yml

@@ -16,11 +16,11 @@ jobs:
     if: github.repository == 'SierraBay/SierraBay12' # to prevent this running on forks
     steps:
       - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           fetch-depth: 25
       - name: Python setup
-        uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236
         with:
           python-version: '3.x'
       - name: Install depends

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: paths-filter
         uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
         id: filter
@@ -30,7 +30,7 @@ jobs:
     needs: PreFlight
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
@@ -58,7 +58,7 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
@@ -88,7 +88,7 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
@@ -117,7 +117,7 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
@@ -146,7 +146,7 @@ jobs:
     - DreamChecker
     if: needs.PreFlight.outputs.dm == 'true'
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Setup Cache
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:

.github/workflows/testmerge-blocker.yml

@@ -0,0 +1,17 @@
+name: "Test Merge Blocker"
+
+on:
+  pull_request:
+    types: [synchronize, opened, labeled, unlabeled]
+
+jobs:
+  testmerge-blocker:
+    name: Enforce Test Merge Label
+    runs-on: ubuntu-latest
+    steps:
+      - name: Enforce Test Merge Label
+        if: contains(github.event.pull_request.labels.*.name, 'Test Merge') && !contains(github.event.pull_request.labels.*.name, 'Test Merge Passed')
+        run: |
+          echo "Pull request is labeled for Test Merge and has not been flagged as Test Merge Passed."
+          echo "The test merge must pass, or the label removed, before this PR can be merged."
+          exit 1

.vscode/settings.json

@@ -1,5 +1,5 @@
 {
-  "editor.renderWhitespace": "all",
+  "editor.renderWhitespace": "boundary",
 
   "files.eol": "\n",
   "files.encoding": "utf8",

baystation12.dme

@@ -26,6 +26,7 @@
 #include "code\__defines\_excom.dm"
 #include "code\__defines\_renderer.dm"
 #include "code\__defines\admin.dm"
+#include "code\__defines\ai.dm"
 #include "code\__defines\antagonists.dm"
 #include "code\__defines\ao.dm"
 #include "code\__defines\ao_misc.dm"
@@ -1038,7 +1039,7 @@
 #include "code\game\objects\items\weapons\extinguisher.dm"
 #include "code\game\objects\items\weapons\flame.dm"
 #include "code\game\objects\items\weapons\flamethrower.dm"
-#include "code\game\objects\items\weapons\gift_wrappaper.dm"
+#include "code\game\objects\items\weapons\gifts.dm"
 #include "code\game\objects\items\weapons\handcuffs.dm"
 #include "code\game\objects\items\weapons\janitor_sign.dm"
 #include "code\game\objects\items\weapons\lighter.dm"
@@ -1067,6 +1068,7 @@
 #include "code\game\objects\items\weapons\trays.dm"
 #include "code\game\objects\items\weapons\weaponry.dm"
 #include "code\game\objects\items\weapons\weldbackpack.dm"
+#include "code\game\objects\items\weapons\wrapping_paper.dm"
 #include "code\game\objects\items\weapons\candle\candle.dm"
 #include "code\game\objects\items\weapons\candle\incense.dm"
 #include "code\game\objects\items\weapons\candle\scent_decls.dm"
@@ -1423,7 +1425,6 @@
 #include "code\modules\admin\view_variables\view_variables.dm"
 #include "code\modules\admin\view_variables\view_variables_global.dm"
 #include "code\modules\admin\view_variables\vv_set_handlers.dm"
-#include "code\modules\ai\_defines.dm"
 #include "code\modules\ai\ai_holder.dm"
 #include "code\modules\ai\ai_holder_combat.dm"
 #include "code\modules\ai\ai_holder_combat_unseen.dm"
@@ -1438,7 +1439,9 @@
 #include "code\modules\ai\ai_holder_targeting.dm"
 #include "code\modules\ai\interfaces.dm"
 #include "code\modules\ai\say_list.dm"
-#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
+#include "code\modules\ai\ai_holder_subtypes\alien_ai.dm"
+#include "code\modules\ai\ai_holder_subtypes\human_ai.dm"
+#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"
@@ -2090,6 +2093,7 @@
 #include "code\modules\mob\say.dm"
 #include "code\modules\mob\transform_procs.dm"
 #include "code\modules\mob\update_icons.dm"
+#include "code\modules\mob\vv_handlers.dm"
 #include "code\modules\mob\grab\grab_datum.dm"
 #include "code\modules\mob\grab\grab_object.dm"
 #include "code\modules\mob\grab\grab_readme.dm"
@@ -3212,6 +3216,7 @@
 #include "code\modules\xenoarcheaology\effects\goodfeeling.dm"
 #include "code\modules\xenoarcheaology\effects\heal.dm"
 #include "code\modules\xenoarcheaology\effects\heat.dm"
+#include "code\modules\xenoarcheaology\effects\human_ifier.dm"
 #include "code\modules\xenoarcheaology\effects\hurt.dm"
 #include "code\modules\xenoarcheaology\effects\pushback.dm"
 #include "code\modules\xenoarcheaology\effects\radiate.dm"

code/__defines/__renderer.dm

@@ -195,6 +195,8 @@
 
 #define DEFAULT_APPEARANCE_FLAGS (PIXEL_SCALE)
 
+#define DEFAULT_RENDERER_APPEARANCE_FLAGS (PLANE_MASTER | NO_CLIENT_COLOR)
+
 /atom/appearance_flags = DEFAULT_APPEARANCE_FLAGS
 /atom/movable/appearance_flags = DEFAULT_APPEARANCE_FLAGS | TILE_BOUND // Most AMs are not visibly bigger than a tile.
 /image/appearance_flags = DEFAULT_APPEARANCE_FLAGS

code/__defines/_renderer.dm

@@ -10,7 +10,7 @@
 /// The base /renderer definition and defaults.
 /atom/movable/renderer
 	abstract_type = /atom/movable/renderer
-	appearance_flags = PLANE_MASTER
+	appearance_flags = DEFAULT_RENDERER_APPEARANCE_FLAGS
 	screen_loc = "CENTER"
 	plane = LOWEST_PLANE
 	blend_mode = BLEND_OVERLAY
@@ -132,7 +132,6 @@ INITIALIZE_IMMEDIATE(/atom/movable/renderer)
 	name = "Letterbox"
 	group = RENDER_GROUP_SCENE
 	plane = BLACKNESS_PLANE
-	appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
 	blend_mode = BLEND_MULTIPLY
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
@@ -188,7 +187,6 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 	name = "Lighting"
 	group = RENDER_GROUP_SCENE
 	plane = LIGHTING_PLANE
-	appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
 	relay_blend_mode = BLEND_MULTIPLY
 	mouse_opacity = MOUSE_OPACITY_UNCLICKABLE
 
@@ -264,7 +262,7 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 */
 
 
-/// Renders the /obj/effect/effect/warp example effect as well as gravity catapult effects
+/// Renders the /obj/effect/warp example effect as well as gravity catapult effects
 /atom/movable/renderer/warp
 	name = "Warp Effect"
 	group = RENDER_GROUP_NONE
@@ -293,7 +291,7 @@ GLOBAL_LIST_EMPTY(zmimic_renderers)
 
 		if (quality == GLOB.PREF_LOW)
 			QDEL_NULL(gas_heat_object)
-			gas_heat_object = new /obj/effect/heat(null)
+			gas_heat_object = new /obj/heat(null)
 		else
 			QDEL_NULL(gas_heat_object)
 			if (quality == GLOB.PREF_MED)

code/modules/ai/_defines.dm → code/__defines/ai.dm

@@ -20,7 +20,7 @@
 #define MOVEMENT_FAILED			0	// Move() returned false for whatever reason and the mob didn't move.
 #define MOVEMENT_SUCCESSFUL		1	// Move() returned true and the mob hopefully moved.
 
-// Results of pre-attack checks
+// Results of pre-attack checks.
 #define ATTACK_ON_COOLDOWN		-1	// Recently attacked and needs to try again soon.
 #define ATTACK_FAILED			0	// Something else went wrong! Maybe they moved away!
 #define ATTACK_SUCCESSFUL		1	// We attacked (or tried to, misses count too)
@@ -32,3 +32,21 @@
 #define AI_TARGET_ALLY			3 // They are an ally. Find a new target.
 #define AI_TARGET_DEAD			4 // They're dead. Find a new target.
 #define AI_TARGET_INVINCIBLE	5 // Target is currently unable to receive damage for whatever reason. Find a new target or wait.
+
+// Stances to determine AI state.
+#define STANCE_SLEEP        0	// Doing (almost) nothing, to save on CPU because nobody is around to notice or the mob died.
+#define STANCE_IDLE         1	// The more or less default state. Wanders around, looks for baddies, and spouts one-liners.
+#define STANCE_ALERT        2	// A baddie is visible but not too close, and essentially we tell them to go away or die.
+#define STANCE_APPROACH     3	// Attempting to get into range to attack them.
+#define STANCE_FIGHT	    4	// Actually fighting, with melee or ranged.
+#define STANCE_BLINDFIGHT   5	// Fighting something that cannot be seen by the mob, from invisibility or out of sight.
+#define STANCE_REPOSITION   6	// Relocating to a better position while in combat. Also used when moving away from a danger like grenades.
+#define STANCE_MOVE         7	// Similar to above but for out of combat. If a baddie is seen, they'll cancel and fight them.
+#define STANCE_FOLLOW       8	// Following somone, without trying to murder them.
+#define STANCE_FLEE         9	// Run away from the target because they're too spooky/we're dying/some other reason.
+#define STANCE_DISABLED     10	// Used when the holder is afflicted with certain status effects, such as stuns or confusion.
+
+#define STANCE_ATTACK       11  // Backwards compatability
+#define STANCE_ATTACKING    12  // Ditto
+
+#define STANCES_COMBAT      list(STANCE_ALERT, STANCE_APPROACH, STANCE_FIGHT, STANCE_BLINDFIGHT, STANCE_REPOSITION)

code/__defines/flags.dm

@@ -52,7 +52,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define ITEM_FLAG_NOCUFFS                   FLAG(13) // Gloves that have this flag prevent cuffs being applied
 #define ITEM_FLAG_CAN_HIDE_IN_SHOES         FLAG(14) // Items that can be hidden in shoes that permit it
 #define ITEM_FLAG_WASHER_ALLOWED            FLAG(15) // Items that can be washed in washing machines
-#define ITEM_FLAG_TRY_ATTACK                FLAG(16) // Use the item's attack() when set before trying the receiver's resolve_attackby()
 
 // Flags for pass_flags.
 #define PASS_FLAG_TABLE     FLAG(0)

code/__defines/fluids.dm

@@ -10,11 +10,11 @@
 #define ADD_ACTIVE_FLUID_SOURCE(T)    SSfluids.water_sources[T] = TRUE
 #define REMOVE_ACTIVE_FLUID_SOURCE(T) SSfluids.water_sources -= T
 
-// Expects /obj/effect/fluid for F.
+// Expects /obj/fluid for F.
 #define ADD_ACTIVE_FLUID(F)           SSfluids.active_fluids[F] = TRUE
 #define REMOVE_ACTIVE_FLUID(F)        SSfluids.active_fluids -= F
 
-// Expects /obj/effect/fluid for F, int for amt.
+// Expects /obj/fluid for F, int for amt.
 #define LOSE_FLUID(F, amt) \
 	F:fluid_amount = max(-1, F:fluid_amount - amt); \
 	ADD_ACTIVE_FLUID(F)
@@ -44,9 +44,9 @@
 		UPDATE_FLUID_BLOCKED_DIRS(next); \
 		if((next.fluid_blocked_dirs & GLOB.reverse_dir[spread_dir]) || !next.CanFluidPass(spread_dir)) continue; \
 		flooded_a_neighbor = TRUE; \
-		var/obj/effect/fluid/F = locate() in next; \
+		var/obj/fluid/F = locate() in next; \
 		if(!F && !dry_run) {\
-			F = new /obj/effect/fluid(next); \
+			F = new /obj/fluid(next); \
 			var/datum/gas_mixture/GM = T:return_air(); \
 			if(GM) F.temperature = GM.temperature; \
 		} \

code/__defines/gamemode.dm

@@ -37,7 +37,7 @@
 #define MODE_ERT           "ert"
 #define MODE_ACTOR         "actor"
 #define MODE_MERCENARY     "mercenary"
-#define MODE_NINJA         "ninja"
+#define MODE_NINJA         "operatives"
 #define MODE_RAIDER        "raider"
 #define MODE_WIZARD        "wizard"
 #define MODE_CHANGELING    "changeling"

code/__defines/mobs.dm

@@ -36,24 +36,6 @@
 #define BORGXRAY  FLAG(2)
 #define BORGMATERIAL FLAG(3)
 
-
-#define STANCE_SLEEP        0	// Doing (almost) nothing, to save on CPU because nobody is around to notice or the mob died.
-#define STANCE_IDLE         1	// The more or less default state. Wanders around, looks for baddies, and spouts one-liners.
-#define STANCE_ALERT        2	// A baddie is visible but not too close, and essentially we tell them to go away or die.
-#define STANCE_APPROACH     3	// Attempting to get into range to attack them.
-#define STANCE_FIGHT	    4	// Actually fighting, with melee or ranged.
-#define STANCE_BLINDFIGHT   5	// Fighting something that cannot be seen by the mob, from invisibility or out of sight.
-#define STANCE_REPOSITION   6	// Relocating to a better position while in combat. Also used when moving away from a danger like grenades.
-#define STANCE_MOVE         7	// Similar to above but for out of combat. If a baddie is seen, they'll cancel and fight them.
-#define STANCE_FOLLOW       8	// Following somone, without trying to murder them.
-#define STANCE_FLEE         9	// Run away from the target because they're too spooky/we're dying/some other reason.
-#define STANCE_DISABLED     10	// Used when the holder is afflicted with certain status effects, such as stuns or confusion.
-
-#define STANCE_ATTACK       11 // Backwards compatability
-#define STANCE_ATTACKING    12 // Ditto
-
-#define STANCES_COMBAT      list(STANCE_ALERT, STANCE_APPROACH, STANCE_FIGHT, STANCE_BLINDFIGHT, STANCE_REPOSITION)
-
 #define LEFT  FLAG(0)
 #define RIGHT FLAG(1)
 #define UNDER FLAG(2)
@@ -402,7 +384,7 @@
 // Aura type options for `/mob/living/proc/aura_check()`.
 /// Aura checks for projectile impacts. Generally called by `/obj/item/projectile/proc/attack_mob()`. Results in `/obj/aura/proc/aura_check_bullet()`.
 #define AURA_TYPE_BULLET "Bullet"
-/// Aura checks for physical weapon attacks. Generally called by `/obj/item/proc/attack()`. Results in `/obj/aura/proc/aura_check_weapon()`.
+/// Aura checks for physical weapon attacks. Generally called by `/obj/item/proc/use_weapon()`. Results in `/obj/aura/proc/aura_check_weapon()`.
 #define AURA_TYPE_WEAPON "Weapon"
 /// Aura checks for thrown atom impacts. Generally called by `/mob/living/hitby()`. Results in `/obj/aura/proc/aura_check_thrown()`.
 #define AURA_TYPE_THROWN "Thrown"
@@ -506,3 +488,6 @@
 #define PRONOUNS_SHE_THEY	"she/they"
 
 #define PRONOUNS_ALL list(PRONOUNS_THEY_THEM, PRONOUNS_HE_HIM, PRONOUNS_SHE_HER, PRONOUNS_HE_THEY, PRONOUNS_SHE_THEY, PRONOUNS_IT_ITS)
+
+/// Integer (~ticks * SSMobs/wait fire rate). The default maximum value a mob's confused var can be set to.
+#define CONFUSED_MAX 15