From 025ba72c1fcc0d870696f044fea787790b4992e4 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sun, 24 Mar 2019 19:29:08 -0300
Subject: [PATCH] Fixes more off-worlder human issues (#6206)

- fixes #6204
- fixes #6205
---
 code/game/jobs/whitelist.dm                   | 10 +++++--
 code/game/objects/items/devices/scanners.dm   |  5 ++++
 .../spacesuits/rig/modules/utility.dm         | 30 ++++++++-----------
 .../clothing/spacesuits/rig/suits/light.dm    |  4 +--
 code/modules/organs/robolimbs.dm              |  3 +-
 html/changelogs/alberyk-spacerfix.yml         |  7 +++++
 6 files changed, 35 insertions(+), 24 deletions(-)
 create mode 100644 html/changelogs/alberyk-spacerfix.yml

diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm
index 6215ca73c00..15fa42c80fa 100644
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -74,12 +74,16 @@ var/list/whitelist = list()
 	if (!M || !species)
 		return 0
 
-	if (istype(species, /datum/species))
+	if(istype(species, /datum/species))
 		var/datum/species/S = species
+		if(!(S.spawn_flags & IS_WHITELISTED))
+			return 1
 		species = S.name
 
-	if (lowertext(species) == "human")
-		return 1
+	else
+		var/datum/species/S = global.all_species[species]
+		if(S && !(S.spawn_flags & IS_WHITELISTED))
+			return 1
 
 	if (!alien_whitelist && !config.sql_whitelists)
 		return 0
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 95ef86ae24b..bb6de64ad90 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -27,6 +27,11 @@ BREATH ANALYZER
 	src.add_fingerprint(user)
 	return
 
+/obj/item/device/healthanalyzer/attack_self(mob/user)
+	health_scan_mob(user, user)
+	src.add_fingerprint(user)
+	return
+
 /proc/health_scan_mob(var/mob/living/M, var/mob/living/user, var/visible_msg, var/ignore_clumsiness, var/show_limb_damage = TRUE)
 	if ( ((CLUMSY in user.mutations) || (DUMB in user.mutations)) && prob(50))
 		to_chat(user, text("<span class='warning'>You try to analyze the floor's vitals!</span>"))
diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm
index 028fc50cfe1..05cc4eb9ce4 100644
--- a/code/modules/clothing/spacesuits/rig/modules/utility.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm
@@ -43,6 +43,18 @@
 
 	category = MODULE_MEDICAL
 
+/obj/item/rig_module/device/healthscanner/vitalscanner
+	name = "integrated vitals tracker"
+	desc = "A hardsuit-mounted vitals tracker."
+	interface_name = "vitals tracker"
+	interface_desc = "Shows an informative health readout of the user."
+
+	usable = 1
+	selectable = 0
+
+	category = MODULE_GENERAL
+
+
 /obj/item/rig_module/device/drill
 	name = "hardsuit diamond drill mount"
 	desc = "A very heavy diamond-tipped drill."
@@ -801,21 +813,3 @@ var/global/list/lattice_users = list()
 	to_chat(H, "<span class='notice'>Neural lattice disengaged. Pain receptors restored.</span>")
 	lattice_users.Remove(H)
 
-/obj/item/rig_module/vitalscanner
-	name = "integrated vitals tracker"
-	desc = "A hardsuit-mounted vitals tracker."
-	icon_state = "scanner"
-	interface_name = "vitals tracker"
-	interface_desc = "Shows an informative health readout of the user."
-	construction_cost = list("$glass" = 3250, DEFAULT_WALL_MATERIAL = 500)
-	construction_time = 100
-
-	usable = 1
-
-	category = MODULE_GENERAL
-
-/obj/item/rig_module/healthscanner/engage()
-	if (!..())
-		return 0
-
-	health_scan_mob(holder.wearer, holder.wearer)
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index f3024ee20e9..2326b93d8bc 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -164,7 +164,7 @@
 	boot_type = null
 
 	initial_modules = list(
-		/obj/item/rig_module/vitalscanner,
+		/obj/item/rig_module/device/healthscanner/vitalscanner,
 		/obj/item/rig_module/chem_dispenser/offworlder
 		)
 
@@ -202,7 +202,7 @@
 	)
 
 	initial_modules = list(
-		/obj/item/rig_module/vitalscanner,
+		/obj/item/rig_module/device/healthscanner/vitalscanner,
 		/obj/item/rig_module/chem_dispenser/offworlder,
 		/obj/item/rig_module/actuators/combat,
 		/obj/item/rig_module/fabricator/energy_net,
diff --git a/code/modules/organs/robolimbs.dm b/code/modules/organs/robolimbs.dm
index 30b7ec7842d..caa16a10840 100644
--- a/code/modules/organs/robolimbs.dm
+++ b/code/modules/organs/robolimbs.dm
@@ -24,7 +24,8 @@ var/global/datum/robolimb/basic_robolimb
 		"Unathi",
 		"Vaurca Worker",
 		"Vaurca Warrior",
-		"Baseline Frame"
+		"Baseline Frame",
+		"Off-Worlder Human"
 	)
 	var/paintable = 0 //tired of istype exceptions. bullshirt to find, and by god do i know it after this project.
 	var/linked_frame = "Unbranded Frame" //which machine species this limb will create
diff --git a/html/changelogs/alberyk-spacerfix.yml b/html/changelogs/alberyk-spacerfix.yml
new file mode 100644
index 00000000000..dee60732083
--- /dev/null
+++ b/html/changelogs/alberyk-spacerfix.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - bugfix: "Off-worlder loadout should be available now."
+  - bugfix: "Off-worlder humans can now use robotic limbs."