Merge branch 'master' into pre_burst

cmss13-devs · Jul 30, 2024 · 325d385 · 325d385
2 parents b2c71d2 + b4c4ad3
commit 325d385
Show file tree

Hide file tree

Showing 46 changed files with 347 additions and 690 deletions.
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -360,6 +360,7 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_XENOMORPH_QUEEN  "Queen"
 
 // For coloring the ranks in the statistics menu
+#define JOB_PLAYTIME_TIER_0  (0 HOURS)
 #define JOB_PLAYTIME_TIER_1  (10 HOURS)
 #define JOB_PLAYTIME_TIER_2  (25 HOURS)
 #define JOB_PLAYTIME_TIER_3  (70 HOURS)

diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
@@ -6,6 +6,8 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	var/security[] = list()
 	//This list tracks characters spawned in the world and cannot be modified in-game. Currently referenced by respawn_character().
 	var/locked[] = list()
+	var/leveled_riflemen = 0
+	var/leveled_riflemen_max = 7
 
 /datum/datacore/proc/get_manifest(monochrome, OOC, nonHTML)
 	var/list/cic = GLOB.ROLES_CIC.Copy()

diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
@@ -155,7 +155,7 @@
 	if(!gear_preset)
 		return ""
 	if(GLOB.gear_path_presets_list[gear_preset])
-		return GLOB.gear_path_presets_list[gear_preset].paygrade
+		return GLOB.gear_path_presets_list[gear_preset].paygrades[1]
 	return ""
 
 /datum/job/proc/get_comm_title()

diff --git a/code/game/objects/items/devices/drone_devices.dm b/code/game/objects/items/devices/drone_devices.dm
diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm
@@ -169,6 +169,18 @@
 	icon_state = "game_kit"
 	icon = 'icons/obj/items/items.dmi'
 
+/obj/item/prop/gripper
+	name = "magnetic gripper"
+	desc = "A simple grasping tool for synthetic assets."
+	icon_state = "gripper"
+	icon = 'icons/obj/items/devices.dmi'
+
+/obj/item/prop/matter_decompiler
+	name = "matter decompiler"
+	desc = "Eating trash, bits of glass, or other debris will replenish your stores."
+	icon_state = "decompiler"
+	icon = 'icons/obj/items/devices.dmi'
+
 /// Xeno-specific props
 
 /obj/item/prop/alien/hugger

diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm