Monkestation · PotatoTomahto · Jan 30, 2026 · Jan 8, 2026 · Jan 8, 2026 · Jan 8, 2026
diff --git a/_maps/map_files/daftmarsh/daftmarsh.dmm b/_maps/map_files/daftmarsh/daftmarsh.dmm
@@ -11676,7 +11676,7 @@
 /area/outdoors/town)
 "kdA" = (
 /obj/structure/closet/crate/chest/crate,
-/obj/item/fishing/lure,
+/obj/effect/spawner/map_spawner/random_lure,
 /turf/open/floor/wood,
 /area/indoors/town)
 "kdC" = (

diff --git a/_maps/map_files/debug/roguetest.dmm b/_maps/map_files/debug/roguetest.dmm
@@ -2863,9 +2863,7 @@
 /turf/open/floor/grass/yel,
 /area/outdoors)
 "GO" = (
-/obj/effect/landmark/start/adventurerlate,
 /obj/machinery/light/fueled/wallfire/candle,
-/obj/effect/landmark/latejoin,
 /turf/open/floor/ruinedwood,
 /area/outdoors)
 "GU" = (
@@ -3477,6 +3475,8 @@
 	pixel_x = -6
 	},
 /obj/structure/table/vtable/v2,
+/obj/effect/spawner/map_spawner/random_lure,
+/obj/effect/spawner/map_spawner/random_lure,
 /turf/open/floor/wood,
 /area/indoors/town/manor)
 "VA" = (

diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm
@@ -1519,7 +1519,7 @@
 /area/indoors/town/orphanage)
 "aMw" = (
 /obj/structure/closet/crate/chest/neu,
-/obj/item/fishing/lure,
+/obj/effect/spawner/map_spawner/random_lure,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/indoors/town)

diff --git a/_maps/matthios_tomb/room/goblincamp.dmm b/_maps/matthios_tomb/room/goblincamp.dmm
@@ -5,7 +5,7 @@
 "ao" = (
 /obj/structure/chair/stool,
 /obj/item/fishingrod,
-/obj/item/fishing/lure,
+/obj/effect/spawner/map_spawner/random_lure,
 /turf/open/floor/ruinedwood,
 /area/under/tomb/cave)
 "aN" = (

diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
@@ -114,6 +114,7 @@
 #define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight"				//from base of /mob/update_sight(): ()
 #define COMSIG_MOB_SAY "mob_say" // from /mob/living/say(): ()
 	#define COMPONENT_UPPERCASE_SPEECH 1
+	#define COMPONENT_SPEECH_CANCEL (1<<1)
 	// used to access COMSIG_MOB_SAY argslist
 	#define SPEECH_MESSAGE 1
 	// #define SPEECH_BUBBLE_TYPE 2
@@ -347,3 +348,13 @@
 #define COMSIG_TIPS_REMOVE "comsig_tip_remove"
 ///used incase we care about a tracker dying
 #define COMSIG_LIVING_TRACKER_REMOVED "tracker_removed"
+///used when a command is issued to someone, if they have the correct component acts on this
+#define COMSIG_PARENT_COMMAND_RECEIVED	"command_received"
+
+#define COMSIG_AUGMENT_INSTALL "augment_install"
+#define COMSIG_AUGMENT_REMOVE "augment_remove"
+#define COMSIG_AUGMENT_REPAIR "augment_repair"
+#define COMSIG_AUGMENT_GET_STABILITY "augment_get_stability"
+
+#define COMPONENT_AUGMENT_SUCCESS (1<<0)
+#define COMPONENT_AUGMENT_FAILED (1<<1)
diff --git a/code/__DEFINES/fish.dm b/code/__DEFINES/fish.dm
@@ -202,7 +202,7 @@
 ///The volume of the grind results is multiplied by the fish' weight and divided by this.
 #define FISH_GRIND_RESULTS_WEIGHT_DIVISOR 500
 ///The number of fillets is multiplied by the fish' size and divided by this.
-#define FISH_FILLET_NUMBER_SIZE_DIVISOR 60
+#define FISH_FILLET_NUMBER_SIZE_DIVISOR 30
 
 ///The slowdown of the fish when carried begins at this value
 #define FISH_WEIGHT_SLOWDOWN 2100

diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm
@@ -27,6 +27,7 @@
 #define FOOTSTEP_MOB_SHOE "footstep_shoe"
 #define FOOTSTEP_MOB_HUMAN "footstep_human" //Warning: Only works on /mob/living/carbon/human
 #define FOOTSTEP_MOB_SLIME "footstep_slime"
+#define FOOTSTEP_MOB_METAL "footstep_metal"
 
 //priority defines for the footstep_override element
 #define STEP_SOUND_NO_PRIORITY 0
@@ -186,3 +187,24 @@ GLOBAL_LIST_INIT(heavyfootstep, list(
 		'sound/foley/footsteps/FTMUD (5).ogg'), 100, 0),
 ))
 
+GLOBAL_LIST_INIT(metalfootstep, list(
+	FOOTSTEP_GENERIC_HEAVY = list(list(
+		'sound/foley/footsteps/armor/powerarmor (1).ogg',
+		'sound/foley/footsteps/armor/powerarmor (2).ogg',
+		'sound/foley/footsteps/armor/powerarmor (3).ogg',), 100, 0),
+	FOOTSTEP_WATER = list(list(
+		'sound/foley/footsteps/armor/powerarmor (1).ogg',
+		'sound/foley/footsteps/armor/powerarmor (2).ogg',
+		'sound/foley/footsteps/armor/powerarmor (3).ogg',), 100, 0),
+	FOOTSTEP_SHALLOW = list(list(
+		'sound/foley/footsteps/armor/powerarmor (1).ogg',
+		'sound/foley/footsteps/armor/powerarmor (2).ogg',
+		'sound/foley/footsteps/armor/powerarmor (3).ogg',), 100, 0),
+	FOOTSTEP_LAVA = list(list(
+		'sound/blank.ogg'), 100, 0),
+	FOOTSTEP_MUD = list(list(
+		'sound/foley/footsteps/armor/powerarmor (1).ogg',
+		'sound/foley/footsteps/armor/powerarmor (2).ogg',
+		'sound/foley/footsteps/armor/powerarmor (3).ogg',), 100, 0),
+))
+
diff --git a/code/__DEFINES/species/_species.dm b/code/__DEFINES/species/_species.dm
@@ -15,6 +15,7 @@
 #define SPEC_ID_TRITON "triton"
 #define SPEC_ID_MEDICATOR "medicator"
 #define SPEC_ID_HALFLING "halfling"
+#define SPEC_ID_AUTOMATON "automaton"
 
 #define SPEC_ID_ORC	"orc"
 #define SPEC_ID_GOBLIN	"goblin"
@@ -44,6 +45,7 @@
 	SPEC_ID_ZIZOMBIE,\
 	SPEC_ID_HUMAN_SPACE,\
 	SPEC_ID_HALFLING,\
+	SPEC_ID_AUTOMATON, \
 )
 
 /// Species where females get underwear, no underwear for kobold, rakshari, medicator and triton, dwarves handled seperately

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -161,6 +161,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_NOLIMBDISABLE		"no_limb_disable"
 #define TRAIT_EASYLIMBDISABLE	"easy_limb_disable"
 #define TRAIT_TOXINLOVER		"toxinlover"
+#define TRAIT_NO_EXPERIENCE		"unlearning"
 #define TRAIT_NOBREATH			"no_breath"
 #define TRAIT_HOLY				"holy"
 #define TRAIT_NOCRITDAMAGE		"no_crit"

diff --git a/code/__HELPERS/fish.dm b/code/__HELPERS/fish.dm
@@ -8,7 +8,8 @@
 		if(FISH_BAIT_FOODTYPE)
 			if(isfood(bait))
 				return bait:foodtype & special_identifier[FISH_BAIT_VALUE]
-			return NONE
+			else
+				return bait:bait_flag & special_identifier[FISH_BAIT_VALUE]
 		if(FISH_BAIT_REAGENT)
 			return bait.reagents?.has_reagent(special_identifier[FISH_BAIT_VALUE], special_identifier[FISH_BAIT_AMOUNT], check_subtypes = TRUE)
 		else

diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
@@ -658,6 +658,9 @@ SUBSYSTEM_DEF(job)
 /// Gives the player the stuff they should have with their rank
 /datum/controller/subsystem/job/proc/EquipRank(mob/living/carbon/human/equipping, datum/job/job, client/player_client)
 	equipping.job = job.title
+	equipping.job_type = job.type
+	if(job.parent_job)
+		equipping.job_type = job.parent_job.type
 
 	SEND_SIGNAL(equipping, COMSIG_JOB_RECEIVED, job)
 

diff --git a/code/controllers/subsystem/merchant.dm b/code/controllers/subsystem/merchant.dm
@@ -26,6 +26,9 @@ SUBSYSTEM_DEF(merchant)
 	var/list/faction_rotation_schedule = list() // When each faction becomes active
 	var/list/active_faction_traders = list()
 
+	///this is our list of created nations
+	var/list/nations = list()
+
 	/// Cache of recipe component costs to avoid recalculation
 	var/static/list/recipe_base_values = list()
 	/// Cached list of all valid bounty items (items that can be obtained through gameplay)
@@ -44,6 +47,7 @@ SUBSYSTEM_DEF(merchant)
 
 
 /datum/controller/subsystem/merchant/Initialize(timeofday)
+	setup_map_nations()
 	// Initialize recipe values and bounty cache BEFORE factions cause they use it
 	initialize_recipe_values()
 	initialize_bounty_cache()
@@ -61,6 +65,8 @@ SUBSYSTEM_DEF(merchant)
 	initialize_factions()
 	return ..()
 
+/datum/controller/subsystem/merchant/proc/setup_map_nations()
+	return //! TODO: when lore done set this up
 
 /**
  * Initializes recipe base values for ALL recipes
@@ -498,6 +504,17 @@ SUBSYSTEM_DEF(merchant)
 			continue
 		pack.unlocked = TRUE
 
+/datum/controller/subsystem/merchant/proc/handle_lift_contents(obj/structure/industrial_lift/tram/platform, list/items, datum/nation/shipped_nation)
+	if(!length(nations))
+		return
+	if(shipped_nation)
+		shipped_nation.handle_import_shipment(items, platform)
+	for(var/datum/nation/other_nation in nations)
+		if(shipped_nation == other_nation)
+			continue
+		shipped_nation.handle_global_shipment(items)
+
+
 /obj/Initialize()
 	. = ..()
 	if(sellprice)

diff --git a/code/datums/components/abberant_eater.dm b/code/datums/components/abberant_eater.dm
@@ -35,6 +35,7 @@
 
 	playsound(M,'sound/misc/eat.ogg', rand(30,60), TRUE)
 	SEND_SIGNAL(source, COMSIG_FOOD_EATEN, M, user)
+	SEND_SIGNAL(user, COMSIG_MOB_FOOD_EAT, source)
 	source.on_consume(user)
 	qdel(source)
 	return TRUE
diff --git a/code/datums/components/augments/augment_datums/_base.dm b/code/datums/components/augments/augment_datums/_base.dm
@@ -0,0 +1,16 @@
+/datum/augment
+	var/name = "base augment"
+	var/desc = "A mechanical augmentation."
+	var/stability_cost = 0 // Negative values add stability, positive values reduce it
+	var/engineering_difficulty = SKILL_LEVEL_NOVICE
+	var/installation_time = 10 SECONDS
+	var/mob/living/carbon/parent
+
+/datum/augment/proc/on_install(mob/living/carbon/human/H)
+	return
+
+/datum/augment/proc/on_remove(mob/living/carbon/human/H)
+	return
+
+/datum/augment/proc/get_examine_info()
+	return