cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs

Browse Source 
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
This commit is contained in:
ZomgPonies
2015-03-25 09:33:21 -04:00
parent 0b92c311df 33293763f4
commit 17dfe4e481
19 changed files with 170 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/crafting/recipes.dm
+1 -2
View File
@@ -150,8 +150,7 @@
name = "Overload Improvised Shell"
result = /obj/item/ammo_casing/shotgun/improvised/overload
reqs = list(/obj/item/ammo_casing/shotgun/improvised = 1,
/datum/reagent/water = 5,
/datum/reagent/potassium = 5)
/datum/reagent/blackpowder = 5)
tools = list(/obj/item/weapon/screwdriver)
time = 5
code/modules/hydroponics/seed_datums.dm
+1 -1
View File
@@ -1287,7 +1287,7 @@ proc/populate_seed_list()
packet_icon = "seed-wheat"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/wheat)
plant_icon = "wheat"
chems = list("nutriment" = list(1,25))
chems = list("nutriment" = list(1,25), "corn_starch" = list(3,5))
lifespan = 25
maturation = 6
code/modules/reagents/Chemistry-Machinery.dm
+2 -2
View File
@@ -19,7 +19,7 @@
var/hackedcheck = 0
var/list/dispensable_reagents = list("hydrogen","lithium","carbon","nitrogen","oxygen","fluorine",
"sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron",
"copper","mercury","plasma","radium","water","ethanol","sugar","sacid","tungsten","iodine","bromine","silver")
"copper","mercury","plasma","radium","water","ethanol","sugar","tungsten","iodine","bromine","silver")
var/list/hacked_reagents = list("toxin")
var/hack_message = "You disable the safety safeguards, enabling the \"Mad Scientist\" mode."
var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode."
@@ -282,7 +282,7 @@
recharge_delay = 30
dispensable_reagents = list()
var/list/special_reagents = list(list("hydrogen", "oxygen", "silicon", "phosphorus", "sulfur", "carbon", "nitrogen"),
list("lithium", "sugar", "sacid", "water", "copper", "mercury", "sodium"),
list("lithium", "sugar", "water", "copper", "mercury", "sodium"),
list("ethanol", "chlorine", "potassium", "aluminium","plasma", "radium", "fluorine", "iron"))
/obj/machinery/chem_dispenser/constructable/New()
code/modules/reagents/Chemistry-Reagents.dm
+12
View File
@@ -752,9 +752,21 @@ datum
description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
reagent_state = SOLID
color = "#FFFFFF" // rgb: 255, 255, 255
overdose_threshold = 200 // Hyperglycaemic shock
on_mob_life(var/mob/living/M as mob)
M.nutrition += 1*REM
if(prob(4))
M.reagents.add_reagent("epinephrine", 1.2)
if(prob(50))
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
if(current_cycle >= 90)
M.jitteriness += 10
if(volume > overdose_threshold)
M << "<span class = 'danger'>You pass out from hyperglycemic shock!</span>"
M.Paralyse(1)
..()
return
code/modules/reagents/Chemistry-Recipes.dm
+9 -2
View File
@@ -592,8 +592,15 @@ datum
name = "Space cleaner"
id = "cleaner"
result = "cleaner"
required_reagents = list("ammonia" = 1, "water" = 1)
result_amount = 2
required_reagents = list("ammonia" = 1, "water" = 1, "ethanol" = 1)
result_amount = 3
sulfuric_acid
name = "Sulfuric Acid"
id = "sacid"
result = "sacid"
required_reagents = list("sulfur" = 1, "oxygen" = 1, "hydrogen" = 1)
result_amount = 3
///////Changeling Blood Test/////////////
changeling_test
code/modules/reagents/newchem/medicine.dm
+1 -2
View File
@@ -18,7 +18,6 @@ datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/meth
M.adjustFireLoss(-volume)
if(show_message)
M << "<span class='notice'>You feel your burns healing!</span>"
M.emote("scream")
if(method == INGEST)
M.adjustToxLoss(0.5*volume)
if(show_message)
@@ -254,7 +253,7 @@ datum/reagent/pen_acid/on_mob_life(var/mob/living/M as mob)
result_amount = 6
datum/reagent/sal_acid
name = "Salicyclic Acid"
name = "Salicylic Acid"
id = "sal_acid"
description = "If you have less than 50 brute damage, there is a 50% chance to heal one unit. If overdosed it will have a 50% chance to deal 2 brute damage if the patient has less than 50 brute damage already."
reagent_state = LIQUID
code/modules/reagents/newchem/other.dm
+25 -5
View File
@@ -159,7 +159,7 @@ datum/reagent/triple_citrus
datum/reagent/corn_starch
name = "Corn Starch"
id = "corn_starch"
description = "A slippery solution."
description = "The powdered starch of maize, derived from the kernel's endosperm. Used as a thickener for gravies and puddings."
reagent_state = LIQUID
color = "#C8A5DC"
@@ -168,20 +168,40 @@ datum/reagent/corn_starch
id = "corn_syrup"
result = "corn_syrup"
required_reagents = list("corn_starch" = 1, "sacid" = 1)
result_amount = 5
result_amount = 2
required_temp = 374
datum/reagent/corn_syrup
name = "Corn Syrup"
id = "corn_syrup"
description = "Decays into sugar."
description = "A sweet syrup derived from corn starch that has had its starches converted into maltose and other sugars."
reagent_state = LIQUID
color = "#C8A5DC"
datum/reagent/corn_syrup/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.reagents.add_reagent("sugar", 3)
M.reagents.remove_reagent("corn_syrup", 1)
M.reagents.add_reagent("sugar", 1.2)
..()
return
/datum/chemical_reaction/vhfcs
name = "vhfcs"
id = "vhfcs"
result = "vhfcs"
required_reagents = list("corn_syrup" = 1)
required_catalysts = list("enzyme" = 1)
result_amount = 1
datum/reagent/vhfcs
name = "Very-high-fructose corn syrup"
id = "vhfcs"
description = "An incredibly sweet syrup, created from corn syrup treated with enzymes to convert its sugars into fructose."
reagent_state = LIQUID
color = "#C8A5DC"
datum/reagent/vhfcs/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.reagents.add_reagent("sugar", 2.4)
..()
return
code/modules/reagents/newchem/patch.dm
+15 -1
View File
@@ -14,4 +14,18 @@
icon_state = "bandaid"
/obj/item/weapon/reagent_containers/pill/patch/afterattack(obj/target, mob/user , proximity)
return // thanks inheritance again
return // thanks inheritance again
/obj/item/weapon/reagent_containers/pill/patch/styptic
name = "healing patch"
desc = "Helps with brute injuries."
New()
..()
reagents.add_reagent("styptic_powder", 40)
/obj/item/weapon/reagent_containers/pill/patch/silver_sulf
name = "burn patch"
desc = "Helps with burn injuries."
New()
..()
reagents.add_reagent("silver_sulfadiazine", 40)
code/modules/reagents/reagent_containers/hypospray.dm
+3 -3
View File
@@ -90,7 +90,7 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/New()
..()
reagents.add_reagent("inaprovaline", 10)
reagents.add_reagent("epinephrine", 10)
update_icon()
return
@@ -119,7 +119,7 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine/New()
..()
reagents.remove_reagent("inaprovaline", 10)
reagents.remove_reagent("epinephrine", 10)
reagents.add_reagent("leporazine", 9)
reagents.add_reagent("lexorin", 1)
update_icon()
@@ -132,7 +132,7 @@
/obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack/New()
..()
reagents.remove_reagent("inaprovaline", 10)
reagents.remove_reagent("epinephrine", 10)
reagents.add_reagent("hyperzine", 9)
reagents.add_reagent("lexorin", 1)
update_icon()
code/modules/reagents/reagent_containers/pill.dm
+27 -3
View File
@@ -113,13 +113,13 @@
..()
reagents.add_reagent("toxin", 50)
/obj/item/weapon/reagent_containers/pill/cyanide
name = "Cyanide pill"
/obj/item/weapon/reagent_containers/pill/initropidril
name = "initropidril pill"
desc = "Don't swallow this."
icon_state = "pill5"
New()
..()
reagents.add_reagent("cyanide", 50)
reagents.add_reagent("initropidril", 50)
/obj/item/weapon/reagent_containers/pill/adminordrazine
name = "Adminordrazine pill"
@@ -228,3 +228,27 @@
reagents.add_reagent("impedrezene", 10)
reagents.add_reagent("synaptizine", 5)
reagents.add_reagent("hyperzine", 5)
/obj/item/weapon/reagent_containers/pill/charcoal
name = "Chacoal pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
New()
..()
reagents.add_reagent("charcoal", 25)
/obj/item/weapon/reagent_containers/pill/salicylic
name = "Salicylic Acid pill"
desc = "Commonly used to treat moderate pain and fevers."
icon_state = "pill4"
New()
..()
reagents.add_reagent("sal_acid", 20)
/obj/item/weapon/reagent_containers/pill/salbutamol
name = "Salbutamol pill"
desc = "Used to treat respiratory distress."
icon_state = "pill8"
New()
..()
reagents.add_reagent("salbutamol", 20)
code/modules/reagents/reagent_containers/syringes.dm
+18
View File
@@ -506,4 +506,22 @@
reagents.add_reagent("inaprovaline", 7)
reagents.add_reagent("anti_toxin", 8)
mode = SYRINGE_INJECT
update_icon()
/obj/item/weapon/reagent_containers/syringe/charcoal
name = "Syringe (charcoal)"
desc = "Contains charcoal - used to treat toxins and damage from toxins."
New()
..()
reagents.add_reagent("charcoal", 15)
mode = SYRINGE_INJECT
update_icon()
/obj/item/weapon/reagent_containers/syringe/insulin
name = "Syringe (insulin)"
desc = "Contains insulin - used to treat diabetes."
New()
..()
reagents.add_reagent("insulin", 15)
mode = SYRINGE_INJECT
update_icon()