cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 22:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks how overdoses works and medicine related overdose (#3116)

Browse Source 
-overdoses should happen at the start of the processing, instead just at the end, giving more chance for people to react to them
-reduce the damage from overdoses related to medicine and made anti toxin have a normal overdose cap
This commit is contained in:
Alberyk
2017-07-21 15:26:24 -03:00
committed by Erki Meinberg
parent 283f63d098
commit dab522488a
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -61,7 +61,7 @@
if(!dose && volume)//If dose is currently zero, we do the first effect
initial_effect(M, alien)
if(overdose && (dose > overdose) && (location != CHEM_TOUCH))
if(overdose && (volume > overdose) && (location != CHEM_TOUCH))
overdose(M, alien)
var/removed = metabolism
if(ingest_met && (location == CHEM_INGEST))

14
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
View File

@@ -51,7 +51,7 @@
healpower = W.heal_damage(healpower,1)
if (healpower <= 0)
return
M.adjustBruteLoss(8) //but not without a price, of course
M.adjustBruteLoss(7) //but not without a price, of course
/datum/reagent/kelotane
name = "Kelotane"
@@ -88,7 +88,7 @@
/datum/reagent/dermaline/overdose(var/mob/living/carbon/M, var/alien)
if(alien != IS_DIONA)
M.adjustFireLoss(18)
M.adjustFireLoss(15)
/datum/reagent/dylovene
name = "Dylovene"
@@ -97,7 +97,7 @@
reagent_state = LIQUID
color = "#00A000"
scannable = 1
overdose = REAGENTS_OVERDOSE * 0.7
overdose = REAGENTS_OVERDOSE
taste_description = "a roll of gauze"
/datum/reagent/dylovene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
@@ -108,7 +108,7 @@
/datum/reagent/kelotane/overdose(var/mob/living/carbon/M, var/alien)
if(alien != IS_DIONA)
M.adjustToxLoss(8)
M.adjustToxLoss(6)
/datum/reagent/dexalin
name = "Dexalin"
@@ -130,7 +130,7 @@
/datum/reagent/dexalin/overdose(var/mob/living/carbon/M, var/alien)
if(alien != IS_DIONA)
M.adjustOxyLoss(30)
M.adjustOxyLoss(20)
/datum/reagent/dexalinp
name = "Dexalin Plus"
@@ -169,9 +169,7 @@
/datum/reagent/tricordrazine/overdose(var/mob/living/carbon/M, var/alien)
if(alien != IS_DIONA)
M.adjustToxLoss(6)
M.adjustBruteLoss(6)
M.adjustFireLoss(6)
M.adjustOxyLoss(12)
M.adjustOxyLoss(8)
/datum/reagent/cryoxadone
name = "Cryoxadone"