From 344cafa158fd31aca2c1200d49c0a7b1d2630808 Mon Sep 17 00:00:00 2001 From: Azarak Date: Thu, 7 Jan 2021 21:05:19 +0100 Subject: [PATCH] Removes old chemicals, adjusts stuff related to hypovials (#2538) * weh * aa --- code/datums/components/rot.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 2 + code/modules/jobs/job_types/medical_doctor.dm | 1 - code/modules/jobs/job_types/paramedic.dm | 2 +- .../reagents/cat2_medicine_reagents.dm | 4 +- .../reagents/reagent_containers/borghydro.dm | 13 --- .../OLDChem/medicines/oldchem_medicines.dm | 110 ------------------ .../OLDChem/reactions/oldchem_reactions.dm | 25 ---- modular_skyrat/modules/OLDChem/readme.md | 29 ----- .../hyposprays/code/game/hypospray_kits.dm | 22 ++-- .../hyposprays/code/game/hyposprays_II.dm | 15 --- .../modules/hyposprays/code/game/hypovials.dm | 53 +-------- tgstation.dme | 2 - 13 files changed, 18 insertions(+), 262 deletions(-) delete mode 100644 modular_skyrat/modules/OLDChem/medicines/oldchem_medicines.dm delete mode 100644 modular_skyrat/modules/OLDChem/reactions/oldchem_reactions.dm delete mode 100644 modular_skyrat/modules/OLDChem/readme.md diff --git a/code/datums/components/rot.dm b/code/datums/components/rot.dm index 8f1bd52f3c9..f19d1e00029 100644 --- a/code/datums/components/rot.dm +++ b/code/datums/components/rot.dm @@ -61,7 +61,7 @@ return // No decay if formaldehyde in corpse or when the corpse is charred - if(C.reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 1) || HAS_TRAIT(C, TRAIT_HUSK) || C.reagents.has_reagent(/datum/reagent/medicine/preservahyde, 1)) //Skyrat Edit - Preservahyde, Formaldehyde decrease + if(C.reagents.has_reagent(/datum/reagent/toxin/formaldehyde, 15) || HAS_TRAIT(C, TRAIT_HUSK)) return // Also no decay if corpse chilled or not organic/undead diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 84477048670..b52941c2341 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -119,6 +119,8 @@ new /obj/item/storage/box/pillbottles(src) new /obj/item/storage/box/medigels(src) new /obj/item/storage/box/medigels(src) + new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS + new /obj/item/storage/box/hypospray(src) //SKYRAT EDIT ADDITION - HYPOSPRAYS /obj/structure/closet/secure_closet/chemical/heisenberg //contains one of each beaker, syringe etc. name = "advanced chemical closet" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index ed2eed42ec3..27000068f62 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -28,7 +28,6 @@ suit = /obj/item/clothing/suit/toggle/labcoat l_hand = /obj/item/storage/firstaid/medical suit_store = /obj/item/flashlight/pen - backpack_contents = list(/obj/item/storage/hypospraykit/regular=1) //SKYRAT ADDITION - Hypospray Kit addition backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 6ca86520360..b271864279d 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -33,7 +33,7 @@ id = /obj/item/card/id l_pocket = /obj/item/pda/medical suit_store = /obj/item/flashlight/pen/paramedic - backpack_contents = list(/obj/item/roller=1,/obj/item/storage/hypospraykit/regular=1) //SKYRAT EDIT - Hypospray Kit addition + backpack_contents = list(/obj/item/roller=1) pda_slot = ITEM_SLOT_LPOCKET backpack = /obj/item/storage/backpack/medic diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 0c3bd5d548b..62cec750952 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -304,7 +304,7 @@ /datum/reagent/medicine/c2/multiver //enhanced with MULTIple medicines name = "Multiver" - description = "A chem-purger that becomes more effective the more unique medicines present. Slightly heals toxicity." //SKYRAT EDIT - Fuck you lung damage. + description = "A chem-purger that becomes more effective the more unique medicines present. Slightly heals toxicity but causes lung damage (mitigatable by unique medicines)." /datum/reagent/medicine/c2/multiver/on_mob_life(mob/living/carbon/human/M) var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1 @@ -313,7 +313,7 @@ if(istype(the_reagent, /datum/reagent/medicine)) medibonus += 1 M.adjustToxLoss(-0.5 * min(medibonus, 3)) //not great at healing but if you have nothing else it will work - //M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5) //SKYRAT EDIT - No, cease to exist. + M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5) //kills at 40u for(var/r2 in M.reagents.reagent_list) var/datum/reagent/the_reagent2 = r2 if(the_reagent2 == src) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index f28ff559e83..182209da0f4 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -27,20 +27,7 @@ Borg Hypospray var/bypass_protection = 0 //If the hypospray can go through armor or thick material var/list/datum/reagents/reagent_list = list() - //SKYRAT EDIT CHANGE BEGIN - /* SKYRAT EDIT - ORIGINAL var/list/reagent_ids = list(/datum/reagent/medicine/c2/convermol, /datum/reagent/medicine/c2/libital, /datum/reagent/medicine/c2/multiver, /datum/reagent/medicine/c2/aiuri, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution) - */ - var/list/reagent_ids = list( - /datum/reagent/medicine/dexalin, - /datum/reagent/medicine/bicaridine, - /datum/reagent/medicine/kelotane, - /datum/reagent/medicine/c2/multiver, - /datum/reagent/medicine/epinephrine, - /datum/reagent/medicine/spaceacillin, - /datum/reagent/medicine/salglu_solution - ) - //SKYRAT EDIT CHANGE END var/accepts_reagent_upgrades = TRUE //If upgrades can increase number of reagents dispensed. var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values. //Used as list for input() in shakers. diff --git a/modular_skyrat/modules/OLDChem/medicines/oldchem_medicines.dm b/modular_skyrat/modules/OLDChem/medicines/oldchem_medicines.dm deleted file mode 100644 index 2e466763f36..00000000000 --- a/modular_skyrat/modules/OLDChem/medicines/oldchem_medicines.dm +++ /dev/null @@ -1,110 +0,0 @@ -/datum/reagent/medicine/bicaridine - name = "Bicaridine" - description = "Restores bruising. Overdose causes it instead." - reagent_state = LIQUID - color = "#fc2626" - overdose_threshold = 30 - -/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M) - M.adjustBruteLoss(-2*REM, FALSE) - ..() - . = 1 - -/datum/reagent/medicine/bicaridine/overdose_process(mob/living/M) - M.adjustBruteLoss(4*REM, FALSE) - ..() - . = 1 - -/datum/reagent/medicine/dexalin - name = "Dexalin" - description = "Restores oxygen loss. Overdose causes it instead." - reagent_state = LIQUID - color = "#13d2f0" - overdose_threshold = 30 - -/datum/reagent/medicine/dexalin/on_mob_life(mob/living/carbon/M) - M.adjustOxyLoss(-2*REM, FALSE) - ..() - . = 1 - -/datum/reagent/medicine/dexalin/overdose_process(mob/living/M) - M.adjustOxyLoss(4*REM, FALSE) - ..() - . = 1 - -/datum/reagent/medicine/kelotane - name = "Kelotane" - description = "Restores fire damage. Overdose causes it instead." - reagent_state = LIQUID - color = "#ffc400" - overdose_threshold = 30 - -/datum/reagent/medicine/kelotane/on_mob_life(mob/living/carbon/M) - M.adjustFireLoss(-2*REM, FALSE) - ..() - . = 1 - -/datum/reagent/medicine/kelotane/overdose_process(mob/living/M) - M.adjustFireLoss(4*REM, FALSE) - ..() - . = 1 - -/datum/reagent/medicine/antitoxin - name = "Anti-Toxin" - description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage." - reagent_state = LIQUID - color = "#6aff00" - overdose_threshold = 30 - taste_description = "a roll of gauze" - -/datum/reagent/medicine/antitoxin/on_mob_life(mob/living/carbon/M) - M.adjustToxLoss(-2*REM, FALSE) - for(var/datum/reagent/toxin/R in M.reagents.reagent_list) - M.reagents.remove_reagent(R.type,1) - ..() - . = 1 - -/datum/reagent/medicine/antitoxin/overdose_process(mob/living/M) - M.adjustToxLoss(4*REM, FALSE) // End result is 2 toxin loss taken, because it heals 2 and then removes 4. - ..() - . = 1 - -/datum/reagent/medicine/tricordrazine - name = "Tricordrazine" - description = "Has a high chance to heal all types of damage. Overdose instead causes it." - reagent_state = LIQUID - color = "#e650c0" - overdose_threshold = 30 - taste_description = "grossness" - -/datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/carbon/M) - if(prob(80)) - M.adjustBruteLoss(-1*REM, FALSE) - M.adjustFireLoss(-1*REM, FALSE) - M.adjustOxyLoss(-1*REM, FALSE) - M.adjustToxLoss(-1*REM, FALSE) - . = 1 - ..() - -/datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M) - M.adjustToxLoss(2*REM, FALSE) - M.adjustOxyLoss(2*REM, FALSE) - M.adjustBruteLoss(2*REM, FALSE) - M.adjustFireLoss(2*REM, FALSE) - ..() - . = 1 - -/datum/reagent/blood/synthetics - data = list("donor"=null,"viruses"=null,"blood_DNA"="REPLICATED","blood_type"="SY","resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null) - name = "Synthetic Blood" - description = "A synthetically produced imitation of blood." - taste_description = "oil" - color = "#3700ff" - process_flags = REAGENT_ORGANIC | REAGENT_SYNTHETIC - -/datum/reagent/medicine/preservahyde - name = "Preservahyde" - description = "A powerful preservation agent, utilizing the preservative effects of formaldehyde with significantly less of the histamine." - reagent_state = LIQUID - color = "#f7685e" - metabolization_rate = REAGENTS_METABOLISM * 0.25 diff --git a/modular_skyrat/modules/OLDChem/reactions/oldchem_reactions.dm b/modular_skyrat/modules/OLDChem/reactions/oldchem_reactions.dm deleted file mode 100644 index a519b0f2409..00000000000 --- a/modular_skyrat/modules/OLDChem/reactions/oldchem_reactions.dm +++ /dev/null @@ -1,25 +0,0 @@ -/datum/chemical_reaction/bicaridine - results = list(/datum/reagent/medicine/bicaridine = 3) - required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/oxygen = 1, /datum/reagent/consumable/sugar = 1) - -/datum/chemical_reaction/kelotane - results = list(/datum/reagent/medicine/kelotane = 2) - required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/silicon = 1) - -/datum/chemical_reaction/antitoxin - results = list(/datum/reagent/medicine/antitoxin = 3) - required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/silicon = 1, /datum/reagent/potassium = 1) - -/datum/chemical_reaction/tricordrazine - results = list(/datum/reagent/medicine/tricordrazine = 3) - required_reagents = list(/datum/reagent/medicine/bicaridine = 1, /datum/reagent/medicine/kelotane = 1, /datum/reagent/medicine/antitoxin = 1) - -/datum/chemical_reaction/synth_blood - results = list(/datum/reagent/blood/synthetics = 3) - required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/iron = 1, /datum/reagent/stable_plasma = 1) - mix_message = "The mixture congeals and gives off a faint copper scent." - required_temp = 350 - -/datum/chemical_reaction/preservahyde - results = list(/datum/reagent/medicine/preservahyde = 3) - required_reagents = list(/datum/reagent/water = 1, /datum/reagent/toxin/formaldehyde = 1, /datum/reagent/bromine = 1) diff --git a/modular_skyrat/modules/OLDChem/readme.md b/modular_skyrat/modules/OLDChem/readme.md deleted file mode 100644 index 3585ac8771c..00000000000 --- a/modular_skyrat/modules/OLDChem/readme.md +++ /dev/null @@ -1,29 +0,0 @@ -## Title: OLDChem - -MODULE ID: OLDCHEM - -### Description: - -Ports the more important OldChem chemicals to the new base, because Cobbychem is shit and nobody FUCKING likes it. - -### TG Proc Changes: - -- "Multiver" has been renamed to Charcoal and had its lung damage stripped out. -- borghydro.dm now uses old chemicals instead of the Cobbychem fuck-shit. -- rot.dm now only needs 1u Formaldehyde OR Preservahyde to preserve a body, like how it was on the old server. - -### Defines: - -- N/A - -### Master file additions - -- N/A - -### Included files that are not contained in this module: - -- N/A - -### Credits: - -ShadeAware - Porting diff --git a/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm index bc81dbe375d..685ed2f4015 100644 --- a/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm +++ b/modular_skyrat/modules/hyposprays/code/game/hypospray_kits.dm @@ -28,17 +28,6 @@ new /obj/item/reagent_containers/glass/bottle/vial/small(src) new /obj/item/reagent_containers/glass/bottle/vial/small(src) -/obj/item/storage/hypospraykit/regular - icon_state = "firstaid-mini" - desc = "A hypospray kit with general use vials." - -/obj/item/storage/hypospraykit/regular/PopulateContents() - if(empty) - return - new /obj/item/hypospray/mkii/tricord(src) - new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src) - new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src) - /obj/item/storage/hypospraykit/cmo name = "deluxe hypospray kit" desc = "A kit containing a Deluxe hypospray and Vials." @@ -48,10 +37,8 @@ if(empty) return new /obj/item/hypospray/mkii/CMO(src) - new /obj/item/reagent_containers/glass/bottle/vial/large/tricord(src) - new /obj/item/reagent_containers/glass/bottle/vial/large/charcoal(src) + new /obj/item/reagent_containers/glass/bottle/vial/large/multiver(src) new /obj/item/reagent_containers/glass/bottle/vial/large/salglu(src) - new /obj/item/reagent_containers/glass/bottle/vial/large/dexalin(src) new /obj/item/reagent_containers/glass/bottle/vial/large/synthflesh(src) /obj/item/storage/box/vials @@ -60,3 +47,10 @@ /obj/item/storage/box/vials/PopulateContents() for(var/i in 1 to 7) new /obj/item/reagent_containers/glass/bottle/vial/small( src ) + +/obj/item/storage/box/hypospray + name = "box of hypospray kits" + +/obj/item/storage/box/hypospray/PopulateContents() + for(var/i in 1 to 4) + new /obj/item/storage/hypospraykit/empty(src) diff --git a/modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm index f53797189dc..34d5e69d919 100644 --- a/modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm +++ b/modular_skyrat/modules/hyposprays/code/game/hyposprays_II.dm @@ -35,21 +35,6 @@ var/quickload = FALSE var/penetrates = FALSE -/obj/item/hypospray/mkii/brute - start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine - -/obj/item/hypospray/mkii/toxin - start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/antitoxin - -/obj/item/hypospray/mkii/oxygen - start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/dexalin - -/obj/item/hypospray/mkii/burn - start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/kelotane - -/obj/item/hypospray/mkii/tricord - start_vial = /obj/item/reagent_containers/glass/bottle/vial/small/tricord - /obj/item/hypospray/mkii/enlarge spawnwithvial = FALSE diff --git a/modular_skyrat/modules/hyposprays/code/game/hypovials.dm b/modular_skyrat/modules/hyposprays/code/game/hypovials.dm index eaf3b57ccac..7f226f493c7 100644 --- a/modular_skyrat/modules/hyposprays/code/game/hypovials.dm +++ b/modular_skyrat/modules/hyposprays/code/game/hypovials.dm @@ -46,59 +46,10 @@ volume = 120 possible_transfer_amounts = list(1,2,5,10,20,30,40,50,100,120) -/obj/item/reagent_containers/glass/bottle/vial/small/bicaridine - name = "red hypovial (bicaridine)" - icon_state = "hypovial-b" - list_reagents = list(/datum/reagent/medicine/bicaridine = 30) - -/obj/item/reagent_containers/glass/bottle/vial/small/antitoxin - name = "green hypovial (Anti-Tox)" - icon_state = "hypovial-a" - list_reagents = list(/datum/reagent/medicine/antitoxin = 30) - -/obj/item/reagent_containers/glass/bottle/vial/small/kelotane - name = "orange hypovial (kelotane)" - icon_state = "hypovial-k" - list_reagents = list(/datum/reagent/medicine/kelotane = 30) - -/obj/item/reagent_containers/glass/bottle/vial/small/dexalin - name = "blue hypovial (dexalin)" - icon_state = "hypovial-d" - list_reagents = list(/datum/reagent/medicine/dexalin = 30) - -/obj/item/reagent_containers/glass/bottle/vial/small/tricord - name = "hypovial (tricordrazine)" - icon_state = "hypovial" - list_reagents = list(/datum/reagent/medicine/tricordrazine = 30) - /obj/item/reagent_containers/glass/bottle/vial/large/cmo name = "deluxe hypovial" list_reagents = list(/datum/reagent/medicine/omnizine = 20, /datum/reagent/medicine/leporazine = 20, /datum/reagent/medicine/atropine = 20) -/obj/item/reagent_containers/glass/bottle/vial/large/bicaridine - name = "large red hypovial (bicaridine)" - list_reagents = list(/datum/reagent/medicine/bicaridine = 60) - -/obj/item/reagent_containers/glass/bottle/vial/large/antitoxin - name = "large green hypovial (anti-tox)" - list_reagents = list(/datum/reagent/medicine/antitoxin = 60) - -/obj/item/reagent_containers/glass/bottle/vial/large/kelotane - name = "large orange hypovial (kelotane)" - list_reagents = list(/datum/reagent/medicine/kelotane = 60) - -/obj/item/reagent_containers/glass/bottle/vial/large/dexalin - name = "large blue hypovial (dexalin)" - list_reagents = list(/datum/reagent/medicine/dexalin = 60) - -/obj/item/reagent_containers/glass/bottle/vial/large/charcoal - name = "large black hypovial (multiver)" - list_reagents = list(/datum/reagent/medicine/c2/multiver = 60) - -/obj/item/reagent_containers/glass/bottle/vial/large/tricord - name = "large hypovial (tricord)" - list_reagents = list(/datum/reagent/medicine/tricordrazine = 60) - /obj/item/reagent_containers/glass/bottle/vial/large/salglu name = "large green hypovial (salglu)" list_reagents = list(/datum/reagent/medicine/salglu_solution = 60) @@ -106,3 +57,7 @@ /obj/item/reagent_containers/glass/bottle/vial/large/synthflesh name = "large orange hypovial (synthflesh)" list_reagents = list(/datum/reagent/medicine/c2/synthflesh = 60) + +/obj/item/reagent_containers/glass/bottle/vial/large/multiver + name = "large black hypovial (multiver)" + list_reagents = list(/datum/reagent/medicine/c2/multiver = 60) diff --git a/tgstation.dme b/tgstation.dme index 84352ef33e3..0f1f6eeec71 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3710,8 +3710,6 @@ #include "modular_skyrat\modules\modular_weapons\code\modules\projectiles\guns\ballistic\rifle.dm" #include "modular_skyrat\modules\modular_weapons\code\modules\projectiles\projectile\bullets\modular_projectiles.dm" #include "modular_skyrat\modules\modular_weapons\code\modules\research\designs\autolathe_designs.dm" -#include "modular_skyrat\modules\OLDChem\medicines\oldchem_medicines.dm" -#include "modular_skyrat\modules\OLDChem\reactions\oldchem_reactions.dm" #include "modular_skyrat\modules\panicbunker\code\panicbunker.dm" #include "modular_skyrat\modules\pixel_shift\code\pixel_shift.dm" #include "modular_skyrat\modules\posi_alert\code\game\machinery\posialert.dm"