Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts

code/modules/clothing/suits/wiz_robe.dm

@@ -178,7 +178,7 @@
 
 /obj/item/clothing/suit/space/hardsuit/shielded/wizard
 	name = "battlemage armour"
-	desc = "Not all wizards are afraid of getting up close and personal."
+	desc = "Not all wizards are afraid of getting up close and personal. Not spaceproof despite its appearance."
 	icon_state = "hardsuit-wiz"
 	item_state = "wiz_hardsuit"
 	recharge_rate = 0
@@ -194,6 +194,15 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	magical = TRUE
 
+/obj/item/clothing/suit/space/hardsuit/shielded/wizard/arch
+	desc = "For the arch wizard in need of additional protection."
+	recharge_rate = 1
+	recharge_cooldown = 0
+	max_charges = 15
+	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/arch
+
 /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
 	name = "battlemage helmet"
 	desc = "A suitably impressive helmet."
@@ -210,6 +219,11 @@
 /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/attack_self(mob/user)
 	return
 
+/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/arch
+	desc = "A truly protective helmet."
+	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
+
 /obj/item/wizard_armour_charge
 	name = "battlemage shield charges"
 	desc = "A powerful rune that will increase the number of hits a suit of battlemage armour can take before failing.."

code/modules/martial_arts/mimejutsu.dm

@@ -33,8 +33,8 @@
 		var/obj/item/organ/external/affecting = D.get_organ(ran_zone(A.zone_selected))
 		var/armor_block = D.run_armor_check(affecting, "melee")
 
-		D.visible_message("<span class='danger'>[A] has hit [D] with invisible nuncucks!</span>", \
-								"<span class='userdanger'>[A] has hit [D] with a with invisible nuncuck!</span>")
+		D.visible_message("<span class='danger'>[A] has hit [D] with invisible nunchucks!</span>", \
+								"<span class='userdanger'>[A] has hit [D] with a with invisible nunchuck!</span>")
 		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 
 		D.apply_damage(damage, STAMINA, affecting, armor_block)

code/modules/mob/living/carbon/brain/robotic_brain.dm

@@ -110,7 +110,6 @@
 		if(imprinted_master)
 			to_chat(H, "<span class='biggerdanger'>You are permanently imprinted to [imprinted_master], obey [imprinted_master]'s every order and assist [imprinted_master.p_them()] in completing [imprinted_master.p_their()] goals at any cost.</span>")
 
-
 /obj/item/mmi/robotic_brain/proc/transfer_personality(mob/candidate)
 	searching = FALSE
 	brainmob.key = candidate.key
@@ -206,6 +205,10 @@
 	brainmob.container = src
 	brainmob.stat = CONSCIOUS
 	brainmob.SetSilence(0)
+	brainmob.dna = new(brainmob)
+	brainmob.dna.species = new /datum/species/machine() // Else it will default to human. And we don't want to clone IRC humans now do we?
+	brainmob.dna.ResetSE()
+	brainmob.dna.ResetUI()
 	GLOB.dead_mob_list -= brainmob
 	..()
 

code/modules/mob/living/simple_animal/hostile/floorcluwne.dm

@@ -285,7 +285,7 @@
 
 			if(prob(6))
 				for(var/turf/simulated/floor/O in range(src, 6))
-					O.MakeSlippery(TURF_WET_WATER, 10)
+					O.MakeSlippery(TURF_WET_WATER, 10 SECONDS)
 					playsound(src, 'sound/effects/clownstep1.ogg', 30, 1)
 
 			if(prob(5))
@@ -323,7 +323,7 @@
 				if(!eating)
 					addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Grab, H), 70)
 					for(var/turf/simulated/floor/O in range(src, 6))
-						O.MakeSlippery(TURF_WET_LUBE, 20)
+						O.MakeSlippery(TURF_WET_LUBE, 20 SECONDS)
 						playsound(src, 'sound/effects/meteorimpact.ogg', 30, 1)
 
 				eating = TRUE

code/modules/shuttle/supply.dm

@@ -425,7 +425,7 @@
 	var/packs_list[0]
 	for(var/set_name in SSshuttle.supply_packs)
 		var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name]
-		if(!pack.contraband && !pack.hidden && !pack.special && pack.group == cat)
+		if((!pack.contraband && !pack.hidden && !pack.special && pack.group == cat) || (!pack.contraband && !pack.hidden && (pack.special && pack.special_enabled) && pack.group == cat))
 			// 0/1 after the pack name (set_name) is a boolean for ordering multiple crates
 			packs_list.Add(list(list("name" = pack.name, "amount" = pack.amount, "cost" = pack.cost, "command1" = list("doorder" = "[set_name]0"), "command2" = list("doorder" = "[set_name]1"), "command3" = list("contents" = set_name))))