Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -22,29 +22,31 @@
 /obj/structure/closet/emcloset/New()
 	..()
 
-	if (prob(40))
-		new /obj/item/weapon/storage/toolbox/emergency(src)
-
-	switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
+	switch (pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
 		if ("small")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
 			new /obj/item/weapon/tank/emergency_oxygen(src)
-
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/clothing/mask/breath(src)
 		if ("aid")
 			new /obj/item/weapon/tank/emergency_oxygen(src)
-			new /obj/item/weapon/storage/firstaid/o2(src)
-
-		if ("tank")
-			new /obj/item/weapon/tank/air(src)
-
-		if ("both")
-			new /obj/item/weapon/tank/emergency_oxygen(src)
+			new /obj/item/weapon/storage/toolbox/emergency(src)
 			new /obj/item/clothing/mask/breath(src)
-
+			new /obj/item/weapon/storage/firstaid/o2(src)
+		if ("tank")
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+		if ("both")
+			new /obj/item/weapon/storage/toolbox/emergency(src)
+			new /obj/item/weapon/tank/emergency_oxygen/engi(src)
+			new /obj/item/clothing/mask/breath(src)
+			new /obj/item/weapon/storage/firstaid/o2(src)
 		if ("nothing")
 			// doot
 
-		// teehee
+		// teehee - Ah, tg coders...
 		if ("delete")
 			del(src)
 
@@ -56,7 +58,7 @@
 /obj/structure/closet/emcloset/legacy/New()
 	new /obj/item/weapon/tank/oxygen(src)
 	new /obj/item/clothing/mask/gas(src)
-
+	
 /*
  * Fire Closet
  */

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

@@ -270,12 +270,12 @@
 				if(prob(round((50 - nutrition) / 100)))
 					src << "\blue You feel fit again!"
 					mutations.Remove(FAT)
-		else
+/*		else
 			if(nutrition > 500)
 				if(prob(5 + round((nutrition - 200) / 2)))
 					src << "\red You suddenly feel blubbery!"
 					mutations.Add(FAT)
-
+ FUCK YOU FATCODE -Hawk */
 		if (nutrition > 0)
 			nutrition -= HUNGER_FACTOR
 

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

@@ -186,12 +186,12 @@
 				if(prob(round((50 - nutrition) / 100)))
 					src << "\blue You feel fit again!"
 					mutations.Add(FAT)
-		else
+/*		else
 			if(nutrition > 500)
 				if(prob(5 + round((nutrition - max_grown) / 2)))
 					src << "\red You suddenly feel blubbery!"
 					mutations.Add(FAT)
-
+FUCK YOU MORE FAT CODE -Hawk*/
 		if (nutrition > 0)
 			nutrition-= HUNGER_FACTOR
 

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

@@ -226,10 +226,10 @@
 	if(nutrition < 100)
 		msg += "[t_He] [t_is] severely malnourished.\n"
 	else if(nutrition >= 500)
-		if(usr.nutrition < 100)
+		/*if(usr.nutrition < 100)
 			msg += "[t_He] [t_is] plump and delicious looking - Like a fat little piggy. A tasty piggy.\n"
-		else
-			msg += "[t_He] [t_is] quite chubby.\n"
+		else*/
+		msg += "[t_He] [t_is] quite chubby.\n"
 
 	msg += "</span>"
 

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

@@ -975,7 +975,7 @@
 				update_mutations(0)
 				update_inv_w_uniform(0)
 				update_inv_wear_suit()
-		else
+/*		else
 			if(overeatduration > 500)
 				src << "\red You suddenly feel blubbery!"
 				mutations.Add(FAT)
@@ -983,7 +983,7 @@
 				update_mutations(0)
 				update_inv_w_uniform(0)
 				update_inv_wear_suit()
-
+AND YOU */
 		// nutrition decrease
 		if (nutrition > 0 && stat != 2)
 			nutrition = max (0, nutrition - HUNGER_FACTOR)

code/modules/mob/living/silicon/robot/robot.dm

@@ -81,7 +81,7 @@
 		icon_state = "secborg"
 		modtype = "Synd"
 	else
-		laws = new /datum/ai_laws/asimov()
+		laws = new /datum/ai_laws/nanotrasen()
 		connected_ai = select_active_ai_with_fewest_borgs()
 		if(connected_ai)
 			connected_ai.connected_robots += src