Monkestation · dwasint · Jun 4, 2026 · May 19, 2026 · May 19, 2026 · May 19, 2026
diff --git a/_maps/map_files/shared/CentCom.dmm b/_maps/map_files/shared/CentCom.dmm
@@ -5665,10 +5665,10 @@
 	pixel_x = -24
 	},
 /obj/structure/mannequin/male,
-/obj/item/clothing/head/rare/dwarfplate,
-/obj/item/clothing/armor/rare/dwarfplate,
-/obj/item/clothing/shoes/boots/rare/dwarfplate,
-/obj/item/clothing/gloves/rare/dwarfplate,
+/obj/item/clothing/head/helmet/heavy/dwarven,
+/obj/item/clothing/shoes/boots/armor/dwarven,
+/obj/item/clothing/armor/plate/full/dwarven,
+/obj/item/clothing/gloves/plate/dwarven,
 /obj/machinery/light/fueled/torchholder/l{
 	pixel_x = 4
 	},

diff --git a/_maps/map_files/vanderlin/vanderlin_mountain.dmm b/_maps/map_files/vanderlin/vanderlin_mountain.dmm
@@ -1219,7 +1219,7 @@
 /turf/open/lava,
 /area/under/cavelava)
 "afL" = (
-/obj/item/clothing/shoes/boots/rare/dwarfplate,
+/obj/item/clothing/shoes/boots/armor/dwarven,
 /obj/item/reagent_containers/food/snacks/rotten/egg,
 /turf/open/floor/naturalstone,
 /area/under/mountains/anvil/lower)
@@ -3488,7 +3488,7 @@
 /area/indoors/town/church/inquisition)
 "aqZ" = (
 /obj/structure/rack,
-/obj/item/clothing/gloves/rare/dwarfplate,
+/obj/item/clothing/gloves/plate/dwarven,
 /turf/open/floor/sand,
 /area/indoors/mountains/anvil/keep)
 "ara" = (
@@ -9050,7 +9050,7 @@
 /area/under/mountains/anvil/upper)
 "aRq" = (
 /obj/structure/closet/crate/drawer,
-/obj/item/clothing/head/rare/dwarfplate,
+/obj/item/clothing/head/helmet/heavy/dwarven,
 /obj/effect/spawner/map_spawner/loot/coin/med,
 /turf/open/floor/cobble,
 /area/indoors/mountains/anvil/keep)

diff --git a/_maps/matthios_tomb/room/hctomb3.dmm b/_maps/matthios_tomb/room/hctomb3.dmm
@@ -618,11 +618,11 @@
 /area/under/tomb/cave/spider)
 "ws" = (
 /obj/structure/rack,
-/obj/item/clothing/shoes/boots/rare/dwarfplate{
+/obj/item/clothing/shoes/boots/armor/dwarven{
 	pixel_x = -6;
 	pixel_y = 7
 	},
-/obj/item/clothing/gloves/rare/dwarfplate{
+/obj/item/clothing/gloves/plate/dwarven{
 	pixel_y = -3;
 	pixel_x = 1
 	},
@@ -1181,7 +1181,7 @@
 /area/under/tomb/indoors)
 "LV" = (
 /obj/structure/rack,
-/obj/item/clothing/head/rare/dwarfplate{
+/obj/item/clothing/head/helmet/heavy/dwarven{
 	pixel_y = 5;
 	pixel_x = -6
 	},
@@ -1418,7 +1418,7 @@
 /obj/structure/spider/stickyweb,
 /obj/machinery/light/fueled/wallfire/candle/blue/l,
 /obj/structure/closet/crate/chest/lootbox,
-/obj/item/clothing/armor/rare/dwarfplate,
+/obj/item/clothing/armor/plate/full/dwarven,
 /turf/open/floor/blocks/stonered/tiny,
 /area/under/tomb/indoors)
 "Vz" = (

diff --git a/_maps/matthios_tomb/unusable/Malphpiece7.dmm b/_maps/matthios_tomb/unusable/Malphpiece7.dmm
@@ -14,7 +14,7 @@
 /obj/item/clothing/head/hatfur,
 /obj/item/clothing/shoes/boots/furlinedboots,
 /obj/item/clothing/armor/plate,
-/obj/item/clothing/head/rare/dwarfplate,
+/obj/item/clothing/head/helmet/heavy/dwarven,
 /obj/item/weapon/polearm/spear/billhook,
 /obj/item/clothing/ring/gold/ravox,
 /obj/item/coin/gold/pile,

diff --git a/code/__DEFINES/elastic.dm b/code/__DEFINES/elastic.dm
@@ -11,6 +11,7 @@
 	#define ELASCAT_COMBAT "combat"
 	#define ELASCAT_CRAFTING "crafting"
 	#define ELASCAT_ECONOMY "economy"
+	#define ELASCAT_SHOP "shop"
 	#define ELASCAT_STORYTELLER "storyteller"
 	#define ELASCAT_BALANCE "balance"
 	#define ELASCAT_MEDICAL "medical"

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -0,0 +1,18 @@
+// Bitflags for loadout item restrictions/properties
+#define LOADOUT_FLAG_NONE 0
+#define LOADOUT_FLAG_NO_RENT (1<<0) // Cannot be rented for single rounds, must be owned permanently
+#define LOADOUT_FLAG_NO_EQUIP (1<<1) // Cannot be manually equipped (granted automatically on spawn, cosmetic/species grants)
+#define LOADOUT_FLAG_PATREON_LOCKED (1<<2) // Requires active patreon/donator status to use
+#define LOADOUT_FLAG_ACHIEVEMENT_LOCKED (1<<3) // requires required_award to be satisfied (replaces checking required_award != null implicitly)
+#define LOADOUT_FLAG_NO_DONATOR_FREE (1<<4)
+
+#define TICKET_TYPE_LOADOUT "loadout"
+#define TICKET_TYPE_SPECIAL "special"
+#define TICKET_TYPE_JOB_BOOST "job_boost"
+#define TICKET_TYPE_UNKNOWN "unknown"
+#define TICKET_TYPE_TRIUMPH "triumph"
+
+// Seconds the *sender* must wait before a cancel is processed
+// (prevents accepting+cancelling race that would dupe tickets)
+#define TICKET_TRADE_CANCEL_LOCK 5
+#define TRIUMPH_TICKET_MIN_CONVERT 10
diff --git a/code/__DEFINES/triumphs.dm b/code/__DEFINES/triumphs.dm
@@ -1,5 +1,5 @@
 // Character category and its buys
-#define TRIUMPH_CAT_CHARACTER "CHARACTER"
+#define TRIUMPH_CAT_CHARACTER "Character"
 
 #define TRIUMPH_BUY_RACE_ALL "race_all"
 #define TRIUMPH_BUY_ANY_CLASS "pick_any"
@@ -8,13 +8,13 @@
 #define TRIUMPH_BUY_SECRET_OFFICIANT "secret_officiant"
 
 // Character category and its buys
-#define TRIUMPH_CAT_CHALLENGES "CHALLENGES"
+#define TRIUMPH_CAT_CHALLENGES "Challenges"
 
 #define TRIUMPH_BUY_LEPROSY "leprosy"
 #define TRIUMPH_BUY_CURSE "curse"
 
 // Storyteller category and its buys
-#define TRIUMPH_CAT_STORYTELLER "STORYTELLER"
+#define TRIUMPH_CAT_STORYTELLER "Storyteller"
 
 #define TRIUMPH_BUY_ASTRATA_INFLUENCE "astrata_influence"
 #define TRIUMPH_BUY_NOC_INFLUENCE "noc_influence"
@@ -47,22 +47,27 @@
 #define TRIUMPH_BUY_ASTRATA_INFLUENCE_REDUCTION "astrata_influence_reduction"
 
 // Misc category and its buys
-#define TRIUMPH_CAT_MISC "MISC"
+#define TRIUMPH_CAT_MISC "Misc"
 
 #define TRIUMPH_BUY_PSYDON_FAVOURITE "psydon_favourite"
 
 // Misc category and its buys
-#define TRIUMPH_CAT_COMMUNAL "COMMUNAL"
+#define TRIUMPH_CAT_COMMUNAL "Communal"
 
 #define TRIUMPH_BUY_PSYDON_RETIREMENT "psydon_retirement"
 #define TRIUMPH_BUY_ORPHANAGE_RENOVATION "orphanage_renovation"
 #define TRIUMPH_BUY_LONGER_WEEK "longer_week"
 #define TRIUMPH_BUY_EXOTIC_TASTES "exotic_tastes"
 
-#define TRIUMPH_CAT_SEASONAL "SEASONAL"
+#define TRIUMPH_CAT_SEASONAL "Seasonal"
 
 #define TRIUMPH_BUY_SUBTERRAN_DWARF "subterran_dwarf"
 #define TRIUMPH_BUY_FORMIKRAG_KOBOLD "formikrag_kobold"
 
 // Bought triumph buys category
-#define TRIUMPH_CAT_ACTIVE_DATUMS "BOUGHT"
+#define TRIUMPH_CAT_ACTIVE_DATUMS "Bought"
+
+/// Cost to roll a random eligible special trait
+#define TRIUMPH_COST_RANDOM_SPECIAL 1
+/// Cost to directly pick a specific eligible special trait
+#define TRIUMPH_COST_SPECIFIC_SPECIAL 400
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
@@ -1,5 +1,6 @@
 GLOBAL_LIST_EMPTY(keys_by_ckey)						//all client ckeys, and their associated keys (keys_by_ckey[ckey] -> key), isn't cleared when the client leaves the game
 GLOBAL_LIST_EMPTY(clients)							//all clients
+GLOBAL_LIST_EMPTY(key_list)
 GLOBAL_LIST_EMPTY(admins)							//all clients whom are admins
 GLOBAL_PROTECT(admins)
 GLOBAL_LIST_EMPTY(deadmins)							//all ckeys who have used the de-admin verb.

diff --git a/code/_globalvars/special_traits/special_traits.dm b/code/_globalvars/special_traits/special_traits.dm
@@ -30,6 +30,7 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 
 /proc/try_apply_character_post_equipment(mob/living/carbon/human/character, client/player)
 	var/datum/job/job
+	apply_loadouts(character, player)
 	if(character.job)
 		job = SSjob.name_occupations[character.job]
 	if(!job)
@@ -41,7 +42,6 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 		return
 	// Apply the stuff if we have a job that has no adv classes
 	apply_character_post_equipment(character, player)
-	apply_loadouts(arglist(args))
 
 /proc/apply_character_post_equipment(mob/living/carbon/human/character, client/player)
 	if(!player)
@@ -61,6 +61,7 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 		return
 	apply_special_trait_if_able(character, player, trait_type)
 	player.prefs.next_special_trait = null
+	player.prefs.save_preferences()
 
 /proc/apply_voicepacks(mob/living/carbon/human/character, client/player)
 	switch(player.prefs.voice_type)
@@ -72,16 +73,6 @@ GLOBAL_LIST_INIT(special_traits, build_special_traits())
 			character.dna.species.soundpack_f = new /datum/voicepack/female/haughty()
 	return
 
-/proc/apply_loadouts(mob/living/carbon/human/character, client/player)
-	if(!player)
-		player = character.client
-	if(!player?.prefs)
-		return
-	for(var/i in 1 to 3)
-		if(isnull(player.prefs.vars["loadout[i]"]))
-			continue
-		character.mind.special_items["[player.prefs.vars["loadout[i]"]:item_path:name]"] = player.prefs.vars["loadout[i]"]:item_path
-
 /proc/apply_special_trait_if_able(mob/living/carbon/human/character, client/player, trait_type)
 	if(!charactet_eligible_for_trait(character, player, trait_type))
 		log_game("SPECIALS: Failed to apply [trait_type] for [key_name(character)]")

diff --git a/code/_globalvars/special_traits/traits.dm b/code/_globalvars/special_traits/traits.dm
@@ -19,6 +19,7 @@
 	var/list/restricted_races
 	var/list/restricted_jobs
 	var/allowed_flaw
+	var/cost_modifier = 2
 
 /// check if this characters can be applied this special_trait
 /datum/special_trait/proc/can_apply(mob/living/carbon/human/character)

diff --git a/code/controllers/subsystem/achievements.dm b/code/controllers/subsystem/achievements.dm
@@ -11,6 +11,12 @@ SUBSYSTEM_DEF(achievements)
 	var/list/datum/award/awards = list()
 
 /datum/controller/subsystem/achievements/Initialize(timeofday)
+	setup()
+	return ..()
+
+/datum/controller/subsystem/achievements/proc/setup()
+	if(length(awards))
+		return
 	// Instantiate all award singletons
 	for(var/T in subtypesof(/datum/award/achievement))
 		var/datum/award/A = new T
@@ -33,7 +39,6 @@ SUBSYSTEM_DEF(achievements)
 		if(C.player_details?.achievements && !C.player_details.achievements.initialized)
 			C.player_details.achievements.InitializeData()
 
-	return ..()
 
 /datum/controller/subsystem/achievements/Shutdown()
 	force_save_all()

diff --git a/code/controllers/subsystem/elastic/config.dm b/code/controllers/subsystem/elastic/config.dm
@@ -3,6 +3,9 @@
 /datum/config_entry/string/elastic_endpoint
 	protection = CONFIG_ENTRY_HIDDEN
 
+/datum/config_entry/string/shop_endpoint
+	protection = CONFIG_ENTRY_HIDDEN
+
 /datum/config_entry/string/combat_endpoint
 	protection = CONFIG_ENTRY_HIDDEN
 

diff --git a/code/controllers/subsystem/elastic/shards/shop.dm b/code/controllers/subsystem/elastic/shards/shop.dm
@@ -0,0 +1,7 @@
+/datum/elastic_shard/shop
+	name = "Shop"
+	upload_frequency = 5 MINUTES
+	shard_category = ELASCAT_SHOP
+
+/datum/elastic_shard/shop/get_endpoint()
+	return CONFIG_GET(string/shop_endpoint)
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -469,7 +469,6 @@ SUBSYSTEM_DEF(ticker)
 
 	job_change_locked = FALSE
 
-	SStriumphs.fire_on_PostSetup()
 	for(var/obj/effect/landmark/start/S as anything in GLOB.roundstart_landmarks)
 		if(!istype(S))//we can not runtime here. not in this important of a proc.
 			stack_trace("[S] [S.type] found in roundstart landmarks list, which isn't a start landmark!")
@@ -533,7 +532,7 @@ SUBSYSTEM_DEF(ticker)
 			livings += living
 			GLOB.character_ckey_list[living.real_name] = living.ckey
 		if(ishuman(living))
-			try_apply_character_post_equipment(living)
+			try_apply_character_post_equipment(living, living.client)
 
 	if(livings.len)
 		addtimer(CALLBACK(src, PROC_REF(release_characters), livings), 30, TIMER_CLIENT_TIME)