cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 00:21:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scrubs all mentions of Vox from the code ( I suck at Git edition ) (#10423)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-11-22 11:34:04 +01:00
committed by GitHub
parent b2ce742e9f
commit e8945fa626
44 changed files with 141 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+4 -7
View File
@@ -49,10 +49,7 @@
fallback_specific_heat = 1.048
/datum/reagent/ammonia/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_VOX)
M.adjustOxyLoss(-removed * 10)
else
M.adjustToxLoss(removed * 1.5)
M.adjustToxLoss(removed * 1.5)
/datum/reagent/carbon
name = "Carbon"
@@ -316,7 +313,7 @@
reagent_state = LIQUID
color = "#484848"
ingest_met = REM*0.1
breathe_met = REM*0.4
breathe_met = REM*0.4
breathe_mul = 2 //mercury vapours and skin absorption more dangerous than eating mercury.
touch_met = REM*0.1
touch_mul = 1.25
@@ -325,7 +322,7 @@
fallback_specific_heat = 0.631
/datum/reagent/mercury/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
/datum/reagent/mercury/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.add_chemical_effect(CE_NEUROTOXIC, 2*removed)
if(dose > 1)
if(prob(dose/2))
@@ -333,7 +330,7 @@
M.confused = max(M.confused, 10)
if(dose > 4)
M.add_chemical_effect(CE_CLUMSY, 1)
if(prob(dose/4))
if(prob(dose/4))
M.emote(pick("twitch", "shiver", "drool"))
if(prob(dose/4))
M.visible_message("<b>[M]</b> chuckles spontaneously.", "You chuckle spontaneously.")
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+10 -12
View File
@@ -16,7 +16,7 @@
M.add_chemical_effect(CE_STABLE)
M.add_chemical_effect(CE_PAINKILLER, 25)
/datum/reagent/inaprovaline/overdose(var/mob/living/carbon/M, var/alien, var/removed)
/datum/reagent/inaprovaline/overdose(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(2))
to_chat(M, SPAN_WARNING(pick("Your chest feels tight.", "Your chest is aching a bit.", "You have a stabbing pain in your chest.")))
M.adjustHalLoss(5)
@@ -45,8 +45,8 @@
M.make_dizzy(5)
M.adjustHydrationLoss(5*removed)
M.adjustNutritionLoss(5*removed)
var/mob/living/carbon/human/H = M
var/mob/living/carbon/human/H = M
if(dose > 30) //Bicaridine treats arterial bleeding when dose is greater than 30u and when the drug is overdosing (chemical volume in blood greater than 20).
for(var/obj/item/organ/external/E in H.organs)
if(E.status & ORGAN_ARTERY_CUT && prob(2))
@@ -165,8 +165,6 @@
var/strength = 6
/datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_VOX)
M.adjustToxLoss(removed * strength)
M.add_chemical_effect(CE_OXYGENATED, strength/6) // 1 for dexalin, 2 for dexplus
holder.remove_reagent(/datum/reagent/lexorin, strength/3 * removed)
@@ -562,13 +560,13 @@
M.add_chemical_effect(CE_PULSE, 1)
if (!modifier)
modifier = M.add_modifier(/datum/modifier/stimulant, MODIFIER_REAGENT, src, _strength = 1, override = MODIFIER_OVERRIDE_STRENGTHEN)
if((locate(/datum/reagent/adrenaline) in M.reagents.reagent_list))
if(M.reagents.get_reagent_amount(/datum/reagent/adrenaline) > 5) //So you can tolerate being attacked whilst hyperzine is in your system.
overdose = volume/2 //Straight to overdose.
/datum/reagent/hyperzine/overdose(var/mob/living/carbon/M, var/alien, var/removed)
M.adjustNutritionLoss(5*removed)
M.adjustNutritionLoss(5*removed)
M.add_chemical_effect(CE_PULSE, 2)
if(prob(5))
to_chat(M, SPAN_DANGER(pick("Your heart is beating rapidly!", "Your chest hurts!")))
@@ -659,7 +657,7 @@
else
M.apply_radiation(-30 * removed)
/datum/reagent/hyronalin/overdose(var/mob/living/carbon/M, var/alien, var/removed)
/datum/reagent/hyronalin/overdose(var/mob/living/carbon/M, var/alien, var/removed)
if(prob(60))
M.take_organ_damage(4 * removed, 0) //Hyronaline OD deals brute damage to the same degree as Arithrazine
@@ -1145,7 +1143,7 @@
description = "Neurapan is a groundbreaking, expensive antipsychotic medication capable of treating a whole spectrum of mental illnesses, including psychoses, anxiety disorders, Tourette Syndrome and depression, and can alleviate symptoms of stress. Neurapan can be addictive due to its tranquilising effects, and withdrawal symptoms are dangerous."
reagent_state = LIQUID
color = "#FF4444"
overdose = 10
overdose = 10
metabolism = 0.02 * REM
od_minimum_dose = 0.4
data = 0
@@ -1456,7 +1454,7 @@
else
H.adjustOxyLoss(2)
H.add_chemical_effect(CE_PNEUMOTOXIC, 0.1)
/datum/reagent/pulmodeiectionem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
M.adjustToxLoss(2 * removed)
M.add_chemical_effect(CE_ITCH, dose)
@@ -1588,7 +1586,7 @@
taste_description = "premium salty water"
unaffected_species = IS_MACHINE
ingest_mul = 0
breathe_mul = 0
breathe_mul = 0
/datum/reagent/saline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if((M.hydration > M.max_hydration) > CREW_HYDRATION_OVERHYDRATED)
@@ -1597,7 +1595,7 @@
M.adjustHydrationLoss(-removed*5)
if(volume < 3)
M.add_chemical_effect(CE_BLOODRESTORE, 4 * removed)
/datum/reagent/saline/overdose(var/mob/living/carbon/M, var/alien)
M.confused = max(M.confused, 20)
M.make_jittery(5)