Merge remote-tracking branch 'tgstation/master' into upstream-feb12-2026

# Conflicts:
#	code/game/objects/items/storage/belt.dm
#	code/modules/jobs/job_types/chief_engineer.dm

code/controllers/configuration/entries/general.dm

@@ -188,11 +188,6 @@
 /// allow votes to change map
 /datum/config_entry/flag/allow_vote_map
 
-/// the number of times we allow players to rock the vote
-/datum/config_entry/number/max_rocking_votes
-	default = 1
-	min_val = 1
-
 /// minimum time between voting sessions (deciseconds, 10 minute default)
 /datum/config_entry/number/vote_delay
 	default = 10 MINUTES

code/game/objects/items/storage/belt.dm

@@ -55,11 +55,9 @@
 	preload = TRUE
 
 /obj/item/storage/belt/utility/chief/full/PopulateContents()
-	SSwardrobe.provide_type(/obj/item/screwdriver, src)
-	SSwardrobe.provide_type(/obj/item/wrench, src)
-	SSwardrobe.provide_type(/obj/item/weldingtool/hugetank, src)
-	SSwardrobe.provide_type(/obj/item/crowbar, src)
-	SSwardrobe.provide_type(/obj/item/wirecutters, src)
+	SSwardrobe.provide_type(/obj/item/screwdriver/power, src)
+	SSwardrobe.provide_type(/obj/item/crowbar/power, src)
+	SSwardrobe.provide_type(/obj/item/weldingtool/experimental, src)
 	SSwardrobe.provide_type(/obj/item/multitool, src)
 	SSwardrobe.provide_type(/obj/item/stack/cable_coil, src)
 	SSwardrobe.provide_type(/obj/item/extinguisher/mini, src)
@@ -68,11 +66,9 @@
 
 /obj/item/storage/belt/utility/chief/full/get_types_to_preload()
 	var/list/to_preload = list() //Yes this is a pain. Yes this is the point
-	to_preload += /obj/item/screwdriver
-	to_preload += /obj/item/wrench
-	to_preload += /obj/item/weldingtool/hugetank
-	to_preload += /obj/item/crowbar
-	to_preload += /obj/item/wirecutters
+	to_preload += /obj/item/screwdriver/power
+	to_preload += /obj/item/crowbar/power
+	to_preload += /obj/item/weldingtool/experimental
 	to_preload += /obj/item/multitool
 	to_preload += /obj/item/stack/cable_coil
 	to_preload += /obj/item/extinguisher/mini

config/config.txt

@@ -132,9 +132,6 @@ ALLOW_VOTE_RESTART
 ## allow players to initiate a map-change vote
 ALLOW_VOTE_MAP
 
-## the number of times you wish to allow players to rock the vote in a given shift
-MAX_ROCKING_VOTES 1
-
 ## min delay (deciseconds) between voting sessions (default 10 minutes)
 VOTE_DELAY 6000
 

html/changelogs/AutoChangeLog-pr-95111.yml

@@ -1,4 +0,0 @@
-author: "Cyberboss"
-delete-after: True
-changes:
-  - bugfix: "Fixed some inconsistencies with bodytypes when non-binary genders had it set to \"Use gender\". This is no longer possible. If you use have previously used this setting, your bodytype will be explicitly set to female."

html/changelogs/AutoChangeLog-pr-95134.yml

@@ -0,0 +1,4 @@
+author: "TealSeer"
+delete-after: True
+changes:
+  - balance: "The CE spawns with upgraded tools again"

html/changelogs/AutoChangeLog-pr-95136.yml

@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+  - code_imp: "Removed unused rock the vote config entry"

html/changelogs/archive/2026-02.yml

@@ -143,3 +143,8 @@
   - bugfix: Airlock painters are now short range once again
   sesametg:
   - server: 'fix: HR have reopened positions at unstaffed stations'
+2026-02-13:
+  Cyberboss:
+  - bugfix: Fixed some inconsistencies with bodytypes when non-binary genders had
+      it set to "Use gender". This is no longer possible. If you use have previously
+      used this setting, your bodytype will be explicitly set to female.