fix: custom items job requirement

#12775
ChaoticOnyx · Sep 4, 2024 · 58a4540 · 58a4540
1 parent 87f2bfd
commit 58a4540
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
       "env": {
         "MODE": "dev",
         "ONYXBAY__GENERAL__SERVER_ID": "test"
-      }
+      },
     },
     {
       "type": "byond",
@@ -21,6 +21,27 @@
         "MODE": "dev",
         "ONYXBAY__GENERAL__SERVER_ID": "test"
       },
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "DD Debug",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}",
+      "env": {
+        "MODE": "dev",
+        "ONYXBAY__GENERAL__SERVER_ID": "test"
+      }
+    },
+    {
+      "type": "byond",
+      "request": "launch",
+      "name": "Build & DD Debug",
+      "preLaunchTask": "dm: build - ${command:CurrentDME}",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}",
+      "env": {
+        "MODE": "dev",
+        "ONYXBAY__GENERAL__SERVER_ID": "test"
+      },
       "dreamDaemon": true
     },
     {

diff --git a/code/datums/configuration/custom_section.dm b/code/datums/configuration/custom_section.dm
@@ -33,11 +33,9 @@
 			if(isnull(item_path))
 				util_crash_with("The given item path, [item_info["path"]], is invalid and does not exist.")
 
+			var/character_name = item_info["character_name"]
 			var/patreon_type = item_info["patreon_type"]
-			var/req_job = item_info["req_job"]
-			var/flags = item_info["flags"]
+			var/list/req_job = item_info["req_job"]
+			var/list/flags = item_info["flags"]
 
-			if(!isnull(req_job))
-				req_job = text2path(req_job)
-
-			items[ckey] += new /datum/custom_item(item_path, patreon_type, req_job, flags)
+			items[ckey] += new /datum/custom_item(character_name, item_path, patreon_type, req_job, flags)
diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm
@@ -3,12 +3,14 @@
 // spawns, the list is checked and all appropriate datums are spawned.
 
 /datum/custom_item
+	var/character_name
 	var/item_path
 	var/patreon_type
 	var/list/req_job
 	var/list/flags = list()
 
-/datum/custom_item/New(item_path, patreon_type, req_job, flags)
+/datum/custom_item/New(character_name, item_path, patreon_type, req_job, flags)
+	src.character_name = character_name
 	src.item_path = item_path
 	src.patreon_type = patreon_type
 	src.req_job = req_job
@@ -81,6 +83,10 @@
 		return
 
 	for(var/datum/custom_item/citem in key_list)
+		// Check for requisite character name.
+		if(lowertext(citem.character_name) != lowertext(M.real_name))
+			continue
+
 		// Check for required job title.
 		if(length(citem.req_job))
 			var/has_title