cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2103 from Fox-McCloud/reagent-balance

Browse Source 
Reagent Balance Tweaks
This commit is contained in:
Mark van Alphen
2015-09-21 02:10:36 +02:00
parent 467b51f3d2 9b5d15b0a6
commit 44fc7e80e2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/newchem/toxins.dm
+2 -2
View File
@@ -243,7 +243,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(volume >=5 && volume <=10)
if(!H.unacidable)
M.take_organ_damage(max(volume-5,2)*4,0)
M.take_organ_damage(0,max(volume-5,2)*4)
M.emote("scream")
@@ -270,7 +270,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
if(!H.unacidable)
var/obj/item/organ/external/affecting = H.get_organ("head")
affecting.take_damage(75, 0)
affecting.take_damage(0, 75)
H.UpdateDamageIcon()
H.emote("scream")
H.status_flags |= DISFIGURED
code/modules/reagents/oldchem/reagents/reagents_toxin.dm
+8 -7
View File
@@ -187,7 +187,8 @@
/datum/reagent/radium/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.apply_effect(4*REM,IRRADIATE,0)
if(M.radiation < 80)
M.apply_effect(4,IRRADIATE,0)
// radium may increase your chances to cure a disease
if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs
var/mob/living/carbon/C = M
@@ -313,13 +314,13 @@
if(prob(75))
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
affecting.take_damage(20, 0)
affecting.take_damage(5, 10)
H.UpdateDamageIcon()
H.emote("scream")
else
M.take_organ_damage(15,0)
M.take_organ_damage(5,10)
else
M.take_organ_damage(15,0)
M.take_organ_damage(5,10)
if(method == INGEST)
if(ishuman(M))
@@ -330,7 +331,7 @@
if(volume >=10 && volume <=25)
if(!H.unacidable)
M.take_organ_damage(min(max(volume-10,2)*2,20),0)
M.take_organ_damage(0,min(max(volume-10,2)*2,20))
M.emote("scream")
@@ -339,11 +340,11 @@
if(prob(75))
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
affecting.take_damage(20, 0)
affecting.take_damage(0, 20)
H.UpdateDamageIcon()
H.emote("scream")
else
M.take_organ_damage(15,0)
M.take_organ_damage(0,20)
/datum/reagent/sacid/reaction_obj(var/obj/O, var/volume)
if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40))