Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nerfs Regulating property #6210

Closed
wants to merge 3 commits into from
Closed

Nerfs Regulating property #6210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a050bc4
Update Chemistry-Reagents.dm
iloveloopers Apr 29, 2024
846cb01
Update prop_positive.dm
iloveloopers Apr 29, 2024
f5da4cc
Update prop_special.dm
iloveloopers Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions code/modules/reagents/Chemistry-Reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,17 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent())
if(potency <= 0)
continue
P.process(M, potency, delta_time)
if(flags & REAGENT_CANNOT_OVERDOSE)
continue
if(overdose && volume > overdose)
P.process_overdose(M, potency, delta_time)
if(overdose_critical && volume > overdose_critical)
P.process_critical(M, potency, delta_time)
var/overdose_message = "[istype(src, /datum/reagent/generated) ? "custom chemical" : initial(name)] overdose"
M.last_damage_data = create_cause_data(overdose_message, last_source_mob?.resolve())
if(flags & REAGENT_CANNOT_OVERDOSE)
var/ammount_overdosed = volume - overdose
holder.remove_reagent(id, ammount_overdosed)
holder.add_reagent("sugar", ammount_overdosed)
else
P.process_overdose(M, potency, delta_time)
if(overdose_critical && volume > overdose_critical)
P.process_critical(M, potency, delta_time)
var/overdose_message = "[istype(src, /datum/reagent/generated) ? "custom chemical" : initial(name)] overdose"
M.last_damage_data = create_cause_data(overdose_message, last_source_mob?.resolve())

if(mods[REAGENT_PURGE])
holder.remove_all_type(/datum/reagent,mods[REAGENT_PURGE] * delta_time)
Expand Down
17 changes: 17 additions & 0 deletions code/modules/reagents/chemistry_properties/prop_positive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,3 +992,20 @@

/datum/chem_property/positive/anticarcinogenic/process_critical(mob/living/M, potency = 1)
M.take_limb_damage(POTENCY_MULTIPLIER_MEDIUM * potency)//Hyperactive apoptosis

/datum/chem_property/positive/regulating
name = PROPERTY_REGULATING
code = "REG"
description = "The chemical regulates its own metabolization, any ammount overdosed is turned into sugar."
rarity = PROPERTY_COMMON
category = PROPERTY_TYPE_METABOLITE
max_level = 1
value = 0

/datum/chem_property/positive/regulating/reset_reagent()
holder.flags = initial(holder.flags)
..()

/datum/chem_property/positive/regulating/update_reagent()
holder.flags |= REAGENT_CANNOT_OVERDOSE
..()
16 changes: 0 additions & 16 deletions code/modules/reagents/chemistry_properties/prop_special.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,6 @@
/datum/chem_property/special/boosting/pre_process(mob/living/M)
return list(REAGENT_BOOST = level)

/datum/chem_property/special/regulating
name = PROPERTY_REGULATING
code = "REG"
description = "The chemical regulates its own metabolization and can thus never cause overdosis."
rarity = PROPERTY_LEGENDARY
category = PROPERTY_TYPE_METABOLITE
max_level = 1

/datum/chem_property/special/regulating/reset_reagent()
holder.flags = initial(holder.flags)
..()

/datum/chem_property/special/regulating/update_reagent()
holder.flags |= REAGENT_CANNOT_OVERDOSE
..()

/datum/chem_property/special/hypergenetic
name = PROPERTY_HYPERGENETIC
code = "HGN"
Expand Down
Loading