Merge branch 'master' into logging-improvements

code/datums/ai_laws.dm

@@ -62,15 +62,15 @@
 	if(sorted_laws.len)
 		return
 
-	for(var/ion_law in ion_laws)
-		sorted_laws += ion_law
-		
-	for(var/evil_law in devil_laws)
-		sorted_laws += evil_law
-
 	if(zeroth_law)
 		sorted_laws += zeroth_law
 
+	for(var/ion_law in ion_laws)
+		sorted_laws += ion_law
+
+	for(var/evil_law in devil_laws)
+		sorted_laws += evil_law
+
 	var/index = 1
 	for(var/datum/ai_law/inherent_law in inherent_laws)
 		inherent_law.index = index++
@@ -133,12 +133,12 @@
 	for(var/datum/ai_law/AL in devil_laws)
 		if(AL.law == law)
 			return
-			
+
 	var/new_law = new/datum/ai_law/sixsixsix(law)
 	devil_laws += new_law
 	if(state_devil.len < devil_laws.len)
 		state_devil += 1
-		
+
 	sorted_laws.Cut()
 
 /datum/ai_laws/proc/add_ion_law(var/law)
@@ -209,9 +209,9 @@
 
 /datum/ai_law/ion/delete_law(var/datum/ai_laws/laws)
 	laws.internal_delete_law(laws.ion_laws, laws.state_ion, src)
-	
+
 /datum/ai_law/sixsixsix/delete_law(var/datum/ai_laws/laws)
-	laws.internal_delete_law(laws.devil_laws, laws.state_devil, src) 
+	laws.internal_delete_law(laws.devil_laws, laws.state_devil, src)
 
 /datum/ai_law/inherent/delete_law(var/datum/ai_laws/laws)
 	laws.internal_delete_law(laws.inherent_laws, laws.state_inherent, src)

code/datums/diseases/advance/symptoms/sensory.dm

@@ -62,4 +62,4 @@ Bonus
 					M.reagents.add_reagent("oculine", 20)
 			else
 				if(prob(SYMPTOM_ACTIVATION_PROB * 5))
-					to_chat(M, "<span class='notice'>[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]</span>")
+					to_chat(M, "<span class='notice'>[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your hearing feels more acute.")]</span>")

code/datums/diseases/critical.dm

@@ -199,4 +199,4 @@
 					affected_mob.emote("collapse")
 				if(prob(12))
 					to_chat(affected_mob, "<span class='warning'>You feel [pick("tired", "exhausted", "sluggish")].</span>")
-					affected_mob.Slowed(rand(4, 16))
+					affected_mob.Slowed(rand(4, 16))

code/datums/gas_mixture.dm

@@ -645,7 +645,7 @@ What are the archived variables for?
 		((nitrogen < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen) || (nitrogen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.nitrogen)))
 		return 0
 	if((abs(carbon_dioxide-sample.carbon_dioxide) > MINIMUM_AIR_TO_SUSPEND) && \
-		((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (oxygen > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide)))
+		((carbon_dioxide < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide) || (carbon_dioxide > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.carbon_dioxide)))
 		return 0
 	if((abs(toxins-sample.toxins) > MINIMUM_AIR_TO_SUSPEND) && \
 		((toxins < (1-MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins) || (toxins > (1+MINIMUM_AIR_RATIO_TO_SUSPEND)*sample.toxins)))

code/datums/log_viewer.dm

@@ -120,6 +120,9 @@
 	dat += "<span>Mobs being used:</span>"
 	for(var/i in selected_mobs)
 		var/mob/M = i
+		if(QDELETED(M))
+			selected_mobs -= i
+			continue
 		dat += "<a href='?src=[UID()];remove_mob=\ref[M]'>[get_display_name(M)]</a>"
 	dat += "<a href='?src=[UID()];add_mob=1'>Add Mob</a>"
 	dat += "<a href='?src=[UID()];add_mob_ckey=1'>Add Mob (by ckey)</a>"

code/datums/mind.dm

@@ -63,8 +63,6 @@
 	var/datum/mind/soulOwner //who owns the soul.  Under normal circumstances, this will point to src
 	var/hasSoul = TRUE
 
-	var/rev_cooldown = 0
-
 	var/isholy = FALSE // is this person a chaplain or admin role allowed to use bibles
 	var/isblessed = FALSE // is this person blessed by a chaplain?
 	var/num_blessed = 0 // for prayers

code/datums/outfits/plasmamen.dm

@@ -176,3 +176,9 @@
 
 	head = /obj/item/clothing/head/helmet/space/plasmaman/blueshield
 	uniform = /obj/item/clothing/under/plasmaman/blueshield
+
+/datum/outfit/plasmaman/wizard
+	name = "Wizard Plasmaman"
+
+	head = /obj/item/clothing/head/helmet/space/plasmaman/wizard
+	uniform = /obj/item/clothing/under/plasmaman/wizard

code/datums/spells/area_teleport.dm

@@ -79,6 +79,8 @@
 			target.forceMove(pick(L))
 			playsound(get_turf(user), sound2, 50,1)
 
+		user.update_action_buttons_icon()  //Update action buttons as some spells might now be castable
+
 	return
 
 /obj/effect/proc_holder/spell/targeted/area_teleport/invocation(area/chosenarea = null)

code/datums/spells/lichdom.dm

@@ -28,7 +28,7 @@
 		config.continuous_rounds = 0
 	return ..()
 
-/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets,mob/user = usr)
+/obj/effect/proc_holder/spell/targeted/lichdom/cast(list/targets, mob/user = usr)
 	if(!config.continuous_rounds)
 		existence_stops_round_end = 1
 		config.continuous_rounds = 1
@@ -36,7 +36,7 @@
 	for(var/mob/M in targets)
 		var/list/hand_items = list()
 		if(iscarbon(M))
-			hand_items = list(M.get_active_hand(),M.get_inactive_hand())
+			hand_items = list(M.get_active_hand(), M.get_inactive_hand())
 
 		if(marked_item && !stat_allowed) //sanity, shouldn't happen without badminry
 			marked_item = null
@@ -74,12 +74,9 @@
 			var/mob/old_body = current_body
 			var/turf/body_turf = get_turf(old_body)
 			current_body = lich
-			lich.Weaken(10+10*resurrections)
+			lich.Weaken(10 + 10 * resurrections)
 			++resurrections
-			lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes)
-			lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform)
-			lich.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(lich), slot_wear_suit)
-			lich.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(lich), slot_head)
+			equip_lich(lich)
 
 			if(old_body && old_body.loc)
 				if(iscarbon(old_body))
@@ -127,7 +124,10 @@
 					H.unEquip(H.head)
 					H.unEquip(H.shoes)
 					H.unEquip(H.head)
-					H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
-					H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
-					H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)
+					equip_lich(H)
+
+/obj/effect/proc_holder/spell/targeted/lichdom/proc/equip_lich(mob/living/carbon/human/H)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(H), slot_w_uniform)

code/datums/spells/mime.dm

@@ -165,4 +165,4 @@
 /obj/item/spellbook/oneuse/mime/greaterwall
 	spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime
 	spellname = "Invisible Greater Wall"
-	desc = "It contains illustrations of the great walls of human history."
+	desc = "It contains illustrations of the great walls of human history."

code/datums/status_effects/status_effect.dm

@@ -41,6 +41,9 @@
 		LAZYREMOVE(owner.status_effects, src)
 		on_remove()
 		owner = null
+	if(linked_alert)
+		linked_alert.attached_effect = null
+	linked_alert = null
 	return ..()
 
 /datum/status_effect/process()
@@ -85,6 +88,13 @@
 	desc = "You don't feel any different..."
 	var/datum/status_effect/attached_effect
 
+/obj/screen/alert/status_effect/Destroy()
+	if(attached_effect)
+		attached_effect.linked_alert = null
+	attached_effect = null
+	return ..()
+
+
 //////////////////
 // HELPER PROCS //
 //////////////////

code/datums/supplypacks.dm

@@ -1204,7 +1204,7 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 	containername = "hydroponics crate"
 	announce_beacons = list("Hydroponics" = list("Hydroponics"))
 
-/datum/supply_packs/misc/hydroponics/hydrotank
+/datum/supply_packs/organic/hydroponics/hydrotank
 	name = "Hydroponics Watertank Crate"
 	contains = list(/obj/item/watertank)
 	cost = 10