mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Tweaks Daxons
This commit is contained in:
@@ -515,6 +515,7 @@
|
|||||||
taste_description = "metallic"
|
taste_description = "metallic"
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
color = "#4444FF"
|
color = "#4444FF"
|
||||||
|
metabolism = REM * 1.5
|
||||||
overdose = 10
|
overdose = 10
|
||||||
scannable = 1
|
scannable = 1
|
||||||
|
|
||||||
@@ -528,13 +529,15 @@
|
|||||||
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_LUNGS, O_VOICE, O_GBLADDER)))
|
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_LUNGS, O_VOICE, O_GBLADDER)))
|
||||||
continue
|
continue
|
||||||
if(I.damage > 0)
|
if(I.damage > 0)
|
||||||
I.damage = max(I.damage - 2 * removed * repair_strength, 0)
|
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
|
||||||
H.Confuse(2)
|
H.Confuse(2)
|
||||||
if(M.reagents.has_reagent("gastirodaxon") || M.reagents.has_reagent("peridaxon"))
|
if(M.reagents.has_reagent("gastirodaxon") || M.reagents.has_reagent("peridaxon"))
|
||||||
if(H.losebreath >= 15 && prob(H.losebreath))
|
if(H.losebreath >= 15 && prob(H.losebreath))
|
||||||
H.Stun(2)
|
H.Stun(2)
|
||||||
else
|
else
|
||||||
H.losebreath = CLAMP(H.losebreath + 3, 0, 20)
|
H.losebreath = CLAMP(H.losebreath + 3, 0, 20)
|
||||||
|
else
|
||||||
|
H.losebreath = max(H.losebreath - 4, 0)
|
||||||
|
|
||||||
/datum/reagent/gastirodaxon
|
/datum/reagent/gastirodaxon
|
||||||
name = "Gastirodaxon"
|
name = "Gastirodaxon"
|
||||||
@@ -543,6 +546,7 @@
|
|||||||
taste_description = "chalk"
|
taste_description = "chalk"
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
color = "#8B4513"
|
color = "#8B4513"
|
||||||
|
metabolism = REM * 1.5
|
||||||
overdose = 10
|
overdose = 10
|
||||||
scannable = 1
|
scannable = 1
|
||||||
|
|
||||||
@@ -556,13 +560,15 @@
|
|||||||
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_APPENDIX, O_NUTRIENT, O_PLASMA, O_POLYP)))
|
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_APPENDIX, O_NUTRIENT, O_PLASMA, O_POLYP)))
|
||||||
continue
|
continue
|
||||||
if(I.damage > 0)
|
if(I.damage > 0)
|
||||||
I.damage = max(I.damage - 2 * removed * repair_strength, 0)
|
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
|
||||||
H.Confuse(2)
|
H.Confuse(2)
|
||||||
if(M.reagents.has_reagent("hepanephrodaxon") || M.reagents.has_reagent("peridaxon"))
|
if(M.reagents.has_reagent("hepanephrodaxon") || M.reagents.has_reagent("peridaxon"))
|
||||||
if(prob(10))
|
if(prob(10))
|
||||||
H.vomit(1)
|
H.vomit(1)
|
||||||
else if(H.nutrition > 30)
|
else if(H.nutrition > 30)
|
||||||
H.nutrition = max(0, H.nutrition - round(30 * removed))
|
H.nutrition = max(0, H.nutrition - round(30 * removed))
|
||||||
|
else
|
||||||
|
H.adjustToxLoss(-10 * removed) // Carthatoline based, considering cost.
|
||||||
|
|
||||||
/datum/reagent/hepanephrodaxon
|
/datum/reagent/hepanephrodaxon
|
||||||
name = "Hepanephrodaxon"
|
name = "Hepanephrodaxon"
|
||||||
@@ -571,6 +577,7 @@
|
|||||||
taste_description = "glue"
|
taste_description = "glue"
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
color = "#D2691E"
|
color = "#D2691E"
|
||||||
|
metabolism = REM * 1.5
|
||||||
overdose = 10
|
overdose = 10
|
||||||
scannable = 1
|
scannable = 1
|
||||||
|
|
||||||
@@ -584,7 +591,7 @@
|
|||||||
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_LIVER, O_KIDNEYS, O_APPENDIX, O_ACID, O_HIVE)))
|
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_LIVER, O_KIDNEYS, O_APPENDIX, O_ACID, O_HIVE)))
|
||||||
continue
|
continue
|
||||||
if(I.damage > 0)
|
if(I.damage > 0)
|
||||||
I.damage = max(I.damage - 2 * removed * repair_strength, 0)
|
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
|
||||||
H.Confuse(2)
|
H.Confuse(2)
|
||||||
if(M.reagents.has_reagent("cordradaxon") || M.reagents.has_reagent("peridaxon"))
|
if(M.reagents.has_reagent("cordradaxon") || M.reagents.has_reagent("peridaxon"))
|
||||||
if(prob(5))
|
if(prob(5))
|
||||||
@@ -593,6 +600,8 @@
|
|||||||
to_chat(H,"<span class='danger'>Something churns inside you.</span>")
|
to_chat(H,"<span class='danger'>Something churns inside you.</span>")
|
||||||
H.adjustToxLoss(10 * removed)
|
H.adjustToxLoss(10 * removed)
|
||||||
H.vomit(0, 1)
|
H.vomit(0, 1)
|
||||||
|
else
|
||||||
|
H.adjustToxLoss(-12 * removed) // Carthatoline based, considering cost.
|
||||||
|
|
||||||
/datum/reagent/cordradaxon
|
/datum/reagent/cordradaxon
|
||||||
name = "Cordradaxon"
|
name = "Cordradaxon"
|
||||||
@@ -601,6 +610,7 @@
|
|||||||
taste_description = "rust"
|
taste_description = "rust"
|
||||||
reagent_state = LIQUID
|
reagent_state = LIQUID
|
||||||
color = "#FF4444"
|
color = "#FF4444"
|
||||||
|
metabolism = REM * 1.5
|
||||||
overdose = 10
|
overdose = 10
|
||||||
scannable = 1
|
scannable = 1
|
||||||
|
|
||||||
@@ -614,10 +624,12 @@
|
|||||||
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_HEART, O_RESPONSE, O_ANCHOR, O_EGG)))
|
if(I.robotic >= ORGAN_ROBOT || !(I.organ_tag in list(O_HEART, O_RESPONSE, O_ANCHOR, O_EGG)))
|
||||||
continue
|
continue
|
||||||
if(I.damage > 0)
|
if(I.damage > 0)
|
||||||
I.damage = max(I.damage - 2 * removed * repair_strength, 0)
|
I.damage = max(I.damage - 4 * removed * repair_strength, 0)
|
||||||
H.Confuse(2)
|
H.Confuse(2)
|
||||||
if(M.reagents.has_reagent("respirodaxon") || M.reagents.has_reagent("peridaxon"))
|
if(M.reagents.has_reagent("respirodaxon") || M.reagents.has_reagent("peridaxon"))
|
||||||
H.losebreath = CLAMP(H.losebreath + 1, 0, 10)
|
H.losebreath = CLAMP(H.losebreath + 1, 0, 10)
|
||||||
|
else
|
||||||
|
H.adjustOxyLoss(-30 * removed) // Deals with blood oxygenation.
|
||||||
|
|
||||||
/datum/reagent/immunosuprizine
|
/datum/reagent/immunosuprizine
|
||||||
name = "Immunosuprizine"
|
name = "Immunosuprizine"
|
||||||
@@ -682,6 +694,7 @@
|
|||||||
taste_description = "mordant"
|
taste_description = "mordant"
|
||||||
reagent_state = SOLID
|
reagent_state = SOLID
|
||||||
color = "#84B2B0"
|
color = "#84B2B0"
|
||||||
|
metabolism = REM * 0.75
|
||||||
overdose = 20
|
overdose = 20
|
||||||
scannable = 1
|
scannable = 1
|
||||||
|
|
||||||
|
|||||||
36
html/changelogs/Mechoid-DAXONS.yml
Normal file
36
html/changelogs/Mechoid-DAXONS.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Mechoid
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- tweak: "Tweaked Respiro- Cordra- Gastiro- and Hepanephro- Daxons to be more effective with dealing with the side-effects of damaged organs."
|
||||||
Reference in New Issue
Block a user