Merge branch 'evilew:master' into master

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

@@ -371,7 +371,7 @@
 			if(!key)
 				msg += "<span class='deadsay'>[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.</span>\n"
 			else if(!client)
-				msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n"
+				msg += "[t_He] [t_has] a blank, absent-minded stare and [t_has] been completely unresponsive to anything for [round(((world.time - lastclienttime) / (1 MINUTES)),1)] minutes. [t_He] may snap out of it soon.\n" //GS13 Edit: SSD timer
 
 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n"

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

@@ -524,6 +524,7 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 			if(!SSD)
 				add_status_indicator("ssd")
 				SSD = TRUE
+				lastclienttime = world.time //GS13 Editception: SSD timer
 		else
 			if(SSD)
 				remove_status_indicator("ssd")

code/modules/mob/living/living_defines.dm

@@ -92,6 +92,7 @@
 
 	// GS13 EDIT
 	var/SSD = FALSE
+	var/lastclienttime = 0 //GS13 Editception: SSD timer
 
 	var/list/pipes_shown = list()
 	var/last_played_vent

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -12,6 +12,7 @@
 	taste_description = "generic food"
 	taste_mult = 4
 	value = REAGENT_VALUE_VERY_COMMON
+	chemical_flags = REAGENT_ORGANIC_PROCESS | REAGENT_BIOFUEL_PROCESS // GS13 edit; lets robots with the biofuel trait process foodchems
 	var/nutriment_factor = 1 * REAGENTS_METABOLISM
 	var/max_nutrition = INFINITY
 	var/quality = 0	//affects mood, typically higher for mixed drinks with more complex recipes

code/modules/surgery/organs/augments_arms.dm

@@ -360,6 +360,13 @@
 
 /obj/item/apc_powercord/proc/apc_powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
 	H.visible_message("<span class='notice'>[H] inserts a power connector into [A].</span>", "<span class='notice'>You begin to draw power from [A].</span>")
+
+	//GS13 EDIT START
+	var/overcharge = FALSE
+	if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+		overcharge = TRUE
+	//GS13 EDIT END
+
 	while(do_after(H, 10, target = A))
 		if(loc != H)
 			to_chat(H, "<span class='warning'>You must keep your connector out while charging!</span>")
@@ -378,14 +385,28 @@
 			A.cell.use(A.cell.charge)
 			to_chat(H, "<span class='notice'>You siphon off as much as [A] can spare.</span>")
 			break
-		if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
-			to_chat(H, "<span class='notice'>You are now fully charged.</span>")
-			break
+		//GS13 EDIT START
+		if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)	
+			if(!overcharge) //GS13 edit
+				to_chat(H, "<span class='notice'>You are now fully charged.</span>")
+				break
+			else
+				if(H.nutrition >= NUTRITION_LEVEL_FAT)
+					to_chat(H, "<span class='notice'>You've packed as much extra power into your battery as it can handle.</span>")
+					break
+		//GS13 EDIT END
 	in_use = FALSE
 	H.visible_message("<span class='notice'>[H] unplugs from [A].</span>", "<span class='notice'>You unplug from [A].</span>")
 
 /obj/item/apc_powercord/proc/cell_powerdraw_loop(obj/item/stock_parts/cell/C, mob/living/carbon/human/H)
 	H.visible_message("<span class='notice'>[H] connects a power cord to [C]</span>", "<span class='notice'>You begin to draw power from [C].</span>")
+
+	//GS13 EDIT START
+	var/overcharge = FALSE
+	if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+		overcharge = TRUE
+	//GS13 EDIT END
+
 	while(do_after(H, 10, target = C))
 		if(loc != H)
 			to_chat(H, "<span class='warning'>You must keep your connector out while charging!</span>")
@@ -397,8 +418,15 @@
 		C.use(siphoned_charge)
 		do_sparks(1, FALSE, C)
 		H.adjust_nutrition(siphoned_charge / 100)	//Less efficient on a pure power basis than APC recharge. Still a very viable way of gaining nutrition. (100 nutrition / base 10k cell)
-		if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
-			to_chat(H, "<span class='notice'>You are now fully charged.</span>")
-			break
+		// GS13 EDIT START
+		if(H.nutrition >= NUTRITION_LEVEL_WELL_FED)
+			if(!overcharge)
+				to_chat(H, "<span class='notice'>You are now fully charged.</span>")
+				break
+			else
+				if(H.nutrition >= NUTRITION_LEVEL_FAT)
+					to_chat(H, "<span class='notice'>You've packed as much extra power into your battery as it can handle.</span>")
+					break
+		//GS13 EDIT END	
 	in_use = FALSE
 	H.visible_message("<span class='notice'>[H] disconnects [src] from [C].</span>", "<span class='notice'>You disconnect from [C].</span>")