Added and Adjusted Chemicals

Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
This commit is contained in:
Nanai
2013-11-13 19:26:54 -05:00
committed by ZomgPonies
parent 69e713c04a
commit bf9ba0f658
4 changed files with 94 additions and 4 deletions
+65 -2
View File
@@ -1740,11 +1740,32 @@ datum
var/mob/living/carbon/human/H = M
var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
if(istype(E))
E.damage = max(E.damage-5 , 0)
// M.sdisabilities &= ~1 Replaced by eye surgery
if(E.damage > 0)
E.damage -= 1
..()
return
peridaxon
name = "Peridaxon"
id = "peridaxon"
description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
overdose = 10
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/datum/organ/external/chest/C = H.get_organ("chest")
for(var/datum/organ/internal/I in C.internal_organs)
if(I.damage > 0)
I.damage -= 0.20
..()
return
bicaridine
name = "Bicaridine"
id = "bicaridine"
@@ -2083,6 +2104,48 @@ datum
return
return
potassium_chloride
name = "Potassium Chloride"
id = "potassium_chloride"
description = "A delicious salt that stops the heart when injected into cardiac muscle."
reagent_state = SOLID
color = "#FFFFFF" // rgb: 255,255,255
overdose = 30
on_mob_life(var/mob/living/carbon/M as mob)
var/mob/living/carbon/human/H = M
if(H.stat != 1)
if (volume >= overdose)
if(H.losebreath >= 10)
H.losebreath = max(10, H.losebreath-10)
H.adjustOxyLoss(2)
H.Weaken(10)
..()
return
potassium_chlorophoride
name = "Potassium Chlorophoride"
id = "potassium_chlorophoride"
description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!"
reagent_state = SOLID
color = "#FFFFFF" // rgb: 255,255,255
overdose = 20
on_mob_life(var/mob/living/carbon/M as mob)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.stat != 1)
if(H.losebreath >= 10)
H.losebreath = max(10, M.losebreath-10)
H.adjustOxyLoss(2)
H.Weaken(10)
..()
return
/////////////////////////Food Reagents////////////////////////////
// Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food
// condiments, additives, and such go.
@@ -119,6 +119,13 @@ datum
// required_reagents = list("hydrogen" = 1, "carbon" = 1, "nitrogen" = 1)
// result_amount = 1
water //I can't believe we never had this.
name = "Water"
id = "water"
result = null
required_reagents = list("oxygen" = 2, "hydrogen" = 1)
result_amount = 1
thermite
name = "Thermite"
id = "thermite"
@@ -459,6 +466,27 @@ datum
required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
result_amount = 1
potassium_chloride
name = "Potassium Chloride"
id = "potassium_chloride"
id = "potassium_chloride"
required_reagents = list("sodiumchloride" = 1, "potassium" = 1)
result_amount = 2
potassium_chlorophoride
name = "Potassium Chlorophoride"
id = "potassium_chlorophoride"
id = "potassium_chlorophoride"
required_reagents = list("potassium_chloride" = 1, "plasma" = 1, "chloral_hydrate" = 1)
result_amount = 4
stoxin
name = "Sleep Toxin"
id = "stoxin"
result = "stoxin"
required_reagents = list("chloralhydrate" = 1, "sugar" = 4)
result_amount = 5
zombiepowder
name = "Zombie Powder"
id = "zombiepowder"
+1 -1
View File
@@ -132,7 +132,7 @@
if (target.op_stage.eyes == 3)
target.disabilities &= ~NEARSIGHTED
target.sdisabilities &= ~BLIND
eyes.damage -= 15
eyes.damage = 0
target.op_stage.eyes = 0
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)