Merge remote-tracking branch 'upstream/master'

code/game/area/areas.dm

@@ -68,10 +68,8 @@
 		power_light = 0
 		power_equip = 0
 		power_environ = 0
-	return INITIALIZE_HINT_LATELOAD
-
-/area/LateInitialize()
 	power_change()		// all machines set to current power level, also updates lighting icon
+	return INITIALIZE_HINT_LATELOAD
 
 /area/proc/get_contents()
 	return contents

code/modules/clothing/gloves/miscellaneous.dm

@@ -119,6 +119,7 @@
 	name = "knuckle dusters"
 	desc = "A pair of brass knuckles. Generally used to enhance the user's punches."
 	icon_state = "knuckledusters"
+	matter = list(DEFAULT_WALL_MATERIAL = 500)
 	attack_verb = list("punched", "beaten", "struck")
 	flags = THICKMATERIAL	// Stops rings from increasing hit strength
 	siemens_coefficient = 1

code/modules/mob/living/simple_animal/vore/shadekin/shadekin.dm

@@ -444,4 +444,4 @@
 	exclaim_verb = "mars"
 	key = "m"
 	machine_understands = 0
-	flags = RESTRICTED | HIVEMIND
+	flags = WHITELISTED | HIVEMIND

code/modules/planet/sif.dm

@@ -400,38 +400,38 @@ var/datum/planet/sif/planet_sif = null
 
 /datum/weather/sif/hail/process_effects()
 	..()
-	for(var/mob/living/carbon/human/H in living_mob_list)
+	for(var/humie in human_mob_list)
+		var/mob/living/carbon/human/H = humie
 		if(H.z in holder.our_planet.expected_z_levels)
 			var/turf/T = get_turf(H)
 			if(!T.outdoors)
 				continue // They're indoors, so no need to pelt them with ice.
 
-			// If they have an open umbrella, it'll guard from rain
-			// Message plays every time the umbrella gets stolen, just so they're especially aware of what's happening
+			// If they have an open umbrella, it'll guard from hail
+			var/obj/item/weapon/melee/umbrella/U
 			if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella))
-				var/obj/item/weapon/melee/umbrella/U = H.get_active_hand()
-				if(U.open)
-					if(show_message)
-						to_chat(H, "<span class='notice'>Hail patters gently onto your umbrella.</span>")
-					continue
+				U = H.get_active_hand()
 			else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella))
-				var/obj/item/weapon/melee/umbrella/U = H.get_inactive_hand()
-				if(U.open)
-					if(show_message)
-						to_chat(H, "<span class='notice'>Hail patters gently onto your umbrella.</span>")
-					continue
-
+				U = H.get_inactive_hand()
+			if(U && U.open)
+				if(show_message)
+					to_chat(H, "<span class='notice'>Hail patters onto your umbrella.</span>")
+				continue
+		
 			var/target_zone = pick(BP_ALL)
 			var/amount_blocked = H.run_armor_check(target_zone, "melee")
 			var/amount_soaked = H.get_armor_soak(target_zone, "melee")
 
-			if(amount_blocked >= 100)
+			var/damage = rand(1,3)
+
+			if(amount_blocked >= 30)
+				continue // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head.
+				//Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30.
+
+			if(amount_soaked >= damage)
 				continue // No need to apply damage.
 
-			if(amount_soaked >= 10)
-				continue // No need to apply damage.
-
-			H.apply_damage(rand(1, 3), BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "hail")
+			H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "hail")
 			if(show_message)
 				to_chat(H, effect_message)
 

code/modules/reagents/Chemistry-Machinery.dm

@@ -232,10 +232,18 @@
 			var/amount_per_pill = reagents.total_volume/count
 			if (amount_per_pill > 60) amount_per_pill = 60
 
-			var/name = sanitizeSafe(input(usr,"Name:","Name your pill!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)") as null|text, MAX_NAME_LEN)
+			var/pill_cube = "pill"
+			if(condi)//For the condimaster
+				pill_cube = "cube"
+			else
+				pill_cube = "pill"
+
+			var/name = sanitizeSafe(input(usr,"Name:","Name your [pill_cube]!","[reagents.get_master_reagent_name()] ([amount_per_pill] units)") as null|text, MAX_NAME_LEN)
+
 			if(!name) //Blank name (sanitized to nothing, or left empty) or cancel
 				return
 
+
 			if(reagents.total_volume/count < 1) //Sanity checking.
 				return
 			while (count--)
@@ -244,7 +252,11 @@
 				P.name = "[name] pill"
 				P.pixel_x = rand(-7, 7) //random position
 				P.pixel_y = rand(-7, 7)
-				P.icon_state = "pill"+pillsprite
+				if(!condi) //If normal
+					P.icon_state = "pill"+pillsprite
+				else //If condi is on
+					P.icon_state = "bouilloncube"//Reskinned monkey cube
+					P.desc = "A dissolvable cube."
 				reagents.trans_to_obj(P,amount_per_pill)
 				if(src.loaded_pill_bottle)
 					if(loaded_pill_bottle.contents.len < loaded_pill_bottle.max_storage_space)

config/alienwhitelist.txt

@@ -32,9 +32,11 @@ singo - Gutter
 some~user - Species
 tastypred - Xenochimera
 verkister - Xenochimera
+wickedtemp - Shadekin Empathy
+wtfismyname - Xenomorph Hybrid
 xioen - Diona
 xioen - Xenochimera
 xioen - Xenomorph Hybrid
+zalvine - Shadekin Empathy
 zammyman215 - Vox
 zekesturm - Xenomorph Hybrid
-wtfismyname - Xenomorph Hybrid

nano/templates/chem_master.tmpl

@@ -76,6 +76,7 @@
 			<hr>
 			<div class='item'>
 				{{:helper.link('Create bottle (50 units max)', null, {'createbottle' : 1})}}
+				{{:helper.link('Create bouillon cube (60 units max)', null, {'createpill' : 1})}}
 			</div>
 		{{/if}}
 	{{/if}}