Merge pull request #3061 from VOREStation/aro-sync

Smol Sync

code/modules/mob/living/carbon/human/life.dm

@@ -616,11 +616,11 @@
 		var/temp_adj = 0
 		if(loc_temp < bodytemperature)			//Place is colder than we are
 			var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-			if(thermal_protection < 1)
+			if(thermal_protection < 0.99)	//For some reason, < 1 returns false if the value is 1.
 				temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR)	//this will be negative
 		else if (loc_temp > bodytemperature)			//Place is hotter than we are
 			var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-			if(thermal_protection < 1)
+			if(thermal_protection < 0.99)	//For some reason, < 1 returns false if the value is 1.
 				temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
 
 		//Use heat transfer as proportional to the gas density. However, we only care about the relative density vs standard 101 kPa/20 C air. Therefore we can use mole ratios

code/modules/mob/living/carbon/human/species/outsider/vox.dm

@@ -83,15 +83,15 @@
 	var/datum/language/species_language = all_languages[default_language]
 	return species_language.get_random_name(gender)
 
-/datum/species/vox/equip_survival_gear(var/mob/living/carbon/human/H)
+/datum/species/vox/equip_survival_gear(var/mob/living/carbon/human/H, var/extendedtank = 0,var/comprehensive = 0)
+	. = ..()
+
 	H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
 	if(H.backbag == 1)
 		H.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vox(H), slot_r_hand)
 		H.internal = H.back
 	else
 		H.equip_to_slot_or_del(new /obj/item/weapon/tank/vox(H), slot_r_hand)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/vox(H.back), slot_in_backpack)
 		H.internal = H.r_hand
 	H.internal = locate(/obj/item/weapon/tank) in H.contents
 	if(istype(H.internal,/obj/item/weapon/tank) && H.internals)

code/modules/mob/living/carbon/human/species/species.dm

@@ -233,19 +233,39 @@
 /datum/species/proc/sanitize_name(var/name, var/robot = 0)
 	return sanitizeName(name, MAX_NAME_LEN, robot)
 
-/datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 1)
+/datum/species/proc/equip_survival_gear(var/mob/living/carbon/human/H,var/extendedtank = 0,var/comprehensive = 0)
 	var/boxtype = /obj/item/weapon/storage/box/survival //Default survival box
+
 	if(H.isSynthetic())
-		boxtype = /obj/item/weapon/storage/box/synth //VOREStation Edit - Synth survival box on Tether
-	else if(extendedtank)
-		boxtype = /obj/item/weapon/storage/box/engineer //Special box for engineers
+		boxtype = /obj/item/weapon/storage/box //Empty box for synths
+
+	//Special box for engineers
+	if(comprehensive)
+		boxtype = /obj/item/weapon/storage/box/survival/comp
+
+	//Create the box
+	var/obj/item/weapon/storage/box/box = new boxtype(H)
+
+	//Create a tank (if such a thing exists for this species)
+	var/tanktext = "/obj/item/weapon/tank/emergency/" + "[breath_type]"
+	var/obj/item/weapon/tank/emergency/tankpath //Will force someone to come look here if they ever alter this path.
+	if(extendedtank)
+		tankpath = text2path(tanktext + "/engi")
+		if(!tankpath) //Is it just that there's no /engi?
+			tankpath = text2path(tanktext + "/double")
+
+	if(!tankpath)
+		tankpath = text2path(tanktext)
+
+	if(tankpath)
+		new tankpath(box)
+
+	box.calibrate_size()
 
 	if(H.backbag == 1)
-		if (extendedtank)	H.equip_to_slot_or_del(new boxtype(H), slot_r_hand)
-		else	H.equip_to_slot_or_del(new boxtype(H), slot_r_hand)
+		H.equip_to_slot_or_del(box, slot_r_hand)
 	else
-		if (extendedtank)	H.equip_to_slot_or_del(new boxtype(H.back), slot_in_backpack)
-		else	H.equip_to_slot_or_del(new boxtype(H.back), slot_in_backpack)
+		H.equip_to_slot_or_del(box, slot_in_backpack)
 
 /datum/species/proc/create_organs(var/mob/living/carbon/human/H) //Handles creation of mob organs.
 

code/modules/mob/mob_helpers.dm

@@ -328,7 +328,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
 	set name = "a-intent"
 	set hidden = 1
 
-	if(isliving(src))
+	if(isliving(src) && !isrobot(src))
 		switch(input)
 			if(I_HELP,I_DISARM,I_GRAB,I_HURT)
 				a_intent = input