Merge remote-tracking branch 'upstream/master' into TGUI-3.0

This commit is contained in:
Artur
2020-05-22 16:19:17 +03:00
20 changed files with 69 additions and 31 deletions
@@ -274,7 +274,11 @@
/datum/reagent/medicine/silver_sulfadiazine/overdose_start(mob/living/M)
metabolization_rate = 15 * REAGENTS_METABOLISM
M.adjustBruteLoss(2*REM, 0)
..()
. = 1
/datum/reagent/medicine/silver_sulfadiazine/overdose_process(mob/living/M)
M.adjustFireLoss(2*REM, 0)
var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
if(L)
L.applyOrganDamage(1)
@@ -340,8 +344,12 @@
..()
. = 1
datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
/datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M)
metabolization_rate = 15 * REAGENTS_METABOLISM
..()
. = 1
/datum/reagent/medicine/styptic_powder/overdose_process(mob/living/M)
M.adjustBruteLoss(2*REM, 0)
var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
if(L)