From 54f5cae00136c0cbe760f08484d551d791c2932b Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Wed, 5 Apr 2023 18:08:43 +0200
Subject: [PATCH] Unathi Augment Stuff (#15794)

---
 code/controllers/subsystems/job.dm             | 18 ++++++------------
 .../loadout/loadout_augments.dm                |  2 +-
 html/changelogs/geeves-fuel_cell_fix.yml       |  6 ++++++
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 html/changelogs/geeves-fuel_cell_fix.yml

diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index c5e950a9145..24233e74eca 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -822,24 +822,18 @@
 			if(!G.augment)
 				continue
 
-			var/permitted = !G.allowed_roles || (rank.title in G.allowed_roles)
-			permitted = permitted && G.check_species_whitelist(H)
-			permitted = permitted && (!G.faction || (G.faction == H.employer_faction || H.employer_faction == "Stellar Corporate Conglomerate"))
-			var/singleton/origin_item/culture/our_culture = GET_SINGLETON(text2path(prefs.culture))
-			permitted = permitted && (!G.culture_restriction || (our_culture in G.culture_restriction))
-			var/singleton/origin_item/origin/our_origin = GET_SINGLETON(text2path(prefs.origin))
-			permitted = permitted && (!G.origin_restriction || (our_origin in G.origin_restriction))
-
-			if(!permitted)
-				to_chat(H, SPAN_WARNING("Your current job, culture, origin or whitelist status does not permit you to spawn with [thing]!"))
-				continue
-
 			var/metadata
 			var/list/gear_test = prefs.gear[G.display_name]
 			if(gear_test?.len)
 				metadata = gear_test
 			else
 				metadata = list()
+
+			var/cant_spawn_reason = G.cant_spawn_item_reason(null, metadata, H, rank, prefs)
+			if(cant_spawn_reason)
+				to_chat(H, SPAN_WARNING(cant_spawn_reason))
+				continue
+
 			var/obj/item/organ/A = G.spawn_item(H, metadata, H)
 			if(!istype(A, /obj/item/organ/external))
 				var/obj/item/organ/external/affected = H.get_organ(A.parent_organ)
diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm
index d25a0c05811..89aa5bd7e9d 100644
--- a/code/modules/client/preference_setup/loadout/loadout_augments.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_augments.dm
@@ -5,7 +5,7 @@
 	cost = 1
 	augment = TRUE
 	sort_category = "Augments"
-	whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER)
+	whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
 	flags = GEAR_NO_SELECTION
 
 /datum/gear/augment/eye_sensors
diff --git a/html/changelogs/geeves-fuel_cell_fix.yml b/html/changelogs/geeves-fuel_cell_fix.yml
new file mode 100644
index 00000000000..6574285bacb
--- /dev/null
+++ b/html/changelogs/geeves-fuel_cell_fix.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Unathi can now take more augments, such as the welding fuel cell processor."