Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent.

This commit is contained in:
Erthilo
2013-09-01 21:23:37 +01:00
parent 44540ab61f
commit c872099e11
5 changed files with 1567 additions and 1571 deletions

View File

@@ -334,7 +334,7 @@
src.icon_state = "pod_0"
src.eject_wait = 0 //If it's still set somehow.
domutcheck(src.occupant) //Waiting until they're out before possible monkeyizing.
src.occupant.add_side_effect("Bad Stomach") // Give them an extra side-effect for free.
// src.occupant.add_side_effect("Bad Stomach") // Give them an extra side-effect for free.
src.occupant = null
src.biomass -= CLONE_BIOMASS

View File

@@ -506,6 +506,27 @@ datum
return res
remove_all_type(var/reagent_type, var/amount, var/strict = 0, var/safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included.
if(!isnum(amount)) return 1
var/has_removed_reagent = 0
for(var/datum/reagent/R in reagent_list)
var/matches = 0
// Switch between how we check the reagent type
if(strict)
if(R.type == reagent_type)
matches = 1
else
if(istype(R, reagent_type))
matches = 1
// We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type.
if(matches)
// Have our other proc handle removement
has_removed_reagent = remove_reagent(R.id, amount, safety)
return has_removed_reagent
//two helper functions to preserve data across reactions (needed for xenoarch)
get_data(var/reagent_id)
for(var/datum/reagent/D in reagent_list)

File diff suppressed because it is too large Load Diff

View File

@@ -71,10 +71,10 @@
#define DOOR_CRUSH_DAMAGE 10
// Factor of how fast mob nutrition decreases
#define HUNGER_FACTOR 0.05
#define HUNGER_FACTOR 0.05
// How many units of reagent are consumed per tick, by default.
#define REAGENTS_METABOLISM 0.2
#define REAGENTS_METABOLISM 0.2
// By defining the effect multiplier this way, it'll exactly adjust
// all effects according to how they originally were with the 0.4 metabolism