MANUAL Merge branch 'master' of github.com:Project-Wildflower/Wildflo…

…wer into tgs

# Conflicts:
#	baystation12.dme

.github/workflows/changelog_generation.yml

@@ -31,5 +31,6 @@ jobs:
         run: |
           git config --global user.email "${{ secrets.BOT_EMAIL }}"
           git config --global user.name "${{ secrets.BOT_NAME }}"
+          git diff --quiet --exit-code && echo "No changes found, abort." && exit 0
           git commit -m "Automatic changelog generation" -a
           git push

.github/workflows/test.yml

@@ -10,15 +10,15 @@ on:
 env:
   BYOND_MAJOR: "512"
   BYOND_MINOR: "1485"
-  SPACEMAN_DMM_VERSION: suite-1.5
+  SPACEMAN_DMM_VERSION: suite-1.7
 
 jobs:
   DreamChecker:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache
-        uses: actions/cache@1a9e2138d905efd099035b49d8b7a3888c653ca8
+        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
         with:
           path: $HOME/spaceman_dmm/$SPACEMAN_DMM_VERSION
           key: ${{ runner.os }}-spacemandmm-${{ env.SPACEMAN_DMM_VERSION }}
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache
-        uses: actions/cache@1a9e2138d905efd099035b49d8b7a3888c653ca8
+        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
         with:
           path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
@@ -71,7 +71,7 @@ jobs:
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
       - name: Setup Cache
-        uses: actions/cache@1a9e2138d905efd099035b49d8b7a3888c653ca8
+        uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
         with:
           path: $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}

.gitignore

@@ -8,6 +8,7 @@ Thumbs.db
 *.backup
 *.before
 data/
+dmdoc/
 cfg/
 build_log.txt
 use_map
@@ -20,8 +21,10 @@ atupdate
 config/*
 sql/test_db
 
-# vscode
+# VisualStudioCode
 .vscode/*
+!.vscode/settings.json
+*.code-workspace
 .history
 
 # swap
@@ -39,7 +42,6 @@ Session.vim
 
 # auto-generated tag files
 tags
-baystation12.code-workspace
 
 # ignore built libs
 lib/*.dll

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+	"editor.detectIndentation": false,
+	"editor.insertSpaces": false,
+	"editor.tabSize": 4,
+	"files.eol": "\r\n",
+	"files.insertFinalNewline": true,
+	"files.trimFinalNewlines": true,
+	"files.trimTrailingWhitespace": true,
+	"gitblame.commitUrl": "https://github.com/baystation12/baystation12/commit/${hash}"
+}

SpacemanDMM.toml

@@ -1,2 +1,5 @@
 [langserver]
 dreamchecker = true
+
+[debugger]
+engine = "auxtools"

baystation12.dme

@@ -102,6 +102,7 @@
 #include "code\_helpers\atmospherics.dm"
 #include "code\_helpers\atom_movables.dm"
 #include "code\_helpers\builtin_proc_callers.dm"
+#include "code\_helpers\client.dm"
 #include "code\_helpers\cmp.dm"
 #include "code\_helpers\functional.dm"
 #include "code\_helpers\game.dm"
@@ -117,6 +118,7 @@
 #include "code\_helpers\names.dm"
 #include "code\_helpers\sanitize_values.dm"
 #include "code\_helpers\spawn_sync.dm"
+#include "code\_helpers\species.dm"
 #include "code\_helpers\storage.dm"
 #include "code\_helpers\text.dm"
 #include "code\_helpers\time.dm"
@@ -176,6 +178,8 @@
 #include "code\controllers\evacuation\evacuation_predicate.dm"
 #include "code\controllers\evacuation\evacuation_shuttle.dm"
 #include "code\controllers\evacuation\~evac.dm"
+#include "code\controllers\subsystems\ai.dm"
+#include "code\controllers\subsystems\aifast.dm"
 #include "code\controllers\subsystems\air.dm"
 #include "code\controllers\subsystems\alarm.dm"
 #include "code\controllers\subsystems\antags.dm"
@@ -248,6 +252,7 @@
 #include "code\datums\hierarchy.dm"
 #include "code\datums\local_network.dm"
 #include "code\datums\mil_ranks.dm"
+#include "code\datums\mutable_appearance.dm"
 #include "code\datums\progressbar.dm"
 #include "code\datums\recipe.dm"
 #include "code\datums\ruins.dm"
@@ -444,6 +449,7 @@
 #include "code\datums\underwear\undershirt.dm"
 #include "code\datums\underwear\underwear.dm"
 #include "code\datums\uplink\ammunition.dm"
+#include "code\datums\uplink\augments.dm"
 #include "code\datums\uplink\badassery.dm"
 #include "code\datums\uplink\devices and tools.dm"
 #include "code\datums\uplink\grenades.dm"
@@ -849,6 +855,7 @@
 #include "code\game\objects\items\contraband.dm"
 #include "code\game\objects\items\crayons.dm"
 #include "code\game\objects\items\cryobag.dm"
+#include "code\game\objects\items\dehydrated_carp.dm"
 #include "code\game\objects\items\documents.dm"
 #include "code\game\objects\items\glassjar.dm"
 #include "code\game\objects\items\holosign_creator.dm"
@@ -1230,6 +1237,7 @@
 #include "code\modules\admin\buildmode\_click_handler.dm"
 #include "code\modules\admin\buildmode\_color_pool.dm"
 #include "code\modules\admin\buildmode\_overlay.dm"
+#include "code\modules\admin\buildmode\ai.dm"
 #include "code\modules\admin\buildmode\areas.dm"
 #include "code\modules\admin\buildmode\atmosphere.dm"
 #include "code\modules\admin\buildmode\build.dm"
@@ -1310,6 +1318,22 @@
 #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"
+#include "code\modules\ai\ai_holder_communication.dm"
+#include "code\modules\ai\ai_holder_cooperation.dm"
+#include "code\modules\ai\ai_holder_debug.dm"
+#include "code\modules\ai\ai_holder_disabled.dm"
+#include "code\modules\ai\ai_holder_fleeing.dm"
+#include "code\modules\ai\ai_holder_follow.dm"
+#include "code\modules\ai\ai_holder_movement.dm"
+#include "code\modules\ai\ai_holder_pathfinding.dm"
+#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\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"
@@ -1377,15 +1401,26 @@
 #include "code\modules\atmospherics\components\unary\vent_scrubber.dm"
 #include "code\modules\augment\active.dm"
 #include "code\modules\augment\augment.dm"
+#include "code\modules\augment\cbm.dm"
+#include "code\modules\augment\equip.dm"
 #include "code\modules\augment\simple.dm"
+#include "code\modules\augment\active\adaptive_binoculars.dm"
 #include "code\modules\augment\active\armblades.dm"
 #include "code\modules\augment\active\circuit.dm"
+#include "code\modules\augment\active\corrective_lenses.dm"
+#include "code\modules\augment\active\glare_dampeners.dm"
 #include "code\modules\augment\active\hudimplants.dm"
+#include "code\modules\augment\active\iatric_monitor.dm"
+#include "code\modules\augment\active\internal_air_system.dm"
+#include "code\modules\augment\active\leukocyte_breeder.dm"
+#include "code\modules\augment\active\nerve_dampeners.dm"
 #include "code\modules\augment\active\polytool.dm"
+#include "code\modules\augment\active\popout_shotgun.dm"
 #include "code\modules\augment\active\tool\engineering.dm"
 #include "code\modules\augment\active\tool\surgical.dm"
 #include "code\modules\augment\passive\armor.dm"
 #include "code\modules\augment\passive\boost.dm"
+#include "code\modules\augment\passive\fluff.dm"
 #include "code\modules\augment\passive\nanoaura.dm"
 #include "code\modules\augment\passive\boost\muscle.dm"
 #include "code\modules\augment\passive\boost\reflex.dm"
@@ -1437,6 +1472,7 @@
 #include "code\modules\client\preference_setup\loadout\gear_tweaks.dm"
 #include "code\modules\client\preference_setup\loadout\loadout.dm"
 #include "code\modules\client\preference_setup\loadout\lists\accessories.dm"
+#include "code\modules\client\preference_setup\loadout\lists\augments.dm"
 #include "code\modules\client\preference_setup\loadout\lists\clothing.dm"
 #include "code\modules\client\preference_setup\loadout\lists\earwear.dm"
 #include "code\modules\client\preference_setup\loadout\lists\eyegear.dm"
@@ -1552,6 +1588,7 @@
 #include "code\modules\clothing\under\accessories\stethoscope.dm"
 #include "code\modules\clothing\under\accessories\storage.dm"
 #include "code\modules\clothing\under\accessories\ties.dm"
+#include "code\modules\clothing\under\accessories\wristwatches.dm"
 #include "code\modules\clothing\under\jobs\civilian.dm"
 #include "code\modules\clothing\under\jobs\engineering.dm"
 #include "code\modules\clothing\under\jobs\medsci.dm"
@@ -1573,6 +1610,7 @@
 #include "code\modules\codex\entries\_codex_entry.dm"
 #include "code\modules\codex\entries\ascent.dm"
 #include "code\modules\codex\entries\atmospherics.dm"
+#include "code\modules\codex\entries\augments.dm"
 #include "code\modules\codex\entries\clothing.dm"
 #include "code\modules\codex\entries\codex.dm"
 #include "code\modules\codex\entries\engineering.dm"
@@ -1694,7 +1732,6 @@
 #include "code\modules\events\event.dm"
 #include "code\modules\events\event_container.dm"
 #include "code\modules\events\event_dynamic.dm"
-#include "code\modules\events\exo_awaken.dm"
 #include "code\modules\events\gravity.dm"
 #include "code\modules\events\grid_check.dm"
 #include "code\modules\events\infestation.dm"
@@ -1717,6 +1754,8 @@
 #include "code\modules\events\toilets.dm"
 #include "code\modules\events\wallrot.dm"
 #include "code\modules\events\whale_migration.dm"
+#include "code\modules\events\exo_awakening\_datums.dm"
+#include "code\modules\events\exo_awakening\exo_awaken.dm"
 #include "code\modules\ext_scripts\irc.dm"
 #include "code\modules\fabrication\__fabricator_defines.dm"
 #include "code\modules\fabrication\_fabricator.dm"
@@ -2173,6 +2212,9 @@
 #include "code\modules\mob\living\silicon\robot\modules\module_security.dm"
 #include "code\modules\mob\living\silicon\robot\modules\module_standard.dm"
 #include "code\modules\mob\living\silicon\robot\modules\module_uncertified.dm"
+#include "code\modules\mob\living\simple_animal\combat.dm"
+#include "code\modules\mob\living\simple_animal\defense.dm"
+#include "code\modules\mob\living\simple_animal\life.dm"
 #include "code\modules\mob\living\simple_animal\natural_weapons.dm"
 #include "code\modules\mob\living\simple_animal\shade.dm"
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"
@@ -2192,6 +2234,7 @@
 #include "code\modules\mob\living\simple_animal\constructs\soulstone.dm"
 #include "code\modules\mob\living\simple_animal\crow\crow.dm"
 #include "code\modules\mob\living\simple_animal\familiars\familiars.dm"
+#include "code\modules\mob\living\simple_animal\friendly\_friendly.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
 #include "code\modules\mob\living\simple_animal\friendly\crab.dm"
@@ -2212,7 +2255,6 @@
 #include "code\modules\mob\living\simple_animal\hostile\drake.dm"
 #include "code\modules\mob\living\simple_animal\hostile\faithful_hound.dm"
 #include "code\modules\mob\living\simple_animal\hostile\faithless.dm"
-#include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hivebot.dm"
 #include "code\modules\mob\living\simple_animal\hostile\hostile.dm"
 #include "code\modules\mob\living\simple_animal\hostile\leech.dm"
@@ -2226,9 +2268,11 @@
 #include "code\modules\mob\living\simple_animal\hostile\vagrant.dm"
 #include "code\modules\mob\living\simple_animal\hostile\voxslug.dm"
 #include "code\modules\mob\living\simple_animal\hostile\commanded\_command_defines.dm"
-#include "code\modules\mob\living\simple_animal\hostile\commanded\bear_companion.dm"
-#include "code\modules\mob\living\simple_animal\hostile\commanded\commanded.dm"
-#include "code\modules\mob\living\simple_animal\hostile\commanded\nanomachines.dm"
+#include "code\modules\mob\living\simple_animal\hostile\giant_spider\_giant_spider.dm"
+#include "code\modules\mob\living\simple_animal\hostile\giant_spider\guard.dm"
+#include "code\modules\mob\living\simple_animal\hostile\giant_spider\hunter.dm"
+#include "code\modules\mob\living\simple_animal\hostile\giant_spider\nurse.dm"
+#include "code\modules\mob\living\simple_animal\hostile\giant_spider\spitter.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\drone.dm"
 #include "code\modules\mob\living\simple_animal\hostile\retaliate\exoplanet.dm"
@@ -2995,6 +3039,7 @@
 #include "code\modules\tables\rack.dm"
 #include "code\modules\tables\tables.dm"
 #include "code\modules\tables\update_triggers.dm"
+#include "code\modules\tension\tension.dm"
 #include "code\modules\tgs\includes.dm"
 #include "code\modules\turbolift\_turbolift.dm"
 #include "code\modules\turbolift\turbolift.dm"

code/__defines/_planes+layers.dm

@@ -192,8 +192,15 @@ What is the naming convention for planes or layers?
 //This is difference between planes used for atoms and effects
 #define PLANE_DIFFERENCE              3
 
-/atom
-	plane = DEFAULT_PLANE
+
+/atom/plane = DEFAULT_PLANE
+
+#define DEFAULT_APPEARANCE_FLAGS (PIXEL_SCALE)
+
+/atom/appearance_flags = DEFAULT_APPEARANCE_FLAGS
+/image/appearance_flags = DEFAULT_APPEARANCE_FLAGS
+/mutable_appearance/appearance_flags = DEFAULT_APPEARANCE_FLAGS //Inherits /image but re docs, subject to change
+
 
 /image/proc/plating_decal_layerise()
 	plane = DEFAULT_PLANE
@@ -216,7 +223,7 @@ What is the naming convention for planes or layers?
 */
 
 /obj/screen/plane_master
-	appearance_flags = PLANE_MASTER
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | PLANE_MASTER
 	screen_loc = "CENTER,CENTER"
 	globalscreen = 1
 
@@ -226,7 +233,7 @@ What is the naming convention for planes or layers?
 /obj/screen/plane_master/ghost_dummy
 	// this avoids a bug which means plane masters which have nothing to control get angry and mess with the other plane masters out of spite
 	alpha = 0
-	appearance_flags = 0
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	plane = OBSERVER_PLANE
 
 GLOBAL_LIST_INIT(ghost_master, list(

code/__defines/damage_organs.dm

@@ -83,8 +83,8 @@
 // that dealing just enough burn damage to kill the player will cause the given
 // proportion of their max blood volume to be lost
 // (e.g. 0.6 == 60% lost if 200 burn damage is taken).
-#define FLUIDLOSS_WIDE_BURN 0.6 //for burns from heat applied over a wider area, like from fire
-#define FLUIDLOSS_CONC_BURN 0.4 //for concentrated burns, like from lasers
+#define FLUIDLOSS_WIDE_BURN 0.15 //for burns from heat applied over a wider area, like from fire
+#define FLUIDLOSS_CONC_BURN 0.1 //for concentrated burns, like from lasers
 
 // Damage above this value must be repaired with surgery.
 #define ROBOLIMB_SELF_REPAIR_CAP 30
@@ -103,4 +103,3 @@
 #define BLOOD_VOLUME_OKAY    70
 #define BLOOD_VOLUME_BAD     60
 #define BLOOD_VOLUME_SURVIVE 30
-

code/__defines/lists.dm

@@ -57,3 +57,43 @@
 		__BIN_MID = __BIN_ITEM.##COMPARE > IN.##COMPARE ? __BIN_MID : __BIN_MID + 1;\
 		LIST.Insert(__BIN_MID, IN);\
 	}
+
+/// Passed into BINARY_INSERT to compare keys
+#define COMPARE_KEY __BIN_LIST[__BIN_MID]
+/// Passed into BINARY_INSERT to compare values
+#define COMPARE_VALUE __BIN_LIST[__BIN_LIST[__BIN_MID]]
+
+/****
+	* Binary search sorted insert from TG
+	* INPUT: Object to be inserted
+	* LIST: List to insert object into
+	* TYPECONT: The typepath of the contents of the list
+	* COMPARE: The object to compare against, usualy the same as INPUT
+	* COMPARISON: The variable on the objects to compare
+	* COMPTYPE: How should the values be compared? Either COMPARE_KEY or COMPARE_VALUE.
+	*/
+#define BINARY_INSERT_TG(INPUT, LIST, TYPECONT, COMPARE, COMPARISON, COMPTYPE) \
+	do {\
+		var/list/__BIN_LIST = LIST;\
+		var/__BIN_CTTL = length(__BIN_LIST);\
+		if(!__BIN_CTTL) {\
+			__BIN_LIST += INPUT;\
+		} else {\
+			var/__BIN_LEFT = 1;\
+			var/__BIN_RIGHT = __BIN_CTTL;\
+			var/__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\
+			var ##TYPECONT/__BIN_ITEM;\
+			while(__BIN_LEFT < __BIN_RIGHT) {\
+				__BIN_ITEM = COMPTYPE;\
+				if(__BIN_ITEM.##COMPARISON <= COMPARE.##COMPARISON) {\
+					__BIN_LEFT = __BIN_MID + 1;\
+				} else {\
+					__BIN_RIGHT = __BIN_MID;\
+				};\
+				__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\
+			};\
+			__BIN_ITEM = COMPTYPE;\
+			__BIN_MID = __BIN_ITEM.##COMPARISON > COMPARE.##COMPARISON ? __BIN_MID : __BIN_MID + 1;\
+			__BIN_LIST.Insert(__BIN_MID, INPUT);\
+		};\
+	} while(FALSE)

code/__defines/misc.dm

@@ -5,6 +5,7 @@
 
 #define TRANSITIONEDGE 7 // Distance from edge to move to another z-level.
 #define RUIN_MAP_EDGE_PAD 15
+#define LANDING_ZONE_RADIUS 15 // Used for autoplacing landmarks on exoplanets
 
 // Invisibility constants.
 #define INVISIBILITY_LIGHTING    20