cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

WierdChemAdjustments (#6990)

Browse Source
This commit is contained in:
FluffMedic
2023-09-18 11:47:29 -04:00
committed by GitHub
parent 7e6b350420
commit 680f9ab3a2
4 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/awaymissions/loot_vr.dm
View File

@@ -259,6 +259,8 @@
new /obj/item/weapon/storage/firstaid/combat(C) new /obj/item/weapon/storage/firstaid/combat(C)
if(prob(25)) if(prob(25))
new /obj/item/weapon/storage/firstaid/adv(C) new /obj/item/weapon/storage/firstaid/adv(C)
if(prob(25))
new /obj/item/weapon/storage/firstaid/experimental(C) //CHOMP Add
if("snacks") if("snacks")
//you're come so far, you must be in need of refreshment //you're come so far, you must be in need of refreshment
var/obj/structure/closet/crate/freezer/C = new(src.loc) var/obj/structure/closet/crate/freezer/C = new(src.loc)

2
modular_chomp/code/game/objects/items/weapons/storage/firstaid.dm
View File

@@ -59,7 +59,7 @@
//Pills //Pills
/obj/item/weapon/reagent_containers/pill/neotane /obj/item/weapon/reagent_containers/pill/neotane
name = "Neo Kelotane (15u)" name = "Neo Kelotane (10u)"
desc = "An experimental pill." desc = "An experimental pill."
icon_state = "pill2" icon_state = "pill2"

8
modular_chomp/code/modules/reagents/reactions/instant/instant.dm
View File

@@ -112,10 +112,10 @@
result_amount = 4 result_amount = 4
//tier 3 //tier 3
/decl/chemical_reaction/instant/liquidangel /decl/chemical_reaction/instant/liquidhealer
name = "liquidangel" name = "liquidhealer"
id = "liquidangel" id = "liquidhealer"
result = "liquidangel" result = "liquidhealer"
required_reagents = list("bicard" = 1, "kelotane" = 1, "liquidlife" = 1, "carpotoxin" = 1, "quadcord" = 1, "cryptobiolin" = 1) required_reagents = list("bicard" = 1, "kelotane" = 1, "liquidlife" = 1, "carpotoxin" = 1, "quadcord" = 1, "cryptobiolin" = 1)
result_amount = 6 result_amount = 6

45
modular_chomp/code/modules/reagents/reagents/medicine.dm
View File

@@ -262,6 +262,8 @@
scannable = 1 scannable = 1
overdose = REAGENTS_OVERDOSE * 2 overdose = REAGENTS_OVERDOSE * 2
affects_dead = TRUE affects_dead = TRUE
mrate_static = TRUE
metabolism = 0.5
/datum/reagent/souldew/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/souldew/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
var/chem_effective = 1 * M.species.chem_strength_heal var/chem_effective = 1 * M.species.chem_strength_heal
@@ -327,17 +329,44 @@
M.remove_a_modifier_of_type(/datum/modifier/fire) M.remove_a_modifier_of_type(/datum/modifier/fire)
//tier 3 //tier 3
/datum/reagent/modapplying/liquidangel /datum/reagent/modapplying/liquidhealer
name = "Liquid Healer" name = "Liquid Healer"
id = "liquidangel" id = "liquidhealer"
description = "An experimental drug that mimics rapid regeneration seen in squishy creatures." description = "An experimental drug that mimics rapid regeneration seen in squishy creatures."
taste_description = "sweet" taste_description = "sweet"
reagent_state = LIQUID reagent_state = LIQUID
color = "#00CCFF" color = "#00CCFF"
scannable = 1 scannable = 1
overdose = REAGENTS_OVERDOSE * 0.25 overdose = REAGENTS_OVERDOSE * 0.5
modifier_to_add = /datum/modifier/aura/slime_heal modifier_to_add = /datum/modifier/liquidhealer
modifier_duration = 2 SECONDS modifier_duration = 3 SECONDS
/datum/modifier/liquidhealer
name = "liquidhealer"
desc = "You are filled with an overwhelming healing."
on_created_text = "<span class='critical'>You feel your body's natural healing quick into overdrive!</span>"
on_expired_text = "<span class='notice'>Your body returns to normal.</span>"
incoming_healing_percent = 1.2
/datum/modifier/liquidhealer/tick()
if(holder.stat == DEAD)
expire()
if(ishuman(holder)) // Robolimbs need this code sadly.
var/mob/living/carbon/human/H = holder
for(var/obj/item/organ/external/E in H.organs)
var/obj/item/organ/external/O = E
O.heal_damage(1, 1, 0, 1)
else
holder.adjustBruteLoss(-1)
holder.adjustFireLoss(-1)
holder.adjustToxLoss(-1)
holder.adjustOxyLoss(-1)
holder.adjustCloneLoss(-1)
/datum/reagent/phoenixbreath /datum/reagent/phoenixbreath
name = "Phoenix Breath" name = "Phoenix Breath"
@@ -349,14 +378,16 @@
scannable = 1 scannable = 1
overdose = REAGENTS_OVERDOSE overdose = REAGENTS_OVERDOSE
affects_dead = TRUE affects_dead = TRUE
mrate_static = TRUE
metabolism = 0.5
/datum/reagent/phoenixbreath/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) /datum/reagent/phoenixbreath/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
var/chem_effective = 1 * M.species.chem_strength_heal var/chem_effective = 1 * M.species.chem_strength_heal
if(M.stat == DEAD) if(M.stat == DEAD)
M.adjustOxyLoss(-3 * removed * chem_effective) M.adjustOxyLoss(-3 * removed * chem_effective)
M.heal_organ_damage(3 * removed * chem_effective, 3 * removed * chem_effective) M.heal_organ_damage(4 * removed * chem_effective, 4 * removed * chem_effective)
M.adjustToxLoss(-3 * removed * chem_effective) M.adjustToxLoss(-3 * removed * chem_effective)
M.adjustOxyLoss(-2 * removed * chem_effective) M.adjustOxyLoss(-2 * removed * chem_effective)
M.heal_organ_damage(2 * removed * chem_effective, 3 * removed * chem_effective) M.heal_organ_damage(4 * removed * chem_effective, 4 * removed * chem_effective)
M.adjustToxLoss(-2 * removed * chem_effective) M.adjustToxLoss(-2 * removed * chem_effective)
M.add_chemical_effect(CE_PAINKILLER, 10 * M.species.chem_strength_pain) M.add_chemical_effect(CE_PAINKILLER, 10 * M.species.chem_strength_pain)