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

Crit Rework Final Submission

Browse Source
This commit is contained in:
Fox McCloud
2019-03-28 17:28:00 -04:00
parent 290e9135d0
commit d0ea5ee8b9
87 changed files with 797 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/disease.dm
+13
View File
@@ -114,6 +114,19 @@
M.ForceContractDisease(new /datum/disease/vampire(0))
return ..()
/datum/reagent/bacon_grease
name = "pure bacon grease"
id = "bacon_grease"
description = "Hook me up to an IV of that sweet, sweet stuff!"
reagent_state = LIQUID
color = "#F7E6B1"
can_synth = FALSE
/datum/reagent/bacon_grease/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
M.ForceContractDisease(new /datum/disease/critical/heart_failure(0))
return ..()
/datum/reagent/heartworms
name = "Space heartworms"
id = "heartworms"
code/modules/reagents/chemistry/reagents/food.dm
+1 -4
View File
@@ -845,10 +845,7 @@
to_chat(M, "<span class='warning'>Your chest is burning with pain!</span>")
update_flags |= M.Stun(1, FALSE)
update_flags |= M.Weaken(1, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!H.undergoing_cardiac_arrest())
H.set_heartattack(TRUE)
M.ForceContractDisease(new /datum/disease/critical/heart_failure(0))
return ..() | update_flags
/datum/reagent/fungus
code/modules/reagents/chemistry/reagents/medicine.dm
+4 -19
View File
@@ -16,13 +16,6 @@
shock_reduction = 200
taste_message = "numbness"
/datum/reagent/medicine/hydrocodone/on_mob_life(mob/living/M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
H.shock_stage = 0
return ..()
/datum/reagent/medicine/sterilizine
name = "Sterilizine"
id = "sterilizine"
@@ -412,10 +405,6 @@
var/update_flags = STATUS_UPDATE_NONE
if(prob(55))
update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
H.shock_stage = 0
return ..() | update_flags
/datum/reagent/medicine/salbutamol
@@ -472,7 +461,7 @@
update_flags |= M.AdjustWeakened(-1, FALSE)
update_flags |= M.adjustStaminaLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
M.AdjustLoseBreath(-1, bound_lower = 5)
if(M.oxyloss > 75)
if(M.getOxyLoss() > 75)
update_flags |= M.adjustOxyLoss(-1, FALSE)
if(M.health < 0 || M.health > 0 && prob(33))
update_flags |= M.adjustToxLoss(-1, FALSE)
@@ -547,10 +536,6 @@
if(36 to INFINITY)
M.Paralyse(15)
M.Drowsy(20)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
H.shock_stage = 0
..()
/datum/reagent/medicine/oculine
@@ -600,7 +585,7 @@
if(prob(4))
M.emote("collapse")
M.AdjustLoseBreath(-5, bound_lower = 5)
if(M.oxyloss > 65)
if(M.getOxyLoss() > 65)
update_flags |= M.adjustOxyLoss(-10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(M.health < -25)
update_flags |= M.adjustToxLoss(-1, FALSE)
@@ -636,7 +621,7 @@
update_flags |= M.adjustBrainLoss(-1, FALSE)
holder.remove_reagent("histamine", 15)
M.AdjustLoseBreath(-1, bound_lower = 3)
if(M.oxyloss > 35)
if(M.getOxyLoss() > 35)
update_flags |= M.adjustOxyLoss(-10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(M.health < -10 && M.health > -65)
update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
@@ -789,7 +774,7 @@
M.SetSlur(0)
M.AdjustDrunk(-4)
M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 8, 0, 1)
if(M.toxloss <= 25)
if(M.getToxLoss() <= 25)
update_flags |= M.adjustToxLoss(-2.0, FALSE)
return ..() | update_flags
code/modules/reagents/chemistry/recipes/medicine.dm
+1 -8
View File
@@ -264,11 +264,4 @@
required_reagents = list("ethanol" = 1, "copper" = 1, "silver" = 1)
result_amount = 3
min_temp = T0C + 100
mix_message = "The solution gently swirls with a metallic sheen."
/datum/chemical_reaction/corazone
name = "Corazone"
id = "corazone"
result = "corazone"
result_amount = 3
required_reagents = list("phenol" = 2, "lithium" = 1)
mix_message = "The solution gently swirls with a metallic sheen."
code/modules/reagents/reagent_containers/bottle.dm
+37 -7
View File
@@ -44,10 +44,28 @@
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
desc = "A small bottle containing toxic compounds."
icon_state = "small_bottle"
list_reagents = list("toxin" = 30)
/obj/item/reagent_containers/glass/bottle/atropine
name = "atropine bottle"
desc = "A small bottle containing atropine, used for cardiac emergencies."
icon_state = "small_bottle"
list_reagents = list("atropine" = 30)
/obj/item/reagent_containers/glass/bottle/saline
name = "saline-glucose bottle"
desc = "A small bottle containing saline-glucose solution."
icon_state = "small_bottle"
list_reagents = list("salglu_solution" = 30)
/obj/item/reagent_containers/glass/bottle/salicylic
name = "salicylic acid bottle"
desc = "A small bottle containing medicine for pain and fevers."
icon_state = "small_bottle"
list_reagents = list("sal_acid" = 30)
/obj/item/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
@@ -99,25 +117,25 @@
/obj/item/reagent_containers/glass/bottle/morphine
name = "Morphine Bottle"
desc = "A small bottle. Contains morphine."
icon_state = "round_bottle"
desc = "A small bottle of morphine, a powerful painkiller."
icon_state = "bottle"
list_reagents = list("morphine" = 30)
/obj/item/reagent_containers/glass/bottle/ether
name = "Ether Bottle"
desc = "A small bottle. Contains ether."
desc = "A small bottle of an ether, a strong anesthetic and sedative."
icon_state = "round_bottle"
list_reagents = list("ether" = 30)
/obj/item/reagent_containers/glass/bottle/charcoal
name = "Charcoal Bottle"
desc = "A small bottle. Contains charcoal."
icon_state = "round_bottle"
icon_state = "wide_bottle"
list_reagents = list("charcoal" = 30)
/obj/item/reagent_containers/glass/bottle/epinephrine
name = "Epinephrine Bottle"
desc = "A small bottle. Contains epinephrine."
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
icon_state = "round_bottle"
list_reagents = list("epinephrine" = 30)
@@ -236,9 +254,21 @@
/obj/item/reagent_containers/glass/bottle/diphenhydramine
name = "diphenhydramine bottle"
desc = "A small bottle of diphenhydramine."
icon_state = "bottle"
icon_state = "round_bottle"
list_reagents = list("diphenhydramine" = 30)
/obj/item/reagent_containers/glass/bottle/oculine
name = "oculine bottle"
desc = "A small bottle of combined eye and ear medication."
icon_state = "round_bottle"
list_reagents = list("oculine" = 30)
/obj/item/reagent_containers/glass/bottle/potassium_iodide
name = "potassium iodide bottle"
desc = "A small bottle of potassium iodide."
icon_state = "wide_bottle"
list_reagents = list("potass_iodide" = 30)
/obj/item/reagent_containers/glass/bottle/flu_virion
name = "Flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
code/modules/reagents/reagent_containers/pill.dm
+20 -2
View File
@@ -103,7 +103,7 @@
name = "Charcoal pill"
desc = "Neutralizes many common toxins."
icon_state = "pill17"
list_reagents = list("charcoal" = 25)
list_reagents = list("charcoal" = 50)
/obj/item/reagent_containers/food/pill/salicylic
name = "Salicylic Acid pill"
@@ -121,4 +121,22 @@
name = "Hydrocodone pill"
desc = "Used to treat extreme pain."
icon_state = "pill6"
list_reagents = list("hydrocodone" = 15)
list_reagents = list("hydrocodone" = 15)
/obj/item/reagent_containers/food/pill/calomel
name = "calomel pill"
desc = "Can be used to purge impurities, but is highly toxic itself."
icon_state = "pill3"
list_reagents = list("calomel" = 15)
/obj/item/reagent_containers/food/pill/mutadone
name = "mutadone pill"
desc = "Used to cure genetic abnormalities."
icon_state = "pill18"
list_reagents = list("mutadone" = 20)
/obj/item/reagent_containers/food/pill/mannitol
name = "mannitol pill"
desc = "Used to treat cranial swelling."
icon_state = "pill19"
list_reagents = list("mannitol" = 20)
code/modules/reagents/reagent_containers/syringes.dm
+5
View File
@@ -318,6 +318,11 @@
desc = "Contains insulin - used to treat diabetes."
list_reagents = list("insulin" = 15)
/obj/item/reagent_containers/syringe/calomel
name = "Syringe (calomel)"
desc = "Contains calomel, which be used to purge impurities, but is highly toxic itself."
list_reagents = list("calomel" = 15)
/obj/item/reagent_containers/syringe/bioterror
name = "bioterror syringe"
desc = "Contains several paralyzing reagents."