Merge branch 'master' into gatofication2

code/game/objects/items/RCD.dm

@@ -38,6 +38,7 @@ RLD
 	var/ammo_sections = 10	//amount of divisions in the ammo indicator overlay/number of ammo indicator states
 	var/custom_range = 7
 	var/upgrade = FALSE
+	var/airlock_dir = 1 //GS13 - airlock direction function
 
 /obj/item/construction/Initialize(mapload)
 	. = ..()
@@ -283,6 +284,23 @@ RLD
 	//Not scaling these down to button size because they look horrible then, instead just bumping up radius.
 	return MA
 
+
+/obj/item/construction/rcd/proc/change_airlock_direction(mob/user) //GS13 - change airlock direction
+	if(!user)
+		return
+	var/list/airlock_dirs = list(
+		"North/South" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocknorthsouth"),
+		"East/West" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlockeastwest")
+		)
+	var/airlockdirs = show_radial_menu(user, src, airlock_dirs, custom_check = CALLBACK(src,PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
+	if(!check_menu(user))
+		return
+	switch(airlockdirs)
+		if("North/South")
+			airlock_dir = 1
+		if("East/West")
+			airlock_dir = 4
+
 /obj/item/construction/rcd/proc/change_computer_dir(mob/user)
 	if(!user)
 		return
@@ -488,6 +506,7 @@ RLD
 	if(mode == RCD_AIRLOCK)
 		choices += list(
 		"Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"),
+		"Change Direction" = image(icon = 'GainStation13/icons/mob/radial.dmi', icon_state = "airlockrotation"), //GS13 - adding airlock rotation
 		"Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype")
 		)
 	else if(mode == RCD_WINDOWGRILLE)
@@ -515,6 +534,9 @@ RLD
 		if("Change Access")
 			change_airlock_access(user)
 			return
+		if("Change Direction") //GS13 - adding airlock direction in RCD
+			change_airlock_direction(user)
+			return
 		if("Change Airlock Type")
 			change_airlock_setting(user)
 			return

code/game/objects/items/devices/scanners.dm

@@ -73,7 +73,7 @@ GENETICS SCANNER
 
 /obj/item/healthanalyzer
 	name = "health analyzer"
-	icon = 'icons/obj/device.dmi'
+	icon = 'GainStation13/icons/obj/device.dmi' //GS13 - better sprite
 	icon_state = "health"
 	item_state = "healthanalyzer"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -407,6 +407,13 @@ GENETICS SCANNER
 		msg += "<span class='info'>Base Species: [H.spec_trait_examine_font()][S.name]</font></span>\n"
 		if(mutant)
 			msg += "<span class='info'>Subject has mutations present.</span>\n"
+
+		//GS13 EDIT START
+		if(H.fatness)
+			msg += span_info("Subject weighs [H.calculate_weight_in_pounds()] pounds ([H.fatness] BFI.)")
+			msg += "\n"
+
+		//GS13 EEDIT END
 	msg += "<span class='info'>Body temperature: [round(M.bodytemperature-T0C,0.1)] &deg;C ([round(M.bodytemperature*1.8-459.67,0.1)] &deg;F)</span>\n"
 
 	// Time of death
@@ -538,6 +545,7 @@ GENETICS SCANNER
 
 /obj/item/healthanalyzer/advanced
 	name = "advanced health analyzer"
+	icon = 'GainStation13/icons/obj/device.dmi' //GS13 - better sprite
 	icon_state = "health_adv"
 	desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy."
 	advanced = TRUE

code/game/objects/items/storage/bags.dm

@@ -388,7 +388,7 @@
 	name = "bluespace tray"
 	icon_state = "bluespace_tray"
 	desc = "A tray created using bluespace technology to fit more food on it."
-	max_items = 30 // far more items
+	max_items = 100 //GS13 - we loooove our mountains of food here
 	custom_materials = list(/datum/material/iron = 2000, /datum/material/bluespace = 500)
 
 /*