cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-30 08:38:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6149 from Novacat/nova-holowarrant

Browse Source 
Buffs adminordrazine
This commit is contained in:
Neerti
2019-05-05 20:06:47 -04:00
committed by GitHub
parent 18cebd13c7 7eeb7c0ce1
commit 083c4f599f
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+25 -2
View File
@@ -168,6 +168,7 @@
reagent_state = LIQUID
color = "#C8A5DC"
affects_dead = 1 //This can even heal dead people.
metabolism = 0.1
mrate_static = TRUE //Just in case
glass_name = "liquid gold"
@@ -180,8 +181,8 @@
M.setCloneLoss(0)
M.setOxyLoss(0)
M.radiation = 0
M.heal_organ_damage(5,5)
M.adjustToxLoss(-5)
M.heal_organ_damage(20,20)
M.adjustToxLoss(-20)
M.hallucination = 0
M.setBrainLoss(0)
M.disabilities = 0
@@ -198,6 +199,28 @@
M.SetConfused(0)
M.sleeping = 0
M.jitteriness = 0
M.radiation = 0
M.ExtinguishMob()
M.fire_stacks = 0
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
else if(M.bodytemperature < 311)
M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/wound_heal = 5
for(var/obj/item/organ/external/O in H.bad_external_organs)
if(O.status & ORGAN_BROKEN)
O.mend_fracture() //Only works if the bone won't rebreak, as usual
for(var/datum/wound/W in O.wounds)
if(W.bleeding())
W.damage = max(W.damage - wound_heal, 0)
if(W.damage <= 0)
O.wounds -= W
if(W.internal)
W.damage = max(W.damage - wound_heal, 0)
if(W.damage <= 0)
O.wounds -= W
/datum/reagent/gold
name = "Gold"
code/modules/reagents/reagent_containers/pill.dm
+2 -2
View File
@@ -122,11 +122,11 @@
/obj/item/weapon/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
desc = "It's magic. We don't have to explain it." //it's space magic you don't need the quantity
icon_state = "pill16"
icon_state = "pill15"
/obj/item/weapon/reagent_containers/pill/adminordrazine/Initialize()
. = ..()
reagents.add_reagent("adminordrazine", 50)
reagents.add_reagent("adminordrazine", 5)
/obj/item/weapon/reagent_containers/pill/stox
name = "Sleeping pill"