Merge pull request #1 from Citadel-Station-13/master

a

code/datums/components/orbiter.dm

@@ -90,7 +90,7 @@
 		return
 	SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_END, orbiter, refreshing)
 	UnregisterSignal(orbiter, COMSIG_MOVABLE_MOVED)
-	orbiter.SpinAnimation(0, 0)
+	orbiter.SpinAnimation(0, 0, parallel = FALSE)
 	if(istype(orbiters[orbiter],/matrix)) //This is ugly.
 		orbiter.transform = orbiters[orbiter]
 	orbiters -= orbiter

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

@@ -159,9 +159,9 @@
 /datum/symptom/heal/metabolism/Heal(mob/living/carbon/C, datum/disease/advance/A, actual_power)
 	if(!istype(C))
 		return
-	C.reagents.metabolize(C, can_overdose=TRUE) //this works even without a liver; it's intentional since the virus is metabolizing by itself
+	C.reagents.metabolize(C, SSMOBS_DT, 0, can_overdose=TRUE) //this works even without a liver; it's intentional since the virus is metabolizing by itself
 	if(triple_metabolism)
-		C.reagents.metabolize(C, can_overdose=TRUE)
+		C.reagents.metabolize(C, SSMOBS_DT, 0, can_overdose=TRUE)
 	C.overeatduration = max(C.overeatduration - 2, 0)
 	var/lost_nutrition = 9 - (reduced_hunger * 5)
 	C.adjust_nutrition(-lost_nutrition * HUNGER_FACTOR) //Hunger depletes at 10x the normal speed

code/datums/elements/trash.dm

@@ -1,5 +1,5 @@
 /datum/element/trash
-	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+	element_flags = ELEMENT_DETACH
 
 /datum/element/trash/Attach(datum/target)
 	. = ..()

code/datums/ruins/lavaland.dm

@@ -35,6 +35,14 @@
 	cost = 10
 	allow_duplicates = FALSE
 
+/datum/map_template/ruin/lavaland/library
+	name = "Lavaland Library"
+	id = "llibrary"
+	description = "A once grand library, now lost to the confines of lavaland."
+	suffix = "lavaland_surface_library.dmm"
+	cost = 5
+	allow_duplicates = FALSE
+
 /datum/map_template/ruin/lavaland/seed_vault
 	name = "Seed Vault"
 	id = "seed-vault"
@@ -79,6 +87,20 @@
 	suffix = "lavaland_surface_animal_hospital.dmm"
 	allow_duplicates = FALSE
 
+/datum/map_template/ruin/lavaland/hotsprings
+	name = "Hot Springs"
+	id = "lhotsprings"
+	description = "Just relax and take a dip! Lavaland's finest hot springs await!"
+	suffix = "lavaland_surface_hotsprings.dmm"
+
+/datum/map_template/ruin/lavaland/engioutpost
+	name = "Engineer Outpost"
+	id = "lengioutpost"
+	description = "Blown up by an unfortunate accident."
+	suffix = "lavaland_surface_engioutpost.dmm"
+	cost = 10
+	allow_duplicates = FALSE
+
 /datum/map_template/ruin/lavaland/sin
 	cost = 10
 	allow_duplicates = FALSE
@@ -115,6 +137,24 @@
 	suffix = "lavaland_surface_sloth.dmm"
 	// Generates nothing but atmos runtimes and salt
 
+/datum/map_template/ruin/lavaland/sin/lust
+	name = "Ruin of Lust"
+	id = "llust"
+	description = "Not exactly what you expected."
+	suffix = "lavaland_surface_lust.dmm"
+
+/datum/map_template/ruin/lavaland/sin/wrath
+	name = "Ruin of Wrath"
+	id = "lwrath"
+	description = "You'll fight and fight and just keep fighting."
+	suffix = "lavaland_surface_wrath.dmm"
+
+/datum/map_template/ruin/lavaland/bathhouse
+	name = "Bath House"
+	id = "lbathhouse"
+	description = "A taste of paradise, locked in the hell of Lavaland."
+	suffix = "lavaland_surface_bathhouse.dmm"
+
 /datum/map_template/ruin/lavaland/ratvar
 	name = "Dead God"
 	id = "ratvar"
@@ -132,19 +172,20 @@
 
 /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"
+	description = "An insane, beastly miner contemplating stone tiles..."
 	always_place = TRUE
-	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"
+	allow_duplicates = FALSE
+	id = "blooddrunk"
+/datum/map_template/ruin/lavaland/blood_drunk_miner/New()
+	if(prob(25))
+		suffix = "lavaland_surface_blooddrunk1.dmm"
+	else if(prob(34))
+		suffix = "lavaland_surface_blooddrunk2.dmm"
+	else if(prob(50))
+		suffix = "lavaland_surface_blooddrunk3.dmm"
+	else
+		suffix = "lavaland_surface_mining_site.dmm"
+	. = ..()
 
 /datum/map_template/ruin/lavaland/ufo_crash
 	name = "UFO Crash"

code/datums/status_effects/debuffs.dm

@@ -199,6 +199,23 @@
 	movespeed_mod = /datum/movespeed_modifier/status_effect/tased/no_combat_mode
 	stamdmg_per_ds = 1
 
+/datum/status_effect/vtec_disabled
+	id = "vtec_disable"
+	tick = FALSE
+
+/datum/status_effect/vtec_disabled/on_creation(mob/living/new_owner, set_duration)
+	if(isnum(set_duration))
+		duration = set_duration
+	. = ..()
+	if(iscyborg(owner))
+		var/mob/living/silicon/robot/R = owner
+		R.vtec_disabled = TRUE
+
+/datum/status_effect/vtec_disabled/on_remove()
+	if(iscyborg(owner))
+		var/mob/living/silicon/robot/R = owner
+		R.vtec_disabled = FALSE
+	return ..()
 
 //OTHER DEBUFFS
 /datum/status_effect/his_wrath //does minor damage over time unless holding His Grace

code/datums/status_effects/status_effect.dm

@@ -5,6 +5,8 @@
 /datum/status_effect
 	var/id = "effect" //Used for screen alerts.
 	var/duration = -1 //How long the status effect lasts in DECISECONDS. Enter -1 for an effect that never ends unless removed through some means.
+	/// do we tick()?
+	var/tick = TRUE
 	var/tick_interval = 10 //How many deciseconds between ticks, approximately. Leave at 10 for every second.
 	var/next_tick //The scheduled time for the next tick.
 	var/mob/living/owner //The mob affected by the status effect.