cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Forgot

Browse Source
This commit is contained in:
Fox-McCloud
2015-03-27 07:19:13 -04:00
parent d1932c0f64
commit a40ee14f2c
18 changed files with 54 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+1 -1
View File
@@ -430,7 +430,7 @@
/obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1/New()
..()
reagents.add_reagent("oxycodone", 15)
reagents.add_reagent("hydrocodone", 15)
update_icon()
return
code/modules/events/tgevents/vent_clog.dm
+1 -1
View File
@@ -22,7 +22,7 @@
var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
"atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
"blood","morphine","fluorine","mutadone","mutagen","oxycodone","fuel","cryptobiolin",
"blood","morphine","fluorine","mutadone","mutagen","hydrocodone","fuel","cryptobiolin",
"haloperidol","mindbreaker","nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
"omnizine", "amatoxin", "adminordrazine", "neurotoxin", "synaptizine")
var/datum/reagents/R = new/datum/reagents(50)
code/modules/mining/equipment_locker.dm
+1 -1
View File
@@ -149,7 +149,7 @@
var/obj/item/weapon/card/id/inserted_id
var/list/prize_list = list(
new /datum/data/mining_equipment("Stimpack MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack, 50),
new /datum/data/mining_equipment("Leporazine MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine, 50),
new /datum/data/mining_equipment("Teporone MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone, 50),
new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/autoinjector/utility, 200),
new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100),
new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150),
code/modules/mob/living/carbon/shock.dm
+3 -3
View File
@@ -11,11 +11,11 @@
1 * src.getCloneLoss() + \
1 * src.halloss
if(reagents.has_reagent("paracetamol"))
if(reagents.has_reagent("acetaminophen"))
src.traumatic_shock -= 40
if(reagents.has_reagent("tramadol"))
if(reagents.has_reagent("morphine"))
src.traumatic_shock -= 60
if(reagents.has_reagent("oxycodone"))
if(reagents.has_reagent("hydrocodone"))
src.traumatic_shock -= 200
if(src.slurring)
src.traumatic_shock -= 10
code/modules/mob/living/simple_animal/borer.dm
+1 -1
View File
@@ -259,7 +259,7 @@
if(chemicals < 50)
src << "You don't have enough chemicals!"
var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","tramadol")
var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","acetaminophen")
if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
return
code/modules/organs/pain.dm
+7 -7
View File
@@ -9,11 +9,11 @@ mob/var/next_pain_time = 0
// amount is a num from 1 to 100
mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
if(stat >= 2) return
if(reagents.has_reagent("paracetamol"))
if(reagents.has_reagent("acetaminophen"))
return
if(reagents.has_reagent("tramadol"))
if(reagents.has_reagent("morphine"))
return
if(reagents.has_reagent("oxycodone"))
if(reagents.has_reagent("hydrocodone"))
return
if(analgesic)
return
@@ -58,9 +58,9 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
if(species && species.flags & NO_PAIN) return
if(reagents.has_reagent("tramadol"))
if(reagents.has_reagent("morphine"))
return
if(reagents.has_reagent("oxycodone"))
if(reagents.has_reagent("hydrocodone"))
return
if(analgesic)
return
@@ -80,9 +80,9 @@ mob/living/carbon/human/proc/handle_pain()
if(species && species.flags & NO_PAIN) return
if(stat >= 2) return
if(reagents.has_reagent("tramadol"))
if(reagents.has_reagent("morphine"))
return
if(reagents.has_reagent("oxycodone"))
if(reagents.has_reagent("hydrocodone"))
return
if(analgesic)
return
code/modules/reagents/Chemistry-Reagents.dm
+8 -37
View File
@@ -858,10 +858,10 @@ datum
..()
return
paracetamol
name = "Paracetamol"
id = "paracetamol"
description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
acetaminophen
name = "Acetaminophenl"
id = "acetaminophen"
description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller."
reagent_state = LIQUID
color = "#C855DC"
metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
@@ -899,23 +899,10 @@ datum
..()
return
tramadol
name = "Tramadol"
id = "tramadol"
description = "A simple, yet effective painkiller."
reagent_state = LIQUID
color = "#C8A5DC"
metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
..()
return
oxycodone
name = "Oxycodone"
id = "oxycodone"
description = "An effective and very addictive painkiller."
hydrocodone
name = "Hydrocodone-Acetaminophen"
id = "hydrocodone"
description = "An extremely effective painkiller; may have long term abuse consequences."
reagent_state = LIQUID
color = "#C805DC"
metabolization_rate = 0.3 // Lasts 1.5 minutes for 15 units
@@ -1157,22 +1144,6 @@ datum
..()
return
leporazine
name = "Leporazine"
id = "leporazine"
description = "Leporazine can be use to stabilize an individuals body temperature."
reagent_state = LIQUID
color = "#E9D66B" // rgb: 233, 214, 107
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
else if(M.bodytemperature < 311)
M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
return
cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
code/modules/reagents/Chemistry-Recipes.dm
+12 -26
View File
@@ -75,27 +75,21 @@ datum
result_amount = 3
mix_message = "The substance turns neon green and bubbles unnervingly."
tramadol
name = "Tramadol"
id = "tramadol"
result = "tramadol"
required_reagents = list("epinephrine" = 1, "ethanol" = 1, "oxygen" = 1)
result_amount = 3
acetaminophen
name = "Acetaminophen"
id = "acetaminophen"
result = "acetaminophen"
required_reagents = list("phenol" = 1, "sodium" = 1, "oxygen" = 1, "nitrogen" = 1, "sacid" = 1, "water" = 1)
result_amount = 6
mix_message = "The mixture becomes a fine white powder."
paracetamol
name = "Paracetamol"
id = "paracetamol"
result = "paracetamol"
required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1)
hydrocodone
name = "Hydrocodone"
id = "hydrocodone"
result = "hydrocodone"
required_reagents = list("morphine" = 1, "acetaminophen" = 1, "sacid" = 1, "water" = 1, "oil" = 1)
result_amount = 3
oxycodone
name = "Oxycodone"
id = "oxycodone"
result = "oxycodone"
required_reagents = list("ethanol" = 1, "tramadol" = 1, "plasma" = 1)
result_amount = 1
thermite
name = "Thermite"
id = "thermite"
@@ -140,14 +134,6 @@ datum
required_reagents = list("water" = 1, "milk" = 1)
result_amount = 5
leporazine
name = "Leporazine"
id = "leporazine"
result = "leporazine"
required_reagents = list("silicon" = 1, "copper" = 1)
required_catalysts = list("plasma" = 5)
result_amount = 2
cryptobiolin
name = "Cryptobiolin"
id = "cryptobiolin"
code/modules/reagents/newchem/medicine.dm
+4 -1
View File
@@ -850,7 +850,10 @@ datum/reagent/teporone
datum/reagent/teporone/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.bodytemperature = 310
if(M.bodytemperature > 310)
M.bodytemperature -= 10
if(M.bodytemperature < 310)
M.bodytemperature += 10
..()
return
code/modules/reagents/reagent_containers/borghydro.dm
+1 -1
View File
@@ -21,7 +21,7 @@
reagent_ids = list("styptic_powder", "epinephrine", "salbutamol")
/obj/item/weapon/reagent_containers/borghypo/crisis
reagent_ids = list("salglu_solution", "epinephrine", "tramadol")
reagent_ids = list("salglu_solution", "epinephrine", "acetaminophen")
/obj/item/weapon/reagent_containers/borghypo/New()
..()
code/modules/reagents/reagent_containers/hypospray.dm
+4 -4
View File
@@ -112,15 +112,15 @@
else
usr << "\blue It is spent."
/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine //basilisks
name = "leporazine autoinjector"
/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone //basilisks
name = "teporone autoinjector"
desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction at the cost of some shortness of breath."
icon_state = "lepopen"
/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine/New()
/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone/New()
..()
reagents.remove_reagent("epinephrine", 10)
reagents.add_reagent("leporazine", 9)
reagents.add_reagent("teporone", 9)
reagents.add_reagent("lexorin", 1)
update_icon()
return
code/modules/reagents/reagent_containers/pill.dm
-9
View File
@@ -121,15 +121,6 @@
..()
reagents.add_reagent("adminordrazine", 50)
/obj/item/weapon/reagent_containers/pill/tramadol
name = "Tramadol pill"
desc = "A simple painkiller."
icon_state = "pill8"
New()
..()
reagents.add_reagent("tramadol", 15)
/obj/item/weapon/reagent_containers/pill/methamphetamine
name = "Methamphetamine pill"
desc = "Helps improve the ability to concentrate."
code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm
+1 -1
View File
@@ -62,7 +62,7 @@
icon_state = "valeleaves"
New(var/loc, var/potency)
..()
reagents.add_reagent("paracetamol", potency * 5)
reagents.add_reagent("acetaminophen", potency * 5)
reagents.add_reagent("salbutamol", potency * 2)
reagents.add_reagent("nutriment", potency)
bitesize = 1+round(reagents.total_volume / 2, 1)
code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+1 -1
View File
@@ -51,7 +51,7 @@
coolant_reagents_purity["icecoffee"] = 0.6
coolant_reagents_purity["icetea"] = 0.6
coolant_reagents_purity["milkshake"] = 0.6
coolant_reagents_purity["leporazine"] = 0.7
coolant_reagents_purity["teporone"] = 0.7
coolant_reagents_purity["sterilizine"] = 0.7
coolant_reagents_purity["cryoxadone"] = 0.9
coolant_reagents_purity["coolant"] = 1