[MIRROR] Adds the Ancient Cloning Lab ruin (#5814)

* Adds the Ancient Cloning Lab ruin

* fixes conflicts
This commit is contained in:
CitadelStationBot
2018-03-05 15:20:49 -06:00
committed by Poojawa
parent 032511a03e
commit 766b85908e
24 changed files with 1221 additions and 368 deletions
+3 -1
View File
@@ -251,7 +251,7 @@
R.handle_reactions()
return amount
/datum/reagents/proc/metabolize(mob/living/carbon/C, can_overdose = 0)
/datum/reagents/proc/metabolize(mob/living/carbon/C, can_overdose = FALSE, liverless = FALSE)
var/list/cached_reagents = reagent_list
var/list/cached_addictions = addiction_list
if(C)
@@ -261,6 +261,8 @@
var/datum/reagent/R = reagent
if(QDELETED(R.holder))
continue
if(liverless && !R.self_consuming) //need to be metabolized
continue
if(!C)
C = R.holder.my_atom
if(C && R)
@@ -31,6 +31,7 @@
var/addiction_threshold = 0
var/addiction_stage = 0
var/overdosed = 0 // You fucked up and this is now triggering its overdose effects, purge that shit quick.
var/self_consuming = FALSE
/datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references
. = ..()
@@ -1192,6 +1192,7 @@
id = "corazone"
description = "A medication used to treat pain, fever, and inflammation, along with heart attacks."
color = "#F5F5F5"
self_consuming = TRUE
/datum/reagent/medicine/muscle_stimulant
name = "Muscle Stimulant"
@@ -808,6 +808,7 @@
toxpwr = 1
var/acidpwr = 10 //the amount of protection removed from the armour
taste_description = "acid"
self_consuming = TRUE
/datum/reagent/toxin/acid/reaction_mob(mob/living/carbon/C, method=TOUCH, reac_volume)
if(!istype(C))