Merge remote-tracking branch 'upstream/master' into diagonal-movement

code/datums/action.dm

@@ -386,6 +386,13 @@
 /datum/action/item_action/remove_badge
 	name = "Remove Holobadge"
 
+// Jump boots
+/datum/action/item_action/bhop
+	name = "Activate Jump Boots"
+	desc = "Activates the jump boot's internal propulsion system, allowing the user to dash over 4-wide gaps."
+	icon_icon = 'icons/mob/actions/actions.dmi'
+	button_icon_state = "jetboot"
+
 ///prset for organ actions
 /datum/action/item_action/organ_action
 	check_flags = AB_CHECK_CONSCIOUS

code/datums/cache/air_alarm.dm

@@ -13,15 +13,16 @@ var/global/datum/repository/air_alarm/air_alarm_repository = new()
 
 	if(SSticker && SSticker.current_state < GAME_STATE_PLAYING && istype(passed_alarm)) // Generating the list for the first time as the game hasn't started - no need to run through the machines list everything every time 
 		alarms = cache_entry.data // Don't deleate the list
-		if(is_station_contact(passed_alarm.z)) // Still need sanity checks
+		if(is_station_contact(passed_alarm.z) && passed_alarm.remote_control) // Still need sanity checks
 			alarms[++alarms.len] = passed_alarm.get_nano_data_console() 
 	else
 		for(var/obj/machinery/alarm/alarm in (monitored_alarms ? monitored_alarms : GLOB.air_alarms)) // Generating the whole list again is a bad habit but I can't be bothered to fix it right now
 			if(!monitored_alarms && !is_station_contact(alarm.z)) 
 				continue
+			if(!alarm.remote_control)
+				continue
 			alarms[++alarms.len] = alarm.get_nano_data_console()
 
-
 	cache_entry.timestamp = world.time //+ 10 SECONDS
 	cache_entry.data = alarms
 	return alarms

code/datums/cache/powermonitor.dm

@@ -12,7 +12,7 @@ var/global/datum/repository/powermonitor/powermonitor_repository = new()
 		return cache_entry.data
 	
 	for(var/obj/machinery/computer/monitor/pMon in GLOB.power_monitors)
-		if( !(pMon.stat & (NOPOWER|BROKEN)) )
+		if( !(pMon.stat & (NOPOWER|BROKEN)) && !pMon.is_secret_monitor  )
 			pMonData[++pMonData.len] = list ("Name" = pMon.name, "ref" = "\ref[pMon]")
 
 	cache_entry.timestamp = world.time //+ 30 SECONDS

code/datums/components/_component.dm

@@ -2,6 +2,10 @@
 	var/dupe_mode = COMPONENT_DUPE_HIGHLANDER
 	var/dupe_type
 	var/datum/parent
+	//only set to true if you are able to properly transfer this component
+	//At a minimum RegisterWithParent and UnregisterFromParent should be used
+	//Make sure you also implement PostTransfer for any post transfer handling
+	var/can_transfer = FALSE
 
 /datum/component/New(datum/P, ...)
 	parent = P
@@ -154,7 +158,7 @@
 	return
 
 /datum/component/proc/PostTransfer()
-	return
+	return COMPONENT_INCOMPATIBLE //Do not support transfer by default as you must properly support it
 
 /datum/component/proc/_GetInverseTypeList(our_type = type)
 	//we can do this one simple trick
@@ -281,10 +285,13 @@
 	if(target.parent)
 		target.RemoveComponent()
 	target.parent = src
-	if(target.PostTransfer() == COMPONENT_INCOMPATIBLE)
-		var/c_type = target.type
-		qdel(target)
-		CRASH("Incompatible [c_type] transfer attempt to a [type]!")
+	var/result = target.PostTransfer()
+	switch(result)
+		if(COMPONENT_INCOMPATIBLE)
+			var/c_type = target.type
+			qdel(target)
+			CRASH("Incompatible [c_type] transfer attempt to a [type]!")
+
 	if(target == AddComponent(target))
 		target._JoinParent()
 
@@ -294,10 +301,13 @@
 		return
 	var/comps = dc[/datum/component]
 	if(islist(comps))
-		for(var/I in comps)
-			target.TakeComponent(I)
+		for(var/datum/component/I in comps)
+			if(I.can_transfer)
+				target.TakeComponent(I)
 	else
-		target.TakeComponent(comps)
+		var/datum/component/C = comps
+		if(C.can_transfer)
+			target.TakeComponent(comps)
 
 /datum/component/nano_host()
 	return parent

code/datums/components/decal.dm

@@ -0,0 +1,75 @@
+/datum/component/decal
+	dupe_mode = COMPONENT_DUPE_ALLOWED
+	can_transfer = TRUE
+	var/cleanable
+	var/description
+	var/mutable_appearance/pic
+
+	var/first_dir // This only stores the dir arg from init
+
+/datum/component/decal/Initialize(_icon, _icon_state, _dir, _cleanable=CLEAN_GOD, _color, _layer=TURF_LAYER, _description, _alpha=255)
+	if(!isatom(parent) || !generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha))
+		return COMPONENT_INCOMPATIBLE
+	first_dir = _dir
+	description = _description
+	cleanable = _cleanable
+
+	apply()
+
+/datum/component/decal/RegisterWithParent()
+	if(first_dir)
+		RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
+	if(cleanable)
+		RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+	if(description)
+		RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
+
+/datum/component/decal/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE))
+
+/datum/component/decal/Destroy()
+	remove()
+	return ..()
+
+/datum/component/decal/PreTransfer()
+	remove()
+
+/datum/component/decal/PostTransfer()
+	remove()
+	apply()
+
+/datum/component/decal/proc/generate_appearance(_icon, _icon_state, _dir, _layer, _color, _alpha)
+	if(!_icon || !_icon_state)
+		return FALSE
+	// It has to be made from an image or dir breaks because of a byond bug
+	var/temp_image = image(_icon, null, _icon_state, _layer, _dir)
+	pic = new(temp_image)
+	pic.color = _color
+	pic.alpha = _alpha
+	return TRUE
+
+/datum/component/decal/proc/apply(atom/thing)
+	var/atom/master = thing || parent
+	master.add_overlay(pic, TRUE)
+	if(isitem(master))
+		addtimer(CALLBACK(master, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE)
+
+/datum/component/decal/proc/remove(atom/thing)
+	var/atom/master = thing || parent
+	master.cut_overlay(pic, TRUE)
+	if(isitem(master))
+		addtimer(CALLBACK(master, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE)
+
+/datum/component/decal/proc/rotate_react(datum/source, old_dir, new_dir)
+	if(old_dir == new_dir)
+		return
+	remove()
+	pic.dir = turn(pic.dir, dir2angle(old_dir) - dir2angle(new_dir))
+	apply()
+
+/datum/component/decal/proc/clean_react(datum/source, strength)
+	if(strength >= cleanable)
+		qdel(src)
+
+/datum/component/decal/proc/examine(datum/source, mob/user)
+	to_chat(user, description)

code/datums/diseases/critical.dm

@@ -92,6 +92,12 @@
 	bypasses_immunity = TRUE
 	virus_heal_resistant = TRUE
 
+/datum/disease/critical/heart_failure/has_cure()
+	if(affected_mob.has_status_effect(STATUS_EFFECT_EXERCISED))
+		return TRUE
+
+	return ..()
+
 /datum/disease/critical/heart_failure/stage_act()
 	if(..())
 		switch(stage)

code/datums/gas_mixture.dm

@@ -203,6 +203,10 @@ What are the archived variables for?
 /datum/gas_mixture/proc/copy_from(datum/gas_mixture/sample)
 	//Copies variables from sample
 
+/datum/gas_mixture/proc/copy_from_turf(turf/model)
+	//Copies all gas info from the turf into the gas list along with temperature
+	//Returns: 1 if we are mutable, 0 otherwise
+
 /datum/gas_mixture/proc/share(datum/gas_mixture/sharer)
 	//Performs air sharing calculations between two gas_mixtures assuming only 1 boundary length
 	//Return: amount of gas exchanged (+ if sharer received)
@@ -343,6 +347,19 @@ What are the archived variables for?
 
 	return 1
 
+/datum/gas_mixture/copy_from_turf(turf/model)
+	oxygen = model.oxygen
+	carbon_dioxide = model.carbon_dioxide
+	nitrogen = model.nitrogen
+	toxins = model.toxins
+
+	//acounts for changes in temperature
+	var/turf/model_parent = model.parent_type
+	if(model.temperature != initial(model.temperature) || model.temperature != initial(model_parent.temperature))
+		temperature = model.temperature
+
+	return 1
+
 /datum/gas_mixture/check_turf(turf/model, atmos_adjacent_turfs = 4)
 	var/delta_oxygen = (oxygen_archived - model.oxygen)/(atmos_adjacent_turfs+1)
 	var/delta_carbon_dioxide = (carbon_dioxide_archived - model.carbon_dioxide)/(atmos_adjacent_turfs+1)

code/datums/helper_datums/map_template.dm

@@ -123,7 +123,7 @@
 		banned = generateMapList("config/spaceRuinBlacklist.txt")
 	else
 		banned = generateMapList("config/example/spaceRuinBlacklist.txt")
-	//banned += generateMapList("config/lavaRuinBlacklist.txt")
+	banned += generateMapList("config/lavaRuinBlacklist.txt")
 
 	for(var/item in subtypesof(/datum/map_template/ruin))
 		var/datum/map_template/ruin/ruin_type = item
@@ -138,10 +138,8 @@
 		map_templates[R.name] = R
 		ruins_templates[R.name] = R
 
-		/*
 		if(istype(R, /datum/map_template/ruin/lavaland))
 			lava_ruins_templates[R.name] = R
-		*/
 		if(istype(R, /datum/map_template/ruin/space))
 			space_ruins_templates[R.name] = R
 

code/datums/mind.dm

@@ -18,7 +18,6 @@
 		However if you want that mind to have any special properties like being a traitor etc you will have to do that
 		yourself.
 */
-#define SUMMON_POSSIBILITIES 3
 
 /datum/mind
 	var/key

code/datums/ruins.dm

@@ -7,8 +7,12 @@
 		wooden container filled with 18th century coinage in the middle of a \
 		lavawracked hellscape? It is clearly a mystery."
 
-	var/cost = null
-	var/allow_duplicates = FALSE //A bit boring, don't you think? You can always explicitly allow it on a ruin definition
+	var/unpickable = FALSE 	 //If TRUE these won't be placed automatically (can still be forced or loaded with another ruin)
+	var/always_place = FALSE //Will skip the whole weighting process and just plop this down, ideally you want the ruins of this kind to have no cost.
+	var/placement_weight = 1 //How often should this ruin appear
+	var/cost = 0 //Cost in ruin budget placement system
+	var/allow_duplicates = TRUE
+	var/list/never_spawn_with = null //If this ruin is spawned these will not eg list(/datum/map_template/ruin/base_alternate)
 
 	var/prefix = null
 	var/suffix = null

code/datums/ruins/lavaland.dm

@@ -0,0 +1,87 @@
+/datum/map_template/ruin/lavaland
+	prefix = "_maps/map_files/RandomRuins/LavaRuins/"
+
+/datum/map_template/ruin/lavaland/biodome
+	cost = 5
+	allow_duplicates = FALSE
+
+/datum/map_template/ruin/lavaland/biodome/beach
+	name = "Biodome Beach"
+	id = "biodome-beach"
+	description = "Seemingly plucked from a tropical destination, this beach is calm and cool, with the salty waves roaring softly in the background. \
+	Comes with a rustic wooden bar and suicidal bartender."
+	suffix = "lavaland_biodome_beach.dmm"
+
+/datum/map_template/ruin/lavaland/seed_vault
+	name = "Seed Vault"
+	id = "seed-vault"
+	description = "The creators of these vaults were a highly advanced and benevolent race, and launched many into the stars, hoping to aid fledgling civilizations. \
+	However, all the inhabitants seem to do is grow drugs and guns."
+	suffix = "lavaland_surface_seed_vault.dmm"
+	cost = 10
+	allow_duplicates = FALSE
+
+datum/map_template/ruin/lavaland/ash_walker
+	name = "Ash Walker Nest"
+	id = "ash-walker"
+	description = "A race of unbreathing lizards live here, that run faster than a human can, worship a broken dead city, and are capable of reproducing by something involving tentacles? \
+	Probably best to stay clear."
+	suffix = "lavaland_surface_ash_walker1.dmm"
+	cost = 20
+	allow_duplicates = FALSE
+
+/datum/map_template/ruin/lavaland/syndicate_base
+	name = "Syndicate Lava Base"
+	id = "lava-base"
+	description = "A secret base researching illegal bioweapons, it is closely guarded by an elite team of syndicate agents."
+	suffix = "lavaland_surface_syndicate_base1.dmm"
+	cost = 20
+	allow_duplicates = FALSE
+
+/datum/map_template/ruin/lavaland/animal_hospital
+	name = "Animal Hospital"
+	id = "animal-hospital"
+	description = "Rats with cancer do not live very long. And the ones that wake up from cryostasis seem to commit suicide out of boredom."
+	cost = 5
+	suffix = "lavaland_surface_animal_hospital.dmm"
+	allow_duplicates = FALSE
+
+/datum/map_template/ruin/lavaland/hierophant
+	name = "Hierophant's Arena"
+	id = "hierophant"
+	description = "A strange, square chunk of metal of massive size. Inside awaits only death and many, many squares."
+	suffix = "lavaland_surface_hierophant.dmm"
+	allow_duplicates = FALSE
+	always_place = TRUE
+
+/datum/map_template/ruin/lavaland/blood_drunk_miner
+	name = "Blood-Drunk Miner"
+	id = "blooddrunk"
+	description = "A strange arrangement of stone tiles and an insane, beastly miner contemplating them."
+	suffix = "lavaland_surface_blooddrunk1.dmm"
+	cost = 0
+	allow_duplicates = FALSE //will only spawn one variant of the ruin
+
+/datum/map_template/ruin/lavaland/blood_drunk_miner/guidance
+	name = "Blood-Drunk Miner (Guidance)"
+	suffix = "lavaland_surface_blooddrunk2.dmm"
+
+/datum/map_template/ruin/lavaland/blood_drunk_miner/hunter
+	name = "Blood-Drunk Miner (Hunter)"
+	suffix = "lavaland_surface_blooddrunk3.dmm"
+
+/datum/map_template/ruin/lavaland/hermit
+	name = "Makeshift Shelter"
+	id = "hermitcave"
+	description = "A place of shelter for a lone hermit, scraping by to live another day."
+	suffix = "lavaland_surface_hermit.dmm"
+	allow_duplicates = FALSE
+	cost = 10
+
+/datum/map_template/ruin/lavaland/swarmer_boss
+	name = "Crashed Shuttle"
+	id = "swarmerboss"
+	description = "A Syndicate shuttle had an unfortunate stowaway..."
+	suffix = "lavaland_surface_swarmer_crash.dmm"
+	allow_duplicates = FALSE
+	cost = 20

code/datums/spell.dm

@@ -62,6 +62,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 	var/charge_type = "recharge" //can be recharge or charges, see charge_max and charge_counter descriptions; can also be based on the holder's vars now, use "holder_var" for that
 
 	var/charge_max = 100 //recharge time in deciseconds if charge_type = "recharge" or starting charges if charge_type = "charges"
+	var/starts_charged = TRUE //Does this spell start ready to go?
 	var/charge_counter = 0 //can only cast spells if it equals recharge, ++ each decisecond if charge_type = "recharge" or -- each cast if charge_type = "charges"
 	var/still_recharging_msg = "<span class='notice'>The spell is still recharging.</span>"
 
@@ -195,9 +196,11 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 /obj/effect/proc_holder/spell/New()
 	..()
 	action = new(src)
-
 	still_recharging_msg = "<span class='notice'>[name] is still recharging.</span>"
-	charge_counter = charge_max
+	if(starts_charged)
+		charge_counter = charge_max
+	else
+		start_recharge()
 
 /obj/effect/proc_holder/spell/Destroy()
 	QDEL_NULL(action)
@@ -214,9 +217,14 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
 /obj/effect/proc_holder/spell/proc/start_recharge()
 	if(action)
 		action.UpdateButtonIcon()
-	while(charge_counter < charge_max)
-		sleep(1)
-		charge_counter++
+	START_PROCESSING(SSfastprocess, src)
+
+/obj/effect/proc_holder/spell/process()
+	charge_counter += 2
+	if(charge_counter < charge_max)
+		return
+	STOP_PROCESSING(SSfastprocess, src)
+	charge_counter = charge_max
 	if(action)
 		action.UpdateButtonIcon()
 

code/datums/statclick.dm

@@ -1,12 +1,13 @@
-// Not TECHNICALLY a datum, but this should never be instantiated
-// outside of the stat panel
 // Clickable stat() button
 /obj/effect/statclick
 	var/target
 
-/obj/effect/statclick/New(ntarget, text)
-	target = ntarget
+INITIALIZE_IMMEDIATE(/obj/effect/statclick)
+
+/obj/effect/statclick/Initialize(mapload, text, target)
+	. = ..()
 	name = text
+	src.target = target
 
 /obj/effect/statclick/proc/update(text)
 	name = text
@@ -19,10 +20,6 @@
 	if(!is_admin(usr) || !target)
 		return
 	if(!class)
-		if(istype(target, /datum/controller/process))
-			class = "process"
-		else if(istype(target, /datum/controller/processScheduler))
-			class = "scheduler"
 		if(istype(target, /datum/controller/subsystem))
 			class = "subsystem"
 		else if(istype(target, /datum/controller))

code/datums/status_effects/buffs.dm

@@ -38,4 +38,18 @@
 
 /datum/status_effect/void_price/tick()
 	playsound(owner, 'sound/weapons/bite.ogg', 50, 1)
-	owner.adjustBruteLoss(3)
+	owner.adjustBruteLoss(3)
+
+/datum/status_effect/exercised
+	id = "Exercised"
+	duration = 1200
+	alert_type = null
+
+/datum/status_effect/exercised/on_creation(mob/living/new_owner, ...)
+	. = ..()
+	STOP_PROCESSING(SSfastprocess, src)
+	START_PROCESSING(SSprocessing, src) //this lasts 20 minutes, so SSfastprocess isn't needed.
+
+/datum/status_effect/exercised/Destroy()
+	. = ..()
+	STOP_PROCESSING(SSprocessing, src)

code/datums/status_effects/debuffs.dm

@@ -7,4 +7,76 @@
 
 /datum/status_effect/cultghost/tick()
 	if(owner.reagents)
-		owner.reagents.del_reagent("holywater") //can't be deconverted
+		owner.reagents.del_reagent("holywater") //can't be deconverted
+
+/datum/status_effect/saw_bleed
+	id = "saw_bleed"
+	duration = -1 //removed under specific conditions
+	tick_interval = 6
+	alert_type = null
+	var/mutable_appearance/bleed_overlay
+	var/mutable_appearance/bleed_underlay
+	var/bleed_amount = 3
+	var/bleed_buildup = 3
+	var/delay_before_decay = 5
+	var/bleed_damage = 200
+	var/needs_to_bleed = FALSE
+
+/datum/status_effect/saw_bleed/Destroy()
+	if(owner)
+		owner.cut_overlay(bleed_overlay)
+		owner.underlays -= bleed_underlay
+	QDEL_NULL(bleed_overlay)
+	return ..()
+
+/datum/status_effect/saw_bleed/on_apply()
+	if(owner.stat == DEAD)
+		return FALSE
+	bleed_overlay = mutable_appearance('icons/effects/bleed.dmi', "bleed[bleed_amount]")
+	bleed_underlay = mutable_appearance('icons/effects/bleed.dmi', "bleed[bleed_amount]")
+	var/icon/I = icon(owner.icon, owner.icon_state, owner.dir)
+	var/icon_height = I.Height()
+	bleed_overlay.pixel_x = -owner.pixel_x
+	bleed_overlay.pixel_y = FLOOR(icon_height * 0.25, 1)
+	bleed_overlay.transform = matrix() * (icon_height/world.icon_size) //scale the bleed overlay's size based on the target's icon size
+	bleed_underlay.pixel_x = -owner.pixel_x
+	bleed_underlay.transform = matrix() * (icon_height/world.icon_size) * 3
+	bleed_underlay.alpha = 40
+	owner.add_overlay(bleed_overlay)
+	owner.underlays += bleed_underlay
+	return ..()
+
+/datum/status_effect/saw_bleed/tick()
+	if(owner.stat == DEAD)
+		qdel(src)
+	else
+		add_bleed(-1)
+
+/datum/status_effect/saw_bleed/proc/add_bleed(amount)
+	owner.cut_overlay(bleed_overlay)
+	owner.underlays -= bleed_underlay
+	bleed_amount += amount
+	if(bleed_amount)
+		if(bleed_amount >= 10)
+			needs_to_bleed = TRUE
+			qdel(src)
+		else
+			if(amount > 0)
+				tick_interval += delay_before_decay
+			bleed_overlay.icon_state = "bleed[bleed_amount]"
+			bleed_underlay.icon_state = "bleed[bleed_amount]"
+			owner.add_overlay(bleed_overlay)
+			owner.underlays += bleed_underlay
+	else
+		qdel(src)
+
+/datum/status_effect/saw_bleed/on_remove()
+	if(needs_to_bleed)
+		var/turf/T = get_turf(owner)
+		new /obj/effect/temp_visual/bleed/explode(T)
+		for(var/d in alldirs)
+			new /obj/effect/temp_visual/dir_setting/bloodsplatter(T, d)
+		playsound(T, "desceration", 200, 1, -1)
+		owner.adjustBruteLoss(bleed_damage)
+	else
+		new /obj/effect/temp_visual/bleed(get_turf(owner))

code/datums/supplypacks.dm

@@ -1108,7 +1108,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	name = "Cat Crate"
 	cost = 50 //Cats are worth as much as corgis.
 	containertype = /obj/structure/closet/critter/cat
-	contains = list(/obj/item/clothing/accessory/petcollar)
+	contains = list(/obj/item/clothing/accessory/petcollar,
+					/obj/item/toy/cattoy)
 	containername = "cat crate"
 
 /datum/supply_packs/organic/pug
@@ -1211,7 +1212,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					/obj/item/honey_frame,
 					/obj/item/queen_bee/bought,
 					/obj/item/clothing/head/beekeeper_head,
-					/obj/item/clothing/suit/beekeeper_suit)
+					/obj/item/clothing/suit/beekeeper_suit,
+					/obj/item/melee/flyswatter)
 	cost = 15
 	containername = "beekeeping starter kit"
 
@@ -1360,6 +1362,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	cost = 40
 	containername = "religious supplies crate"
 
+/datum/supply_packs/misc/minerkit
+	name = "Shaft Miner Starter Kit"
+	cost = 30
+	access = access_qm
+	contains = list(/obj/item/storage/backpack/duffel/mining_conscript)
+	containertype = /obj/structure/closet/crate/secure
+	containername = "shaft miner starter kit"
+
 
 ///////////// Paper Work
 

code/datums/weather/weather.dm

@@ -107,6 +107,8 @@
 
 /datum/weather/proc/can_weather_act(mob/living/L) //Can this weather impact a mob?
 	var/turf/mob_turf = get_turf(L)
+	if(!istype(L))
+		return
 	if(mob_turf && !(mob_turf.z in impacted_z_levels))
 		return
 	if(immunity_type in L.weather_immunities)

code/datums/weather/weather_types/ash_storm.dm

@@ -16,12 +16,12 @@
 	end_duration = 300
 	end_overlay = "light_ash"
 
-	area_type = /area/mine/dangerous // /area/lavaland/surface/outdoors
+	area_type = /area/lavaland/surface/outdoors
 	target_trait = ORE_LEVEL
 
 	immunity_type = "ash"
 
-//	probability = 90
+	probability = 90
 
 	barometer_predictable = TRUE
 
@@ -105,4 +105,4 @@
 
 	aesthetic = TRUE
 
-//	probability = 10
+	probability = 10