shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Organ Update [Cloning isn't broken edition]

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-14 09:00:36 -05:00
parent eb5cce3b8b
commit 3ee26917bd
23 changed files with 243 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
View File

@@ -38,6 +38,8 @@ All effects don't start immediately, but rather get worse over time; the rate is
var/mob/living/carbon/human/H = M
if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
H.drunkenness = max((H.drunkenness + (sqrt(volume) * boozepwr * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
var/obj/item/organ/liver/L = H.getorganslot("liver")
H.applyLiverDamage((max(sqrt(volume) * boozepwr * L.alcohol_tolerance, 0))/10)
return ..() || .
/datum/reagent/consumable/ethanol/reaction_obj(obj/O, reac_volume)

4
code/modules/reagents/chemistry/reagents/medicine_reagents.dm
View File

@@ -686,7 +686,7 @@
taste_description = "dull toxin"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
if (!eyes)
return
if(M.disabilities & BLIND)
@@ -1129,7 +1129,7 @@
..()
/datum/reagent/medicine/corazone
// Heart attack code will not do as damage if corazone is present
// Heart attack code will not do damage if corazone is present
// because it's SPACE MAGIC ASPIRIN
name = "Corazone"
id = "corazone"