From ae9020539b922a823f282c8b98e76e322187a608 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 2 Aug 2024 17:35:31 +0200 Subject: [PATCH 01/86] Adds Vicodilicaine Adds vicodilicaine, genesis of the pharmacology... --- .../en-US/deltav/reagents/meta/pharmacy.ftl | 2 + .../Locale/en-US/deltav/reagents/pharmacy.ftl | 5 + .../Prototypes/DeltaV/Reagents/pharmacy.yml | 208 ++++++++++++++++++ .../DeltaV/Recipes/Reactions/pharmacy.yml | 13 ++ Resources/ServerInfo/Guidebook/Chemicals.xml | 1 + .../ServerInfo/Guidebook/Medical/Medicine.xml | 14 ++ 6 files changed, 243 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl create mode 100644 Resources/Locale/en-US/deltav/reagents/pharmacy.ftl create mode 100644 Resources/Prototypes/DeltaV/Reagents/pharmacy.yml create mode 100644 Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl new file mode 100644 index 00000000000..fdf09906790 --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -0,0 +1,2 @@ +reagent-name-vicodilicaine = Vicodilicaine +reagent-desc-vicodilicaine = Is used to treat moderate to severe pain to the head. Most of the time is taken by mouth. Recreational use is common due to its hallucinogen properties. Discouraged to pair with other painkillers, antidepressants, and anxiety medication, though totally safe with alcohol. diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacy.ftl new file mode 100644 index 00000000000..3e796d5c327 --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/pharmacy.ftl @@ -0,0 +1,5 @@ +reagent-effect-painkiller-head = Your head feels numb. +reagent-effect-painkiller-head2 = You feel like you can think properly. +reagent-effect-painkiller-head3 = You can finally focus. +reagent-effect-painkiller-head4 = You feel relieved. +reagent-effect-painkiller-head-fade = You feel like your head is about to explode \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml new file mode 100644 index 00000000000..709a5aa6536 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -0,0 +1,208 @@ +- type: reagent + id: Vicodilicaine + name: reagent-name-vicodilicaine + group: Pharmacy + desc: reagent-desc-vicodilicaine + physicalDesc: reagent-physical-desc-opaque + flavor: medicine + color: "#9c7b28" + metabolisms: + Medicine: + effects: + - !type:GenericStatusEffect # Makes the player "hallucinate" or high + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-head" + - "reagent-effect-painkiller-head2" + - "reagent-effect-painkiller-head3" + - "reagent-effect-painkiller-head4" + probability: 0.085 + - !type:HealthChange # Poisons and pierces your intestins on overdose + conditions: + - !type:ReagentThreshold + min: 7.6 + damage: + types: + Poison: 0.07 + Piercing: 0.03 + - !type:PopupMessage # A decent chance to notify the player when their meds run out + type: Local + visualType: Small + messages: + - "reagent-effect-painkiller-fade" + probability: 0.35 + conditions: + - !type:ReagentThreshold + max: 0.2 + - !type:PopupMessage # Notifies the player when their med ran out + type: Local + visualType: Large + probability: 1 + messages: + - "reagent-effect-painkiller-head-fade" + conditions: + - !type:ReagentThreshold + max: 0.1 + - !type:AdjustReagent + probability: 0.5 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + reagent: Addictine + max: 20 # maximum addiction severity for this reagent + - !type:ReagentThreshold + reagent: Vicodilicaine + min: 1.5 + reagent: Addictine + amount: 0.1 + - !type:ChemVomit # NORMAL Makes you vomit if Stubantazine (PK) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Stubantazine + min: 3 + - !type:GenericStatusEffect # NORMAL Makes you pass out if you take too much of Stubantazine (PK) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Stubantazine + min: 5.5 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # MILD Makes you vomit if Soretizone (PK) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Soretizone + min: 2 + - !type:GenericStatusEffect # MILD Makes you pass out if you take too much of Soretizone (PK) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Soretizone + min: 4.8 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # STRONG Makes you vomit if Agonolexyne (PK) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Agonolexyne + min: 1.4 + - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Agonolexyne (PK) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Agonolexyne + min: 3.6 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # NORMAL Makes you vomit if Serenitol (AD) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Serenitol + min: 3 + - !type:GenericStatusEffect # NORMAL Makes you pass out if you take too much of Serenitol (AD) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Serenitol + min: 5.5 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # MILD Makes you vomit if Neurozenium (AD) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Neurozenium + min: 2 + - !type:GenericStatusEffect # MILD Makes you pass out if you take too much of Neurozenium (AD) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Neurozenium + min: 4.8 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # STRONG Makes you vomit if Blissifylovene (AD) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Blissifylovene + min: 1.4 + - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Blissifylovene (AD) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Blissifylovene + min: 3.6 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # NORMAL Makes you vomit if Tranquinase (AA) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Tranquinase + min: 3 + - !type:GenericStatusEffect # NORMAL Makes you pass out if you take too much of Tranquinase (AA) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Tranquinase + min: 5.5 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # MILD Makes you vomit if Calmafluxine (AA) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Calmafluxine + min: 2 + - !type:GenericStatusEffect # MILD Makes you pass out if you take too much of Calmafluxine (AA) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Calmafluxine + min: 4.8 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:ChemVomit # STRONG Makes you vomit if Equilibrazine (AA) is ingested + probability: 0.4 + conditions: + - !type:ReagentThreshold + reagent: Equilibrazine + min: 2 + - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Equilibrazine (AA) + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Equilibrazine + min: 4.8 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml new file mode 100644 index 00000000000..113bbc4ee14 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -0,0 +1,13 @@ +- type: reaction + id: Vicodilicaine + reactants: + Mannitol: + amount: 1 + Soretizone: + amount: 1 + Lipozine: + amount: 1 + SodiumCarbonate: + amount: 1 + products: + Vicodilicaine: 4 diff --git a/Resources/ServerInfo/Guidebook/Chemicals.xml b/Resources/ServerInfo/Guidebook/Chemicals.xml index 0db9ebf054f..b1893805d1f 100644 --- a/Resources/ServerInfo/Guidebook/Chemicals.xml +++ b/Resources/ServerInfo/Guidebook/Chemicals.xml @@ -10,6 +10,7 @@ Knowing different types of chemicals and their effects is important for being ab ## Medicine + ## Narcotics diff --git a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml index 7a09a1647d2..730c615f31b 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml @@ -27,6 +27,20 @@ These medications tend to have specific use cases. +# Pharmacologist Medications + +These medications are used by the pharmacologist. + + + + + + + + + + + # All Medications This is a list of -all- medications available, including ones previously listed. From 7f4766e6c11d3b0cf2cd522415a95a1cd4799130 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 2 Aug 2024 17:56:40 +0200 Subject: [PATCH 02/86] Moves the _CD folder to DeltaV folder Moves the _CD folder to DeltaV folder as commit 336ae81 requested, also to avoid confusion --- .../en-US/_CD/reagents/meta/medicine.ftl | 29 - .../en-US/deltav/reagents/meta/pharmacy.ftl | 30 + .../reagents/meta/physical-desc.ftl | 0 .../Locale/en-US/deltav/reagents/pharmacy.ftl | 5 - .../reagents/pharmacymsg.ftl} | 8 +- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 759 ++++++++++++++++++ .../DeltaV/Recipes/Reactions/pharmacy.yml | 125 +++ .../Prototypes/_CD/Reactions/medicine.yml | 124 --- .../Prototypes/_CD/Reagents/medicine.yml | 759 ------------------ 9 files changed, 921 insertions(+), 918 deletions(-) delete mode 100644 Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl rename Resources/Locale/en-US/{_CD => deltav}/reagents/meta/physical-desc.ftl (100%) delete mode 100644 Resources/Locale/en-US/deltav/reagents/pharmacy.ftl rename Resources/Locale/en-US/{_CD/reagents/RPmeds.ftl => deltav/reagents/pharmacymsg.ftl} (93%) delete mode 100644 Resources/Prototypes/_CD/Reactions/medicine.yml delete mode 100644 Resources/Prototypes/_CD/Reagents/medicine.yml diff --git a/Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl deleted file mode 100644 index 475bd03338a..00000000000 --- a/Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl +++ /dev/null @@ -1,29 +0,0 @@ -reagent-name-serenitol = Serenitol -reagent-desc-serenitol = A fairly unreactive chemical that has mild antidepressant properties. Originally used to help patients overcome the loss of a pet or family friend, it is fairly safe to administer. - -reagent-name-neurozenium = Neurozenium -reagent-desc-neurozenium = Once considered child-safe shoe polish, Neurozenium was found to be a fairly effective antidepressant in an impressive zero-to-hero story. Do not take it with alcohol in your system. Consult a doctor before combining with other medications. - -reagent-name-blissifylovene = Blissifylovene -reagent-desc-blissifylovene = A military-grade antidepressant with a very low dosage. Very powerful, though it is often considered a last resort due to its interactions with other medications and psychosis-inducing overdoses. Addictive in all but the smallest of doses. - -reagent-name-calmafluxine = Calmafluxine -reagent-desc-calmafluxine = A mild, over-the-counter anxiety medication. Commonly prescribed to children as the body naturally flushes out any excess medication, making overdose functionally impossible. - -reagent-name-tranquinase = Tranquinase -reagent-desc-tranquinase = Run-of-the-mill anxiety medication. Derived from an old recipe for space bear tranquilizer, it causes tranquility and motivation. Causes intense grogginess during overdose. Do not take with alcohol. - -reagent-name-equilibrazine = Equilibrazine -reagent-desc-equilibrazine = A Nanotrasen engineered chemical recipe designed to keep workers working with only small doses. It didn't make the cut, but it functions as a potent treatment for anxiety and panic attacks. Can be taken fine with alcohol, but is wildly incompatible with most antidepressants. - -reagent-name-addictine = addictine -reagent-desc-addictine = A chemical produced by the body when metabolizing certain medications. Causes symptoms of withdrawl. Neutralizes bloodstream cleansers like charcoal and ipecac. - -reagent-name-stubantazine = Stubantazine -reagent-desc-stubantazine = A mild painkiller commonly used to treat brief stents of pain, though it lasts a little while for good measure. Overdose or consumption of alcohol may cause vomiting and digestion inefficiency. - -reagent-name-soretizone = Soretizone -reagent-desc-soretizone = A fairly effective painkiller developed to treat chronic pain. It works for cases that Stubantazine won't solve. Overdoses will knock you right out. High doses may cause addiction. Does not conflict with reasonable amounts of alcohol. - -reagent-name-agonolexyne = Agonolexyne -reagent-desc-agonolexyne = An incredibly potent and fast acting opioid invented to speed up the application of painkillers during surgery. Stops you from feeling pain (or really anything at all). Interacts poorly with alcohol. Known to be very addictive. Overdose may relax the lungs to the point of non-function. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index fdf09906790..73e46c06142 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -1,2 +1,32 @@ +reagent-name-serenitol = Serenitol +reagent-desc-serenitol = A fairly unreactive chemical that has mild antidepressant properties. Originally used to help patients overcome the loss of a pet or family friend, it is fairly safe to administer. + +reagent-name-neurozenium = Neurozenium +reagent-desc-neurozenium = Once considered child-safe shoe polish, Neurozenium was found to be a fairly effective antidepressant in an impressive zero-to-hero story. Do not take it with alcohol in your system. Consult a doctor before combining with other medications. + +reagent-name-blissifylovene = Blissifylovene +reagent-desc-blissifylovene = A military-grade antidepressant with a very low dosage. Very powerful, though it is often considered a last resort due to its interactions with other medications and psychosis-inducing overdoses. Addictive in all but the smallest of doses. + +reagent-name-calmafluxine = Calmafluxine +reagent-desc-calmafluxine = A mild, over-the-counter anxiety medication. Commonly prescribed to children as the body naturally flushes out any excess medication, making overdose functionally impossible. + +reagent-name-tranquinase = Tranquinase +reagent-desc-tranquinase = Run-of-the-mill anxiety medication. Derived from an old recipe for space bear tranquilizer, it causes tranquility and motivation. Causes intense grogginess during overdose. Do not take with alcohol. + +reagent-name-equilibrazine = Equilibrazine +reagent-desc-equilibrazine = A Nanotrasen engineered chemical recipe designed to keep workers working with only small doses. It didn't make the cut, but it functions as a potent treatment for anxiety and panic attacks. Can be taken fine with alcohol, but is wildly incompatible with most antidepressants. + +reagent-name-addictine = addictine +reagent-desc-addictine = A chemical produced by the body when metabolizing certain medications. Causes symptoms of withdrawl. Neutralizes bloodstream cleansers like charcoal and ipecac. + +reagent-name-stubantazine = Stubantazine +reagent-desc-stubantazine = A mild painkiller commonly used to treat brief stents of pain, though it lasts a little while for good measure. Overdose or consumption of alcohol may cause vomiting and digestion inefficiency. + +reagent-name-soretizone = Soretizone +reagent-desc-soretizone = A fairly effective painkiller developed to treat chronic pain. It works for cases that Stubantazine won't solve. Overdoses will knock you right out. High doses may cause addiction. Does not conflict with reasonable amounts of alcohol. + +reagent-name-agonolexyne = Agonolexyne +reagent-desc-agonolexyne = An incredibly potent and fast acting opioid invented to speed up the application of painkillers during surgery. Stops you from feeling pain (or really anything at all). Interacts poorly with alcohol. Known to be very addictive. Overdose may relax the lungs to the point of non-function. + reagent-name-vicodilicaine = Vicodilicaine reagent-desc-vicodilicaine = Is used to treat moderate to severe pain to the head. Most of the time is taken by mouth. Recreational use is common due to its hallucinogen properties. Discouraged to pair with other painkillers, antidepressants, and anxiety medication, though totally safe with alcohol. diff --git a/Resources/Locale/en-US/_CD/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl similarity index 100% rename from Resources/Locale/en-US/_CD/reagents/meta/physical-desc.ftl rename to Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacy.ftl deleted file mode 100644 index 3e796d5c327..00000000000 --- a/Resources/Locale/en-US/deltav/reagents/pharmacy.ftl +++ /dev/null @@ -1,5 +0,0 @@ -reagent-effect-painkiller-head = Your head feels numb. -reagent-effect-painkiller-head2 = You feel like you can think properly. -reagent-effect-painkiller-head3 = You can finally focus. -reagent-effect-painkiller-head4 = You feel relieved. -reagent-effect-painkiller-head-fade = You feel like your head is about to explode \ No newline at end of file diff --git a/Resources/Locale/en-US/_CD/reagents/RPmeds.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl similarity index 93% rename from Resources/Locale/en-US/_CD/reagents/RPmeds.ftl rename to Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index 6d64c0c5596..6badb89fa8b 100644 --- a/Resources/Locale/en-US/_CD/reagents/RPmeds.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -86,4 +86,10 @@ reagent-effect-painkiller-strong4 = Your entire body feels numb. reagent-effect-painkiller-strong5 = You hardly feel anything at all. reagent-effect-painkiller-strong6 = Any pain you were feeling is gone. -reagent-effect-painkiller-fade = The painkiller's effects start to fade... \ No newline at end of file +reagent-effect-painkiller-fade = The painkiller's effects start to fade... + +reagent-effect-painkiller-head = Your head feels numb. +reagent-effect-painkiller-head2 = You feel like you can think properly. +reagent-effect-painkiller-head3 = You can finally focus. +reagent-effect-painkiller-head4 = You feel relieved. +reagent-effect-painkiller-head-fade = You feel like your head is about to explode diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 709a5aa6536..95468ea9cd1 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -1,3 +1,762 @@ +- type: reagent + id: Serenitol + name: reagent-name-serenitol + group: Medicine + desc: reagent-desc-serenitol + physicalDesc: reagent-physical-desc-tart + flavor: medicine + color: "#ebbce9" + metabolisms: + Medicine: + metabolismRate : 0.03 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-antidepressant-mild1" + - "reagent-effect-antidepressant-mild2" + - "reagent-effect-antidepressant-mild3" + - "reagent-effect-antidepressant-mild4" + probability: 0.035 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold # fairly safe overdose, safe to take with alcohol + min: 22.5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 22.5 + damage: + types: + Poison: 0.01 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Neurozenium + name: reagent-name-neurozenium + group: Medicine + desc: reagent-desc-neurozenium + physicalDesc: reagent-physical-desc-crystalline + flavor: metallic + color: "#382f6b" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-antidepressant-normal1" + - "reagent-effect-antidepressant-normal2" + - "reagent-effect-antidepressant-normal3" + - "reagent-effect-antidepressant-normal4" + probability: 0.045 + conditions: + - !type:ReagentThreshold + max: 15.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 15.1 + damage: + types: + Poison: 0.02 + - !type:PopupMessage + type: Local + visualType: MediumCaution + messages: + - "reagent-effect-antidepressant-normaloverdose1" # overdose makes you angry + - "reagent-effect-antidepressant-normaloverdose2" + probability: 0.15 + conditions: + - !type:ReagentThreshold + min: 15.1 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Neurozenium + amount: 0.15 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Serenitol # Purges Serenitol if dosage is too high. + min: 10 + reagent: Serenitol + amount: -7.5 + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Blissifylovene + name: reagent-name-blissifylovene + group: Medicine + desc: reagent-desc-blissifylovene + physicalDesc: reagent-physical-desc-bending + flavor: bitter + color: "#f2ff00" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-antidepressant-strong1" + - "reagent-effect-antidepressant-strong2" + - "reagent-effect-antidepressant-strong3" + - "reagent-effect-antidepressant-strong4" + probability: 0.055 + conditions: + - !type:ReagentThreshold + max: 5.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 5.1 + damage: + types: + Poison: 0.02 # minor poison from OD + - !type:PopupMessage + type: Local + visualType: LargeCaution + messages: + - "reagent-effect-antidepressant-strongoverdose1" # overdose makes you psychotic + - "reagent-effect-antidepressant-strongoverdose2" + - "reagent-effect-antidepressant-strongoverdose3" + - "reagent-effect-antidepressant-strongoverdose4" + - "reagent-effect-antidepressant-strongoverdose5" + - "reagent-effect-antidepressant-strongoverdose6" + - "reagent-effect-antidepressant-strongoverdose7" + - "reagent-effect-antidepressant-strongoverdose8" + - "reagent-effect-antidepressant-strongoverdose9" + probability: 0.15 + conditions: + - !type:ReagentThreshold + min: 5.1 + - !type:Emote + emote: Scream # makes you screna sometimes + showInChat: true + probability: 0.05 + conditions: + - !type:ReagentThreshold + min: 5.1 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 5.1 + key: SeeingRainbows # hallucinations set in after 40 seconds, meaning ~0.40u overdose untreated. + component: SeeingRainbows + type: Add + time: 1.1 + refresh: false + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Blissifylovene + amount: 0.15 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Serenitol # Purges Serenitol if dosage is too high. + min: 10 + reagent: Serenitol + amount: -7.5 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Neurozenium # Purges Neurozenium if dosage is too high + min: 10 + reagent: Neurozenium + amount: -7.5 + - !type:AdjustReagent + probability: 0.5 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + reagent: Addictine + max: 10 # maximum addiction severity for this reagent + - !type:ReagentThreshold + reagent: Blissifylovene + min: 1.5 + reagent: Addictine + amount: 0.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + reagent: Neurozenium # Conflicts with any remaining Neurozenium + min: 0.1 + damage: + types: + Poison: 0.5 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Tranquinase # conflicts with many other meds + min: 2.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.4 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Soretizone # conflicts with many other meds + min: 3.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.3 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Agonolexyne # conflicts with many other meds + min: 0.25 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.3 + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.2 + conditions: + - !type:ReagentThreshold + max: 0.1 + + +- type: reagent + id: Calmafluxine + name: reagent-name-calmafluxine + group: Medicine + desc: reagent-desc-calmafluxine + physicalDesc: reagent-physical-desc-syrupy + flavor: bitter + color: "#634e3a" + metabolisms: + Medicine: + metabolismRate : 0.03 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-anxietymed-mild1" + - "reagent-effect-anxietymed-mild2" + - "reagent-effect-anxietymed-mild3" + - "reagent-effect-anxietymed-mild4" + - "reagent-effect-anxietymed-mild5" + probability: 0.035 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + min: 30 + reagent: Calmafluxine + amount: -1.2 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.35 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Tranquinase + name: reagent-name-tranquinase + group: Medicine + desc: reagent-desc-tranquinase + physicalDesc: reagent-physical-desc-odorless + flavor: sweet + color: "#2e3b52" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-anxietymed-normal1" + - "reagent-effect-anxietymed-normal2" + - "reagent-effect-anxietymed-normal3" + - "reagent-effect-anxietymed-normal4" + - "reagent-effect-anxietymed-normal5" + probability: 0.04 + conditions: + - !type:ReagentThreshold + max: 16.5 + - !type:PopupMessage + type: Local + visualType: LargeCaution + messages: + - "reagent-effect-anxietymed-normaloverdose1" # overdose makes you tired and forgetful + - "reagent-effect-anxietymed-normaloverdose2" + - "reagent-effect-anxietymed-normaloverdose3" + - "reagent-effect-anxietymed-normaloverdose4" + - "reagent-effect-anxietymed-normaloverdose5" + - "reagent-effect-anxietymed-normaloverdose6" + probability: 0.06 + conditions: + - !type:ReagentThreshold + min: 16.5 + - !type:Emote + conditions: + - !type:ReagentThreshold + min: 16.5 + emote: Yawn + showInChat: true + probability: 0.02 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Tranquinase + amount: 0.1 + - !type:MovespeedModifier + walkSpeedModifier: 0.8 + sprintSpeedModifier: 0.8 + conditions: + - !type:ReagentThreshold + min: 16.5 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 20.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.1 + - !type:HealthChange # poisons you if you take way too much + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: + Poison: 1 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.32 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Equilibrazine + name: reagent-name-equilibrazine + group: Medicine + desc: reagent-desc-equilibrazine + physicalDesc: reagent-physical-desc-translucent + flavor: metallic + color: "#291816" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-anxietymed-strong1" + - "reagent-effect-anxietymed-strong2" + - "reagent-effect-anxietymed-strong3" + - "reagent-effect-anxietymed-strong4" + - "reagent-effect-anxietymed-strong5" + - "reagent-effect-anxietymed-strong6" + - "reagent-effect-anxietymed-strong7" + probability: 0.04 + conditions: + - !type:ReagentThreshold + max: 6.7 + - !type:HealthChange # poisons you on OD + conditions: + - !type:ReagentThreshold + min: 6.7 + damage: + types: + Poison: 0.07 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + min: 6.7 + reagent: Histamine # causes allergy-like reaction on OD + amount: 0.25 + - !type:MovespeedModifier + walkSpeedModifier: 0.55 + sprintSpeedModifier: 0.55 + conditions: + - !type:ReagentThreshold + reagent: Serenitol # wildly incompatable with antidepressants + min: 5 + - !type:Paralyze + conditions: + - !type:ReagentThreshold + reagent: Neurozenium # wildly incompatable with antidepressants + min: 5 + - !type:Paralyze + conditions: + - !type:ReagentThreshold + reagent: Blissifylovene # wildly incompatable with antidepressants + min: 3 + - !type:AdjustReagent + reagent: Neurozenium # purges Neurozenium so paralysis isn't too long + amount: -0.5 + - !type:AdjustReagent + reagent: Blissifylovene # purges Blissifylovene so paralysis isn't too long + amount: -0.2 + - !type:AdjustReagent + reagent: Tranquinase # purges Tranquinase + amount: -1.5 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.2 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Addictine + name: reagent-name-addictine + group: Toxins + desc: reagent-desc-addictine + flavor: savory + color: "#d9d9d9" + physicalDesc: reagent-physical-desc-refreshing + metabolisms: + Poison: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: LargeCaution + messages: + - "reagent-effect-medaddiction-1" + - "reagent-effect-medaddiction-2" + - "reagent-effect-medaddiction-3" + - "reagent-effect-medaddiction-4" + - "reagent-effect-medaddiction-5" + - "reagent-effect-medaddiction-6" + - "reagent-effect-medaddiction-7" + - "reagent-effect-medaddiction-8" + probability: 0.08 + conditions: + - !type:ReagentThreshold # the following three chemicals are addictive, and thus will counteract cravings. + reagent: Blissifylovene + max: 0.01 + - !type:ReagentThreshold + reagent: Soretizone + max: 0.01 + - !type:ReagentThreshold + reagent: Agonolexyne + max: 0.01 + - !type:ReagentThreshold # Delta-V - Following four are also addictive + reagent: SpaceDrugs + max: 0.01 + - !type:ReagentThreshold + reagent: THC + max: 0.01 + - !type:ReagentThreshold + reagent: Impedrezene + max: 0.01 + - !type:ReagentThreshold + reagent: Desoxyephedrine + max: 0.01 + - !type:AdjustReagent + reagent: Charcoal # purges bloodstream cleaners + amount: -10.0 + - !type:AdjustReagent + reagent: Ipecac # purges bloodstream cleaners + amount: -10.0 + - !type:MovespeedModifier + walkSpeedModifier: 0.9 # Delta-V : Changes walk-speed modifier from 0.95 to 0.9 + sprintSpeedModifier: 0.7 + conditions: + - !type:ReagentThreshold + max: 1.0 # it gets worse before the addiction ends. + - !type:ReagentThreshold # the following three chemicals are addictive, and thus will counteract cravings. + reagent: Blissifylovene + max: 0.01 + - !type:ReagentThreshold + reagent: Soretizone + max: 0.01 + - !type:ReagentThreshold + reagent: Agonolexyne + max: 0.01 + - !type:ReagentThreshold # Delta-V - Following four are also addictive + reagent: SpaceDrugs + max: 0.01 + - !type:ReagentThreshold + reagent: THC + max: 0.01 + - !type:ReagentThreshold + reagent: Impedrezene + max: 0.01 + - !type:ReagentThreshold + reagent: Desoxyephedrine + max: 0.01 + - !type:GenericStatusEffect # Delta-V - Makes you stutter + key: Stutter + component: StutteringAccent + conditions: + - !type:ReagentThreshold + reagent: Blissifylovene + max: 0.01 + - !type:ReagentThreshold + reagent: Soretizone + max: 0.01 + - !type:ReagentThreshold + reagent: Agonolexyne + max: 0.01 + - !type:ReagentThreshold + reagent: SpaceDrugs + max: 0.01 + - !type:ReagentThreshold + reagent: THC + max: 0.01 + - !type:ReagentThreshold + reagent: Impedrezene + max: 0.01 + - !type:ReagentThreshold + reagent: Desoxyephedrine + max: 0.01 + +- type: reagent + id: Stubantazine + name: reagent-name-stubantazine + group: Medicine + desc: reagent-desc-stubantazine + physicalDesc: reagent-physical-desc-sour + flavor: sour + color: "#6bb3b5" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-painkiller-mild1" + - "reagent-effect-painkiller-mild2" + - "reagent-effect-painkiller-mild3" + - "reagent-effect-painkiller-mild4" + probability: 0.08 + - !type:ChemVomit + probability: 0.4 + conditions: + - !type:ReagentThreshold # makes you vomit if you OD + min: 14 + - !type:SatiateHunger # causes digestion inefficiency during overdose + factor: -1.2 + conditions: + - !type:ReagentThreshold + min: 14 + - !type:ChemVomit + probability: 0.8 + conditions: + - !type:ReagentThreshold # alcohol causes vomiting + reagent: Ethanol + min: 2 + - !type:SatiateHunger # causes digestion inefficiency if you drink alcohol + factor: -2.0 + conditions: + - !type:ReagentThreshold + reagent: Ethanol + min: 2 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out + probability: 0.35 + conditions: + - !type:ReagentThreshold + max: 0.2 + +- type: reagent + id: Soretizone + name: reagent-name-soretizone + group: Medicine + desc: reagent-desc-soretizone + physicalDesc: reagent-physical-desc-thick + flavor: tingly + color: "#2e2c2c" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-normal1" + - "reagent-effect-painkiller-normal2" + - "reagent-effect-painkiller-normal3" + - "reagent-effect-painkiller-normal4" + probability: 0.085 + - !type:GenericStatusEffect + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 14.5 # overdose knocks you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:GenericStatusEffect + probability: 0.08 + conditions: + - !type:ReagentThreshold + reagent: Stubantazine + min: 5 # taking with other painkillers will knock you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # lots of alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 20 + reagent: Soretizone + amount: 0.03 + - !type:AdjustReagent + probability: 0.55 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + reagent: Addictine + max: 5 # maximum addiction severity for this reagent + - !type:ReagentThreshold + min: 9 + reagent: Addictine # add + amount: 0.1 + - !type:PopupMessage + type: Local + visualType: Medium # stronger painkiller = more noticable fading + messages: + - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Agonolexyne + name: reagent-name-agonolexyne + group: Medicine + desc: reagent-desc-agonolexyne + physicalDesc: reagent-physical-desc-overpowering + flavor: nothing + color: "#ffc7c7" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-strong1" + - "reagent-effect-painkiller-strong2" + - "reagent-effect-painkiller-strong3" + - "reagent-effect-painkiller-strong4" + - "reagent-effect-painkiller-strong5" + - "reagent-effect-painkiller-strong6" + probability: 0.1 + - !type:GenericStatusEffect + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Stubantazine + min: 4 # taking with other painkillers will knock you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:GenericStatusEffect + probability: 0.15 + conditions: + - !type:ReagentThreshold + reagent: Soretizone + min: 2 # taking with other painkillers will knock you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Agonolexyne + amount: 0.04 + - !type:AdjustReagent + probability: 0.8 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + reagent: Addictine + max: 25 # maximum addiction severity for this reagent + - !type:ReagentThreshold + min: 0.25 + reagent: Addictine + amount: 0.2 + - !type:Drunk # OD causes drunkeness + conditions: + - !type:ReagentThreshold + min: 5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 5.5 + damage: + types: + Asphyxiation: 1 # your lungs relax so much you can't breathe, suffocating you on OD + - !type:PopupMessage + type: Local + visualType: Large # stronger painkiller = more noticable fading + messages: + - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out + probability: 0.5 + conditions: + - !type:ReagentThreshold + max: 0.1 + - type: reagent id: Vicodilicaine name: reagent-name-vicodilicaine diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index 113bbc4ee14..e71ae680b76 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -1,3 +1,128 @@ +- type: reaction + id: Serenitol + reactants: + Phenol: + amount: 1 + Sugar: + amount: 1 + Water: + amount: 1 + products: + Serenitol: 3 + +- type: reaction + id: Neurozenium + reactants: + Bleach: + amount: 1 + catalyst: true + Acetone: + amount: 1 + Mercury: + amount: 0.5 + Copper: + amount: 0.5 + products: + Neurozenium: 2 + +- type: reaction + id: Blissifylovene + minTemp: 340 + reactants: + Serenitol: + amount: 1 + Synaptizine: + amount: 1 + SodiumCarbonate: + amount: 1 + products: + Blissifylovene: 3 + +- type: reaction + id: Calmafluxine + minTemp: 325 + reactants: + Phenol: + amount: 1 + Inaprovaline: + amount: 1 + Potassium: + amount: 1 + products: + Calmafluxine: 3 + + +- type: reaction + id: Tranquinase + reactants: + ChloralHydrate: + amount: 1 + catalyst: true + Phenol: + amount: 1 + Iron: + amount: 1.2 + Nitrogen: + amount: 1.8 + products: + Tranquinase: 4 + +- type: reaction + id: Equilibrazine + reactants: + FluorosulfuricAcid: + amount: 2 + Sigynate: + amount: 2 + Sugar: + amount: 1 + products: + Equilibrazine: 5 + +- type: reaction + id: Stubantazine + reactants: + Bicaridine: + amount: 1 + Lithium: + amount: 1 + Oil: + amount: 1 + products: + Stubantazine: 3 + +- type: reaction + id: Soretizone + minTemp: 340 + reactants: + Bicaridine: + amount: 1 + Phenol: + amount: 1 + Iron: + amount: 1 + TableSalt: + amount: 1 + catalyst: true + products: + Soretizone: 3 + +- type: reaction + id: Agonolexyne + minTemp: 350 + reactants: + Bicaridine: + amount: 1 + SulfuricAcid: + amount: 1 + Sodium: + amount: 1 + Plasma: + amount: 1 + catalyst: true + products: + Agonolexyne: 3 + - type: reaction id: Vicodilicaine reactants: diff --git a/Resources/Prototypes/_CD/Reactions/medicine.yml b/Resources/Prototypes/_CD/Reactions/medicine.yml deleted file mode 100644 index 1fb06ac5e02..00000000000 --- a/Resources/Prototypes/_CD/Reactions/medicine.yml +++ /dev/null @@ -1,124 +0,0 @@ -- type: reaction - id: Serenitol - reactants: - Phenol: - amount: 1 - Sugar: - amount: 1 - Water: - amount: 1 - products: - Serenitol: 3 - -- type: reaction - id: Neurozenium - reactants: - Bleach: - amount: 1 - catalyst: true - Acetone: - amount: 1 - Mercury: - amount: 0.5 - Copper: - amount: 0.5 - products: - Neurozenium: 2 - -- type: reaction - id: Blissifylovene - minTemp: 340 - reactants: - Serenitol: - amount: 1 - Synaptizine: - amount: 1 - SodiumCarbonate: - amount: 1 - products: - Blissifylovene: 3 - -- type: reaction - id: Calmafluxine - minTemp: 325 - reactants: - Phenol: - amount: 1 - Inaprovaline: - amount: 1 - Potassium: - amount: 1 - products: - Calmafluxine: 3 - - -- type: reaction - id: Tranquinase - reactants: - ChloralHydrate: - amount: 1 - catalyst: true - Phenol: - amount: 1 - Iron: - amount: 1.2 - Nitrogen: - amount: 1.8 - products: - Tranquinase: 4 - -- type: reaction - id: Equilibrazine - reactants: - FluorosulfuricAcid: - amount: 2 - Sigynate: - amount: 2 - Sugar: - amount: 1 - products: - Equilibrazine: 5 - -- type: reaction - id: Stubantazine - reactants: - Bicaridine: - amount: 1 - Lithium: - amount: 1 - Oil: - amount: 1 - products: - Stubantazine: 3 - -- type: reaction - id: Soretizone - minTemp: 340 - reactants: - Bicaridine: - amount: 1 - Phenol: - amount: 1 - Iron: - amount: 1 - TableSalt: - amount: 1 - catalyst: true - products: - Soretizone: 3 - -- type: reaction - id: Agonolexyne - minTemp: 350 - reactants: - Bicaridine: - amount: 1 - SulfuricAcid: - amount: 1 - Sodium: - amount: 1 - Plasma: - amount: 1 - catalyst: true - products: - Agonolexyne: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CD/Reagents/medicine.yml b/Resources/Prototypes/_CD/Reagents/medicine.yml deleted file mode 100644 index 4de928336e7..00000000000 --- a/Resources/Prototypes/_CD/Reagents/medicine.yml +++ /dev/null @@ -1,759 +0,0 @@ -- type: reagent - id: Serenitol - name: reagent-name-serenitol - group: Medicine - desc: reagent-desc-serenitol - physicalDesc: reagent-physical-desc-tart - flavor: medicine - color: "#ebbce9" - metabolisms: - Medicine: - metabolismRate : 0.03 - effects: - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-antidepressant-mild1" - - "reagent-effect-antidepressant-mild2" - - "reagent-effect-antidepressant-mild3" - - "reagent-effect-antidepressant-mild4" - probability: 0.035 - - !type:ChemVomit - probability: 0.1 - conditions: - - !type:ReagentThreshold # fairly safe overdose, safe to take with alcohol - min: 22.5 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 22.5 - damage: - types: - Poison: 0.01 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.4 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Neurozenium - name: reagent-name-neurozenium - group: Medicine - desc: reagent-desc-neurozenium - physicalDesc: reagent-physical-desc-crystalline - flavor: metallic - color: "#382f6b" - metabolisms: - Medicine: - metabolismRate : 0.02 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-antidepressant-normal1" - - "reagent-effect-antidepressant-normal2" - - "reagent-effect-antidepressant-normal3" - - "reagent-effect-antidepressant-normal4" - probability: 0.045 - conditions: - - !type:ReagentThreshold - max: 15.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 15.1 - damage: - types: - Poison: 0.02 - - !type:PopupMessage - type: Local - visualType: MediumCaution - messages: - - "reagent-effect-antidepressant-normaloverdose1" # overdose makes you angry - - "reagent-effect-antidepressant-normaloverdose2" - probability: 0.15 - conditions: - - !type:ReagentThreshold - min: 15.1 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Neurozenium - amount: 0.15 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Serenitol # Purges Serenitol if dosage is too high. - min: 10 - reagent: Serenitol - amount: -7.5 - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.4 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Blissifylovene - name: reagent-name-blissifylovene - group: Medicine - desc: reagent-desc-blissifylovene - physicalDesc: reagent-physical-desc-bending - flavor: bitter - color: "#f2ff00" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-antidepressant-strong1" - - "reagent-effect-antidepressant-strong2" - - "reagent-effect-antidepressant-strong3" - - "reagent-effect-antidepressant-strong4" - probability: 0.055 - conditions: - - !type:ReagentThreshold - max: 5.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 5.1 - damage: - types: - Poison: 0.02 # minor poison from OD - - !type:PopupMessage - type: Local - visualType: LargeCaution - messages: - - "reagent-effect-antidepressant-strongoverdose1" # overdose makes you psychotic - - "reagent-effect-antidepressant-strongoverdose2" - - "reagent-effect-antidepressant-strongoverdose3" - - "reagent-effect-antidepressant-strongoverdose4" - - "reagent-effect-antidepressant-strongoverdose5" - - "reagent-effect-antidepressant-strongoverdose6" - - "reagent-effect-antidepressant-strongoverdose7" - - "reagent-effect-antidepressant-strongoverdose8" - - "reagent-effect-antidepressant-strongoverdose9" - probability: 0.15 - conditions: - - !type:ReagentThreshold - min: 5.1 - - !type:Emote - emote: Scream # makes you screna sometimes - showInChat: true - probability: 0.05 - conditions: - - !type:ReagentThreshold - min: 5.1 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - min: 5.1 - key: SeeingRainbows # hallucinations set in after 40 seconds, meaning ~0.40u overdose untreated. - component: SeeingRainbows - type: Add - time: 1.1 - refresh: false - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Blissifylovene - amount: 0.15 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Serenitol # Purges Serenitol if dosage is too high. - min: 10 - reagent: Serenitol - amount: -7.5 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Neurozenium # Purges Neurozenium if dosage is too high - min: 10 - reagent: Neurozenium - amount: -7.5 - - !type:AdjustReagent - probability: 0.5 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 10 # maximum addiction severity for this reagent - - !type:ReagentThreshold - reagent: Blissifylovene - min: 1.5 - reagent: Addictine - amount: 0.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - reagent: Neurozenium # Conflicts with any remaining Neurozenium - min: 0.1 - damage: - types: - Poison: 0.5 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: Tranquinase # conflicts with many other meds - min: 2.0 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.4 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: Soretizone # conflicts with many other meds - min: 3.0 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.3 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: Agonolexyne # conflicts with many other meds - min: 0.25 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.3 - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.2 - conditions: - - !type:ReagentThreshold - max: 0.1 - - -- type: reagent - id: Calmafluxine - name: reagent-name-calmafluxine - group: Medicine - desc: reagent-desc-calmafluxine - physicalDesc: reagent-physical-desc-syrupy - flavor: bitter - color: "#634e3a" - metabolisms: - Medicine: - metabolismRate : 0.03 - effects: - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-anxietymed-mild1" - - "reagent-effect-anxietymed-mild2" - - "reagent-effect-anxietymed-mild3" - - "reagent-effect-anxietymed-mild4" - - "reagent-effect-anxietymed-mild5" - probability: 0.035 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - min: 30 - reagent: Calmafluxine - amount: -1.2 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.35 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Tranquinase - name: reagent-name-tranquinase - group: Medicine - desc: reagent-desc-tranquinase - physicalDesc: reagent-physical-desc-odorless - flavor: sweet - color: "#2e3b52" - metabolisms: - Medicine: - metabolismRate : 0.02 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-anxietymed-normal1" - - "reagent-effect-anxietymed-normal2" - - "reagent-effect-anxietymed-normal3" - - "reagent-effect-anxietymed-normal4" - - "reagent-effect-anxietymed-normal5" - probability: 0.04 - conditions: - - !type:ReagentThreshold - max: 16.5 - - !type:PopupMessage - type: Local - visualType: LargeCaution - messages: - - "reagent-effect-anxietymed-normaloverdose1" # overdose makes you tired and forgetful - - "reagent-effect-anxietymed-normaloverdose2" - - "reagent-effect-anxietymed-normaloverdose3" - - "reagent-effect-anxietymed-normaloverdose4" - - "reagent-effect-anxietymed-normaloverdose5" - - "reagent-effect-anxietymed-normaloverdose6" - probability: 0.06 - conditions: - - !type:ReagentThreshold - min: 16.5 - - !type:Emote - conditions: - - !type:ReagentThreshold - min: 16.5 - emote: Yawn - showInChat: true - probability: 0.02 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Tranquinase - amount: 0.1 - - !type:MovespeedModifier - walkSpeedModifier: 0.8 - sprintSpeedModifier: 0.8 - conditions: - - !type:ReagentThreshold - min: 16.5 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - min: 20.0 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.1 - - !type:HealthChange # poisons you if you take way too much - conditions: - - !type:ReagentThreshold - min: 30 - damage: - types: - Poison: 1 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.32 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Equilibrazine - name: reagent-name-equilibrazine - group: Medicine - desc: reagent-desc-equilibrazine - physicalDesc: reagent-physical-desc-translucent - flavor: metallic - color: "#291816" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-anxietymed-strong1" - - "reagent-effect-anxietymed-strong2" - - "reagent-effect-anxietymed-strong3" - - "reagent-effect-anxietymed-strong4" - - "reagent-effect-anxietymed-strong5" - - "reagent-effect-anxietymed-strong6" - - "reagent-effect-anxietymed-strong7" - probability: 0.04 - conditions: - - !type:ReagentThreshold - max: 6.7 - - !type:HealthChange # poisons you on OD - conditions: - - !type:ReagentThreshold - min: 6.7 - damage: - types: - Poison: 0.07 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - min: 6.7 - reagent: Histamine # causes allergy-like reaction on OD - amount: 0.25 - - !type:MovespeedModifier - walkSpeedModifier: 0.55 - sprintSpeedModifier: 0.55 - conditions: - - !type:ReagentThreshold - reagent: Serenitol # wildly incompatable with antidepressants - min: 5 - - !type:Paralyze - conditions: - - !type:ReagentThreshold - reagent: Neurozenium # wildly incompatable with antidepressants - min: 5 - - !type:Paralyze - conditions: - - !type:ReagentThreshold - reagent: Blissifylovene # wildly incompatable with antidepressants - min: 3 - - !type:AdjustReagent - reagent: Neurozenium # purges Neurozenium so paralysis isn't too long - amount: -0.5 - - !type:AdjustReagent - reagent: Blissifylovene # purges Blissifylovene so paralysis isn't too long - amount: -0.2 - - !type:AdjustReagent - reagent: Tranquinase # purges Tranquinase - amount: -1.5 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.2 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Addictine - name: reagent-name-addictine - group: Toxins - desc: reagent-desc-addictine - flavor: savory - color: "#d9d9d9" - physicalDesc: reagent-physical-desc-refreshing - metabolisms: - Poison: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: LargeCaution - messages: - - "reagent-effect-medaddiction-1" - - "reagent-effect-medaddiction-2" - - "reagent-effect-medaddiction-3" - - "reagent-effect-medaddiction-4" - - "reagent-effect-medaddiction-5" - - "reagent-effect-medaddiction-6" - - "reagent-effect-medaddiction-7" - - "reagent-effect-medaddiction-8" - probability: 0.08 - conditions: - - !type:ReagentThreshold # the following three chemicals are addictive, and thus will counteract cravings. - reagent: Blissifylovene - max: 0.01 - - !type:ReagentThreshold - reagent: Soretizone - max: 0.01 - - !type:ReagentThreshold - reagent: Agonolexyne - max: 0.01 - - !type:ReagentThreshold # Delta-V - Following four are also addictive - reagent: SpaceDrugs - max: 0.01 - - !type:ReagentThreshold - reagent: THC - max: 0.01 - - !type:ReagentThreshold - reagent: Impedrezene - max: 0.01 - - !type:ReagentThreshold - reagent: Desoxyephedrine - max: 0.01 - - !type:AdjustReagent - reagent: Charcoal # purges bloodstream cleaners - amount: -10.0 - - !type:AdjustReagent - reagent: Ipecac # purges bloodstream cleaners - amount: -10.0 - - !type:MovespeedModifier - walkSpeedModifier: 0.9 # Delta-V : Changes walk-speed modifier from 0.95 to 0.9 - sprintSpeedModifier: 0.7 - conditions: - - !type:ReagentThreshold - max: 1.0 # it gets worse before the addiction ends. - - !type:ReagentThreshold # the following three chemicals are addictive, and thus will counteract cravings. - reagent: Blissifylovene - max: 0.01 - - !type:ReagentThreshold - reagent: Soretizone - max: 0.01 - - !type:ReagentThreshold - reagent: Agonolexyne - max: 0.01 - - !type:ReagentThreshold # Delta-V - Following four are also addictive - reagent: SpaceDrugs - max: 0.01 - - !type:ReagentThreshold - reagent: THC - max: 0.01 - - !type:ReagentThreshold - reagent: Impedrezene - max: 0.01 - - !type:ReagentThreshold - reagent: Desoxyephedrine - max: 0.01 - - !type:GenericStatusEffect # Delta-V - Makes you stutter - key: Stutter - component: StutteringAccent - conditions: - - !type:ReagentThreshold - reagent: Blissifylovene - max: 0.01 - - !type:ReagentThreshold - reagent: Soretizone - max: 0.01 - - !type:ReagentThreshold - reagent: Agonolexyne - max: 0.01 - - !type:ReagentThreshold - reagent: SpaceDrugs - max: 0.01 - - !type:ReagentThreshold - reagent: THC - max: 0.01 - - !type:ReagentThreshold - reagent: Impedrezene - max: 0.01 - - !type:ReagentThreshold - reagent: Desoxyephedrine - max: 0.01 - -- type: reagent - id: Stubantazine - name: reagent-name-stubantazine - group: Medicine - desc: reagent-desc-stubantazine - physicalDesc: reagent-physical-desc-sour - flavor: sour - color: "#6bb3b5" - metabolisms: - Medicine: - metabolismRate : 0.02 - effects: - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-painkiller-mild1" - - "reagent-effect-painkiller-mild2" - - "reagent-effect-painkiller-mild3" - - "reagent-effect-painkiller-mild4" - probability: 0.08 - - !type:ChemVomit - probability: 0.4 - conditions: - - !type:ReagentThreshold # makes you vomit if you OD - min: 14 - - !type:SatiateHunger # causes digestion inefficiency during overdose - factor: -1.2 - conditions: - - !type:ReagentThreshold - min: 14 - - !type:ChemVomit - probability: 0.8 - conditions: - - !type:ReagentThreshold # alcohol causes vomiting - reagent: Ethanol - min: 2 - - !type:SatiateHunger # causes digestion inefficiency if you drink alcohol - factor: -2.0 - conditions: - - !type:ReagentThreshold - reagent: Ethanol - min: 2 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out - probability: 0.35 - conditions: - - !type:ReagentThreshold - max: 0.2 - -- type: reagent - id: Soretizone - name: reagent-name-soretizone - group: Medicine - desc: reagent-desc-soretizone - physicalDesc: reagent-physical-desc-thick - flavor: tingly - color: "#2e2c2c" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-painkiller-normal1" - - "reagent-effect-painkiller-normal2" - - "reagent-effect-painkiller-normal3" - - "reagent-effect-painkiller-normal4" - probability: 0.085 - - !type:GenericStatusEffect - probability: 0.1 - conditions: - - !type:ReagentThreshold - min: 14.5 # overdose knocks you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:GenericStatusEffect - probability: 0.08 - conditions: - - !type:ReagentThreshold - reagent: Stubantazine - min: 5 # taking with other painkillers will knock you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # lots of alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 20 - reagent: Soretizone - amount: 0.03 - - !type:AdjustReagent - probability: 0.55 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 5 # maximum addiction severity for this reagent - - !type:ReagentThreshold - min: 9 - reagent: Addictine # add - amount: 0.1 - - !type:PopupMessage - type: Local - visualType: Medium # stronger painkiller = more noticable fading - messages: - - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out - probability: 0.4 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Agonolexyne - name: reagent-name-agonolexyne - group: Medicine - desc: reagent-desc-agonolexyne - physicalDesc: reagent-physical-desc-overpowering - flavor: nothing - color: "#ffc7c7" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-painkiller-strong1" - - "reagent-effect-painkiller-strong2" - - "reagent-effect-painkiller-strong3" - - "reagent-effect-painkiller-strong4" - - "reagent-effect-painkiller-strong5" - - "reagent-effect-painkiller-strong6" - probability: 0.1 - - !type:GenericStatusEffect - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Stubantazine - min: 4 # taking with other painkillers will knock you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:GenericStatusEffect - probability: 0.15 - conditions: - - !type:ReagentThreshold - reagent: Soretizone - min: 2 # taking with other painkillers will knock you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Agonolexyne - amount: 0.04 - - !type:AdjustReagent - probability: 0.8 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 25 # maximum addiction severity for this reagent - - !type:ReagentThreshold - min: 0.25 - reagent: Addictine - amount: 0.2 - - !type:Drunk # OD causes drunkeness - conditions: - - !type:ReagentThreshold - min: 5 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 5.5 - damage: - types: - Asphyxiation: 1 # your lungs relax so much you can't breathe, suffocating you on OD - - !type:PopupMessage - type: Local - visualType: Large # stronger painkiller = more noticable fading - messages: - - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out - probability: 0.5 - conditions: - - !type:ReagentThreshold - max: 0.1 - \ No newline at end of file From 9d9414cf87776a09d0b725dd6eca4685fdd231ac Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 3 Aug 2024 01:09:22 +0200 Subject: [PATCH 03/86] Zepprocane & More! Adds Zepprocane, Barbituric Acid, Sodium Amalgam, Hydrogen Iodide, and future chem for Asparatine --- .../deltav/reagents/meta/pharmachemicals.ftl | 8 + .../en-US/deltav/reagents/meta/pharmacy.ftl | 8 +- .../en-US/deltav/reagents/pharmacymsg.ftl | 3 + .../en-US/deltav/reagents/sodiumamalgam.flt | 1 + .../DeltaV/Reagents/pharmachemicals.yml | 48 +++++ .../Prototypes/DeltaV/Reagents/pharmacy.yml | 201 ++++++++---------- .../Recipes/Reactions/pharmachemicals.yml | 44 ++++ .../DeltaV/Recipes/Reactions/pharmacy.yml | 22 +- 8 files changed, 223 insertions(+), 112 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl create mode 100644 Resources/Locale/en-US/deltav/reagents/sodiumamalgam.flt create mode 100644 Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml create mode 100644 Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl new file mode 100644 index 00000000000..42c339463ac --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -0,0 +1,8 @@ +reagent-name-hydrogeniodide = hydrogen iodide +reagent-desc-hydrogeniodide = Also called iodine hydride, (HI) is a very light molecule most of the time used in pharamaceutical reactions. + +reagent-name-sodiumamalgam = sodium amalgam +reagent-desc-sodiumamalgam = Comes from an exothermic reaction to sodium and mercury. Really ugly. + +reagent-name-barbituricacid = barbituric acid +reagent-desc-barbituricacid = Odorless reagent, barbituric acid itself is not pharmacologically active on its own. Legend says its name comes from "Barbara". \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index 73e46c06142..aa60a15b90c 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -29,4 +29,10 @@ reagent-name-agonolexyne = Agonolexyne reagent-desc-agonolexyne = An incredibly potent and fast acting opioid invented to speed up the application of painkillers during surgery. Stops you from feeling pain (or really anything at all). Interacts poorly with alcohol. Known to be very addictive. Overdose may relax the lungs to the point of non-function. reagent-name-vicodilicaine = Vicodilicaine -reagent-desc-vicodilicaine = Is used to treat moderate to severe pain to the head. Most of the time is taken by mouth. Recreational use is common due to its hallucinogen properties. Discouraged to pair with other painkillers, antidepressants, and anxiety medication, though totally safe with alcohol. +reagent-desc-vicodilicaine = Used to treat moderate to severe pain to the head. Most of the time is taken by mouth. Recreational use is common due to its hallucinogen properties. Discouraged to pair with other strong painkillers, antidepressants, and anxiety medication, though totally safe with alcohol. + +reagent-name-asparatine = Asparatine +reagent-desc-asparatine = A basic nonsteroidal anti-inflammatory drug used to combat light headaches. Overdose or consumption of alcohol will obliterate your digestive system. + +reagent-name-zepprocane = Zepprocane +reagent-desc-zepprocane = A high-quality barbiturate, used as an anxiolitic and anticonvulsant medicicine. From its complex form, it goes along well with antidepressants and alcohol, but is incompatible with most painkillers. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index 6badb89fa8b..a12b8f8419e 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -93,3 +93,6 @@ reagent-effect-painkiller-head2 = You feel like you can think properly. reagent-effect-painkiller-head3 = You can finally focus. reagent-effect-painkiller-head4 = You feel relieved. reagent-effect-painkiller-head-fade = You feel like your head is about to explode + +reagent-effect-asparatine-overdose = Your tummy aches. +reagent-effect-asparatine-overdose2 = It feels like you're getting stabbed in the guts \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.flt b/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.flt new file mode 100644 index 00000000000..4d4b90ebb5c --- /dev/null +++ b/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.flt @@ -0,0 +1 @@ +sodiumamalgam-spark = The sodium melts with the mercury! \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml new file mode 100644 index 00000000000..7625495a8c0 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -0,0 +1,48 @@ +- type: reagent + id: HydrogenIodide + name: reagent-name-hydrogeniodide + desc: reagent-desc-hydrogeniodide + physicalDesc: reagent-physical-desc-odorless + flavor: bitter + color: "white" + boilingPoint: 222.0 + meltingPoint: 237.0 + +- type: reagent + id: SodiumAmalgam + name: reagent-name-sodiumamalgam + desc: reagent-desc-sodiumamalgam + physicalDesc: reagent-physical-desc-shiny + flavor: metalic + color: "#c9bba3" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + Piercing: 0.5 + +- type: reagent + id: BarbituricAcid + name: reagent-name-barbituricacid + desc: reagent-desc-barbituricacid + physicalDesc: reagent-physical-desc-powdery + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 2.5 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 95468ea9cd1..999e188cfee 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -762,11 +762,11 @@ name: reagent-name-vicodilicaine group: Pharmacy desc: reagent-desc-vicodilicaine - physicalDesc: reagent-physical-desc-opaque - flavor: medicine + physicalDesc: reagent-physical-desc-thick color: "#9c7b28" metabolisms: Medicine: + metabolismRate : 0.01 effects: - !type:GenericStatusEffect # Makes the player "hallucinate" or high key: SeeingRainbows @@ -786,72 +786,20 @@ - !type:HealthChange # Poisons and pierces your intestins on overdose conditions: - !type:ReagentThreshold - min: 7.6 + min: 7.6 damage: types: Poison: 0.07 Piercing: 0.03 - !type:PopupMessage # A decent chance to notify the player when their meds run out type: Local - visualType: Small + visualType: Medium messages: - "reagent-effect-painkiller-fade" - probability: 0.35 + probability: 0.4 conditions: - !type:ReagentThreshold max: 0.2 - - !type:PopupMessage # Notifies the player when their med ran out - type: Local - visualType: Large - probability: 1 - messages: - - "reagent-effect-painkiller-head-fade" - conditions: - - !type:ReagentThreshold - max: 0.1 - - !type:AdjustReagent - probability: 0.5 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 20 # maximum addiction severity for this reagent - - !type:ReagentThreshold - reagent: Vicodilicaine - min: 1.5 - reagent: Addictine - amount: 0.1 - - !type:ChemVomit # NORMAL Makes you vomit if Stubantazine (PK) is ingested - probability: 0.4 - conditions: - - !type:ReagentThreshold - reagent: Stubantazine - min: 3 - - !type:GenericStatusEffect # NORMAL Makes you pass out if you take too much of Stubantazine (PK) - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Stubantazine - min: 5.5 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:ChemVomit # MILD Makes you vomit if Soretizone (PK) is ingested - probability: 0.4 - conditions: - - !type:ReagentThreshold - reagent: Soretizone - min: 2 - - !type:GenericStatusEffect # MILD Makes you pass out if you take too much of Soretizone (PK) - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Soretizone - min: 4.8 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - !type:ChemVomit # STRONG Makes you vomit if Agonolexyne (PK) is ingested probability: 0.4 conditions: @@ -862,106 +810,139 @@ probability: 0.1 conditions: - !type:ReagentThreshold - reagent: Agonolexyne + reagent: Blissifylovene min: 3.6 key: ForcedSleep component: ForcedSleeping refresh: false type: Add - - !type:ChemVomit # NORMAL Makes you vomit if Serenitol (AD) is ingested + - !type:ChemVomit # STRONG Makes you vomit if Blissifylovene (AD) is ingested probability: 0.4 conditions: - !type:ReagentThreshold - reagent: Serenitol - min: 3 - - !type:GenericStatusEffect # NORMAL Makes you pass out if you take too much of Serenitol (AD) + reagent: Blissifylovene + min: 1.4 + - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Blissifylovene (AD) probability: 0.1 conditions: - !type:ReagentThreshold - reagent: Serenitol - min: 5.5 + reagent: Blissifylovene + min: 3.6 key: ForcedSleep component: ForcedSleeping refresh: false type: Add - - !type:ChemVomit # MILD Makes you vomit if Neurozenium (AD) is ingested + - !type:ChemVomit # STRONG Makes you vomit if Equilibrazine (AA) is ingested probability: 0.4 conditions: - !type:ReagentThreshold - reagent: Neurozenium + reagent: Equilibrazine min: 2 - - !type:GenericStatusEffect # MILD Makes you pass out if you take too much of Neurozenium (AD) + - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Equilibrazine (AA) probability: 0.1 conditions: - !type:ReagentThreshold - reagent: Neurozenium + reagent: Equilibrazine min: 4.8 key: ForcedSleep component: ForcedSleeping refresh: false type: Add - - !type:ChemVomit # STRONG Makes you vomit if Blissifylovene (AD) is ingested - probability: 0.4 + +- type: reagent + id: Asparatine + name: reagent-name-asparatine + group: Pharmacy + desc: reagent-desc-asparatine + physicalDesc: reagent-physical-desc-thick + color: "#093175" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-normal" + - "reagent-effect-painkiller-normal2" + - "reagent-effect-painkiller-normal3" + - "reagent-effect-painkiller-normal4" + probability: 0.085 + - !type:AdjustReagent conditions: - - !type:ReagentThreshold - reagent: Blissifylovene - min: 1.4 - - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Blissifylovene (AD) - probability: 0.1 + - !type:HealthChange # Poisons and pierces your insides on overdose conditions: - !type:ReagentThreshold - reagent: Blissifylovene - min: 3.6 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:ChemVomit # NORMAL Makes you vomit if Tranquinase (AA) is ingested - probability: 0.4 - conditions: + min: 15.5 + damage: + types: + Poison: 3 + Piercing: 2 - !type:ReagentThreshold - reagent: Tranquinase - min: 3 - - !type:GenericStatusEffect # NORMAL Makes you pass out if you take too much of Tranquinase (AA) - probability: 0.1 + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Asparatine + amount: 0.15 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-painkiller-fade" + probability: 0.5 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Zepprocane + name: reagent-name-zepprocane + group: Pharmacy + desc: reagent-desc-zepprocane + physicalDesc: reagent-physical-desc-thick + color: "#611a54" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-anxietymed-strong1" + - "reagent-effect-anxietymed-strong2" + - "reagent-effect-anxietymed-strong3" + - "reagent-effect-anxietymed-strong4" + - "reagent-effect-anxietymed-strong5" + - "reagent-effect-anxietymed-strong6" + - "reagent-effect-anxietymed-strong7" + probability: 0.085 + - !type:GenericStatusEffect conditions: - !type:ReagentThreshold - reagent: Tranquinase - min: 5.5 + reagent: Vicodilicaine # conflicts with strong painkillers + min: 2.0 key: ForcedSleep component: ForcedSleeping refresh: false type: Add - - !type:ChemVomit # MILD Makes you vomit if Calmafluxine (AA) is ingested probability: 0.4 + - !type:GenericStatusEffect conditions: - !type:ReagentThreshold - reagent: Calmafluxine - min: 2 - - !type:GenericStatusEffect # MILD Makes you pass out if you take too much of Calmafluxine (AA) - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Calmafluxine - min: 4.8 + reagent: Agonolexyne # conflicts with strong painkillers + min: 2.0 key: ForcedSleep component: ForcedSleeping refresh: false type: Add - - !type:ChemVomit # STRONG Makes you vomit if Equilibrazine (AA) is ingested probability: 0.4 + - !type:GenericStatusEffect conditions: - !type:ReagentThreshold - reagent: Equilibrazine - min: 2 - - !type:GenericStatusEffect # STRONG Makes you pass out if you take too much of Equilibrazine (AA) - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Equilibrazine - min: 4.8 + reagent: Stubantazine # conflicts with strong painkillers + min: 2.0 key: ForcedSleep component: ForcedSleeping refresh: false - type: Add - \ No newline at end of file + type: Add \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml new file mode 100644 index 00000000000..0114ff1f288 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -0,0 +1,44 @@ +- type: reaction + id: HydrogenIodide + mintemp: 310 + reactants: + Hydrogen: + amount: 2 + Iodine: + amount: 2 + products: + HydrogenIodide: 1 + +- type: reaction + id: SodiumAmalgam + impact: Medium + mintemp: 310 + reactants: + Sodium: + amount: 1 + Mercury: + amount: 1 + effects: + - !type:ExplosionReactionEffect + explosionType: Default # 15 damage per intensity. + maxIntensity: 0.0001 + intensityPerUnit: 0.0001 + intensitySlope: 0.0001 + maxTotalIntensity: 0.0001 + - !type:PopupMessage + messages: [ "The sodium melts with the mercury!" ] + type: Pvs + visualType: LargeCaution + products: + SodiumAmalgam: 2 + +- type: reaction + id: BarbituricAcid + minTemp: 370 + reactants: + HydrogenIodide: + amount: 1 + SodiumAmalgam: + amount: 1 + products: + BarbituricAcid: 2 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index e71ae680b76..e80da74881e 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -122,7 +122,7 @@ catalyst: true products: Agonolexyne: 3 - + - type: reaction id: Vicodilicaine reactants: @@ -136,3 +136,23 @@ amount: 1 products: Vicodilicaine: 4 + +# - type: reaction +# id: Asparatine +# reactants: +# Vicodilicaine: +# amount: 1 +# Zepprocane: +# amount: 1 +# products: +# Asparatine: 1 + +- type: reaction + id: Zepprocane + reactants: + BarbituricAcid: + amount: 1 + Desoxyephedrine: + amount: 1 + products: + Zepprocane: 2 From 3223c55a8cdeae933da68e7bbe29d83c65662071 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 3 Aug 2024 03:18:19 +0200 Subject: [PATCH 04/86] Pharmacist clothing + Asparatin Adds a lab coat and a suit for the pharmacist. Adds Asparatin, at least its effects (thx for the help solidus YES IM TAGGING YOU I WAS DESPERATE) Co-Authored-By: VMSolidus <16548818+VMSolidus@users.noreply.github.com> --- .../Entities/Clothing/OuterClothing/coats.yml | 14 ++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 10 +++++ .../Prototypes/DeltaV/Reagents/pharmacy.yml | 20 ++++----- .../DeltaV/Recipes/Reactions/pharmacy.yml | 12 +---- .../equipped-OUTERCLOTHING.png | Bin 0 -> 1667 bytes .../labcoat_pharmacist.rsi/icon-open.png | Bin 0 -> 969 bytes .../Coats/labcoat_pharmacist.rsi/icon.png | Bin 0 -> 925 bytes .../labcoat_pharmacist.rsi/inhand-left.png | Bin 0 -> 1025 bytes .../labcoat_pharmacist.rsi/inhand-right.png | Bin 0 -> 1015 bytes .../Coats/labcoat_pharmacist.rsi/meta.json | 41 ++++++++++++++++++ .../open-equipped-OUTERCLOTHING.png | Bin 0 -> 1657 bytes .../open-inhand-left.png | Bin 0 -> 1011 bytes .../open-inhand-right.png | Bin 0 -> 1015 bytes .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1501 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1895 bytes .../Jumpsuit/pharmacistshirt.rsi/icon.png | Bin 0 -> 841 bytes .../pharmacistshirt.rsi/inhand-left.png | Bin 0 -> 1005 bytes .../pharmacistshirt.rsi/inhand-right.png | Bin 0 -> 1010 bytes .../Jumpsuit/pharmacistshirt.rsi/meta.json | 30 +++++++++++++ 19 files changed, 106 insertions(+), 21 deletions(-) create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/icon-open.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml index 954255a3dc4..16f8a055644 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml @@ -140,3 +140,17 @@ - type: TemperatureProtection coefficient: 0.1 +- type: entity + parent: ClothingOuterStorageFoldableBase + id: ClothingOuterCoatLabPharma + name: pharmacist lab coat + description: A suit that protects against minor chemical spills. Has an orange and blue stripe on the shoulder and arm. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.75 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index a2f97d246a5..9e4bdfc1bc5 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -321,3 +321,13 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitPharmaShirt + name: pharmacist shirt + description: There's still some odd stains on this suit. Hm. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 999e188cfee..1b1a81d3bf0 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -864,27 +864,27 @@ type: Local visualType: Large messages: - - "reagent-effect-painkiller-normal" + - "reagent-effect-painkiller-normal1" - "reagent-effect-painkiller-normal2" - "reagent-effect-painkiller-normal3" - "reagent-effect-painkiller-normal4" probability: 0.085 - - !type:AdjustReagent - conditions: - - !type:HealthChange # Poisons and pierces your insides on overdose + - !type:HealthChange # Poisons and pierces your intestins on overdose conditions: - !type:ReagentThreshold min: 15.5 damage: types: - Poison: 3 - Piercing: 2 + Poison: 2 + Piercing: 1 + - !type:AdjustReagent + conditions: - !type:ReagentThreshold reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. min: 1 - reagent: Asparatine - amount: 0.15 - - !type:PopupMessage + reagent: Asparatine + amount: 0.1 + - !type:PopupMessage type: Local visualType: Small messages: @@ -945,4 +945,4 @@ key: ForcedSleep component: ForcedSleeping refresh: false - type: Add \ No newline at end of file + type: Add diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index e80da74881e..f95c04ce8ee 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -136,17 +136,7 @@ amount: 1 products: Vicodilicaine: 4 - -# - type: reaction -# id: Asparatine -# reactants: -# Vicodilicaine: -# amount: 1 -# Zepprocane: -# amount: 1 -# products: -# Asparatine: 1 - + - type: reaction id: Zepprocane reactants: diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4071851a5e644bd31c646386b62e00af9db98cb4 GIT binary patch literal 1667 zcmV-}27LL6P)$C)^3f2@jfSzAm$Bk?#FrWT<)9!S2(BVt=4JC7fNO%6x0@%mNm~S z?YQWrgFsxjjJfD+jHc`Bo)%T_##FE7_x@d7$&{r-OS^DDH_Vc-Ohb6RWGLPd?$@*N zr0|ij-;@D`ua%x~_(gHX;Sa@TEHVQw)lKt2qA)KBq*~+juK;13zFIYzVTn*JVo*7@;2DO6i0@vc>SW5rE5xRTJ)4WIW|=8 zfAh4`lM_yNZxGs^ZTo!~JiAb>*!K6aZC6jg{REeVy1ytnO?`@9scXJN=-GnvtGbrh zgNtn#cr@Z>{8w_zcBRwsb_U%`(02=+D^6Cmb50*1wkf~p2KEnNMDF*j{s0mnXc8rK zagP81010qNS#tmY3labT3lag+-G2N400g^9L_t(|0qvSkOB+EL#>Y~;1e=Sc_~#<@ zVh<9?r6`DaD3tc-q0mzi?4>C63rIgerLlNWkU~AQ2YX9FDu{@Jr47VOEuwhQlv*!A zh0;r!-^ja8H!;~+cZ1M*Av-%W@67YeGn3g(-cib#Q@|Y^&6e?BKCClw#5v&Cu(+5muofdSRp+NwG_Ix5;792}I6j*isI z%8D8r8>^@figS@4_(MZOx_WPKPqnnPc&^9C$EvHVOXn9B7NW<0|FF5l0GVYBG9G&Q zhCD_+e)ya9m%SH!4N~XA>WCDd&PuP^N?%8AXz0z&O`VDeGI%N1er5ltNSOGDTg#}o z#lKc>cIMMFD);TwbL;8pQS0mLYIJl|&pau4%Ej=fT@+^G^A$TiJ?CQfPdQ%=%m%-v z01qbKly0Z)s`>k$)lT8J2j17$rw0ufgC~zc0zdp|M|)in^5Vy5f2n1;T+SN5rT~Eb z`mwKe@*C<=_D|E?+?N~QF@qzs;V{P3q;6lUTF>CYDbdaX_mw>Q+`_P-v?IL5%2 zmX_4;@UXWU#IssEsk2GL_G8norT|~w%~U+jSnh>FL64)qzh9?3f|ALkVhLi^+UW|* zOW1yF+SUCE_&GE9_V#vFEEd)3>Z-1myx%vDJh=XikUZsK%vt~jD+FW(NIndKFl|f` zE;D$rtpzXv7Z(>b|FG(Z89a|d3`|y|U`x4epMeG7g@;#R6R^9xTkY=ddYIJ93zAnD z(GC5k(`ntCf3T9L-WI>+Cg|tRJ2%Gf0c>k)OQ&2QA@yEi3^!o#J3t045Mi;c1ON;m zA;Aj3g;?Dc}@v z3OEIv0!{&^fK$LJ;1qBQI0c*nPJ#bS0sfdE7<$oJfkw*la`Lt2LD~>p;&nt}5rI@h z2=Z@DR0IV}!u2A;Wn+stsO3=5VtO%Lo2jT+~V5Nt91SoCQZD zN=#@>h>2gEDOg|n1K3hcVz3#;jKWKpcQD4I=q` z-isESby43Fk?!s7)#nqWZ{dRwtV|oT767o1FP?Y-mEy>~5@!S0l$f1tHfw`#?F$B2 z7|Y+}68mGY+D^~A07uiX!NI}UUq-;dzy#Z`U^R|@A2T0n4=_96o{bQbSfS3ubP)`} zyey2h0P@lUFt5X;>;ae=E!G7wTm(Zfg#%C~x1iA0djK5^sD#Po%mA~qyu2I~JCq+7 z3|=tdAbi3^iLFW5Bzo=6%z{0?WgG@viENcNcoFIVa_s}0E z4?`ws8xu=7z{xy79keg&8M|ngZFF4zs_+OZwDWTcI0c*nPJyeaz+WO`UtBNhLaYD) N002ovPDHLkV1g!p590s; literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/icon-open.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf6d83bf2dc9f55d2860b8879cffc293d3bf512 GIT binary patch literal 969 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 kIFVdQ&MBb@0Kg^Di2wiq literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..dd946694d1ae493ed3a002b8f4a76972d4093e71 GIT binary patch literal 1015 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 Dq)ZC_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8784fbec8e6454c3f444c335c492f30c7760a636 GIT binary patch literal 1011 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-ueVd6 z#IgFUi8CGs1h_Oew>CS8xFkzFN#f0#aCOo3^$u@~)(c&d+G4`N8|WSH{NHh{W45D! zh@(q#alH45x3*dufzONH{eEouyt49r@j*Gw4A;%sY+Xw?3G%k@@$O8`Kd&Sv@3jxlw@S`RDCY9d+!ZJ`EwdwMO6gJSL(EZjGsWzL z_#})LeAs#^*taflPWGqvBxSj|th-;mJX>0@s(I_4K#_0Uzq?wyuFZ0hYAF zX4~XB#Xxb-k`)`=8jT!Rs-Aq4f4}1J_5-^rOe$Z87#^9Ztbeazh3Ly!6K9FqD*HFC zI`y}FURqhvqMLVRo8G0Lu99z^7rWxR&g5By{7Iaz!D z6+f#-2G5<&wYz}f&spFRSCzqd%v@VnQipRpKRA!;3_43@YJbON=y8dS4=4Xz@^Ah*<^bEsBPcx$*1p~ zb!*MV--=tR_eHD6oQ$APM z$BdJP+pIkQuX(*!Cs|Uu?9H1m0jlah%kGA3$ltx#jlJ$8Tdefl9q*U@`?qYi+4p7f zyk9R>1)TnN{M1{m65b|<@9&qbinI?q?SG>?I!2x2T$2U6|BufzZ=VwDrLOA3j3Yo`q4X!7X`AHoxof{%T)n*L_oahN zvpD9YwE6Y%P4VWqQF(<+C7Xlc=C(Em6XO<>Z)Y#>-j%!d6=Q(vDP*SelWZ+ZgN3ns<_a>e z&C+eUq5QzAUw-1b7a^UxYzIo^?33?KTXJvm#Khp~>gTe~DWM4f1_RDF literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-right.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..dd946694d1ae493ed3a002b8f4a76972d4093e71 GIT binary patch literal 1015 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-ueVd6 z#IgFUi8CGs1h_Oew>CS8xFkzFN#f0#aCOo3^$u@~)(c&d+G4`N8|WSH{NHh{W45D! zh@(q#alH45x3*dufzONH{eEouyt49r@j*Gw4A;%sY+Xw?3G%k@@$O8`Kd&Sv@3jxlw@S`RDCY9d+!ZJ`EwdwMO6gJSL(EZjGsWzL z_#})LeAs#^*taflPWGqvBxSj|th-;mJX>0@s(I_4K#_0Uzq?wyuFZ0hYAF zX4~XB#Xxb-k`)`=8jT!Rs-Aq4f4}1J_5-^rOe$Z87#^9Ztbeazh3Ly!6K9FqD*HFC zI`y}FURqhvqMLVRo8G0Lu99z^7rWxR&g5By{7Iaz!D z6+f#-2G5<&wYz}f&spFRS=qf5GCjrY4=%%5szEO0k%(+OqY?+Z24|AYqSt21w1aW+ICruA#p z-j@3%+51*aJAdU-ahhLYlFZe$SJqw=VR5`sC$s!j+%3i#nx5yL7hiq-_0Y?bRonOd zn0vy)t>r~?+>5rl89$PjsqEgc)ZxNso4dPqeLc&=b+Okqfq`LCM&df>4Hsp9bGoeL zYd`#=ApcioX*yGe+3f1cB_SDccfJ2JMJ&1e^1+kq?D6~W>zhjP-u?g4{jtT>`{8%} z9G6H4DKO$jjV4U%!n-eRS^wvZj%_mIlrxY1XzR~2e0Wql|4E)xTB=9ML*K>c@}k22 z-u<)pti;Lr^W|>(oSidSn&H)Z^QVow-r4=#$0_1ln9opWbAO8McDXBmpRVrHUHWTL z($Q(hCW%eAvUcflQ{Ec(*H+V`DLzTv=H5K%`G?lM<5l>UVsx=wY}@og6(N=bWrg_; z2Ts53?^v^S*Us|{#$NY+?Y3OsQ8;nqTE-`9_lr;5u+weg#&9c^^2mDgynrj@`qw09-Rfd>gmmOaH@l~yipYP3;T+Niq@J(eTh3$T8v2@ zmOX+=lrSN@q^Ph)figj-+05fz`A%edFxa$#E~N}-hikT>6($66+I(QfvU>= zcb;Z;a-!MY9fIy>%X%M$o?WQdEbIH&vg#+`c!JAP+rKV3O@E4BYiqtk@NB{PRa;B# z!NoQVJ?cp#*^nHv?b$56ok3p$`ftIt(#)!L&glchH{}=I!2SV@$$ii24+ThQ4BUyW zx&QzG32;bRa{vGf6951U69E94oEQKA1Qtm|K~#7F?OHuZ96=O*8*-e85QK0SJ!2!J z5Q1%NR0v!MAt@|OZ$OEygumY?AD{x5_aBTBVrBVW8 zhKGmUvAXT#*74jRRaU~rulf}* z`5}2E3`1#(VfxjouJJSneIEqR>WM-9L?WS*##7e@0+eC z{}R+mnkAAq!9mRIuXWuIe|dS?>S1b*RszUH1`CZI>z3u(U55}Wc*=gJAA_r^4Qzh&D7RAMhQy* z+ca>qg$uMZwDicK)zwvnH9b9z4O1E$8*_JyY)RPoV>bv`zyvl7T)-)aRTMxf?8b${ zj}Km{a{%-6^OVVCR9|;@H(?6msJuUr1u%D8zx;~OoBK=j zHkqZZ_PghDeK|KrH{09)s&%e6yc=Ku%QSESCvXEtaMqXU=U2Dd8A5>dPw#16ma$uR zsnb;2GeT ze7*MO%T4uq;rr#zZL9z*zzVPetN<&(3a|qIngV|SD>9|T_AwxK00000NkvXXu0mjf D1unXI literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..04a6ce3b9bca954da2003a67378707070ddaebe6 GIT binary patch literal 1895 zcmV-t2blPYP)$C)^3f2@jfSzAm$Bk?#FrWT<)9!S2(BVt=4JC7fNO%6x0@%mNm~S z?YQWrgFsxjjJfD+jHc`Bo)%T_##FE7_x@d7$&{r-OS^DDH_Vc-Ohb6RWGLPd?$@*N zr0|ij-;@D`ua%x~_(gHX;Sa@TEHVQw)lKt2qA)KBq*~+juK;13zFIYzVTn*JVo*7@;2DO6i0@vc>SW5rE5xRTJ)4WIW|=8 zfAh4`lM_yNZxGs^ZTo!~JiAb>*!K6aZC6jg{REeVy1ytnO?`@9scXJN=-GnvtGbrh zgNtn#cr@Z>{8w_zcBRwsb_U%`(02=+D^6Cmb50*1wkf~p2KEnNMDF*j{s0mnXc8rK zagP81010qNS#tmY3labT3lag+-G2N400o~(L_t(|0qt5%NF+xTej~byimn4u#vf4J z5aJ$OkU+dd4^au5lesJ?NG^(ciwD8WI9I`tT!fK82#Y3{T!KpuUOXslNS3UJC|TD( z{GACX;t&2|r@u;Gr>5FS;_3tJDg{@#1vtFKGy|G} zx08W@%CyJF$Bp9RVqwzP*Js&AqfrB$CnqN~G&E%OtN3=K3w+kAsHos7#bPn5u8N;y zS*ED~ytA`YX!Z2;5KkIqZ*Q;Y$G9A18kb7Lj1LSf0w&FWXrn)C_&w*v)ia7Oz`qI^zx9?FSOo}^fB--OPafmYGfe$V1tH_x zC+yT##ZUVPJZ*~7?|&XyYqYVkLHYUlgvVfacUP2XZ%ErAr=1 zyl(MR67V?ut?}T|hxA?h3wphKo&b(XS5{UEGUNg1J^kbtf*tJTG1a;qAJ6>M)Kmi5 z@CowKk8$85Ubpxu34rsz_O|Ku%jfiD=JM9=jtsC1^q>#BOo$VHZEbCWYq_n8pPS&x z)`-7)PVrZ^PN|6uaFTR(PBu<`PJZg@>YP*w{m1}_lbxfH*_o1nU%!vuT6H)=%7Jxc z07|rFNoFVOxTz=eBjd?+_LReG99K96f>Bmh zMtBP=FE6Lo)>fLEo1=I(F ze99TX8=yU~Wc_wMzip@QAMly1-!GoF*9>R|Gy|Fe&46Y=GoTsJ3}^;41DXM5U}R*( z7#JAvb?n8y{Fd|c^CA|+1 z_&BN-$IsSDydl^}AjikY78$M`dQghKGkeOh?@WKfC~|yStkT3kzv*aFE8v#;E9C=q}&_n+=n(-$v4 zBU<{1N`eE_*w`pAPLGeN(7dWLF)@)2)7N-cR~Ma`cafT#n}wf}k`kJE5~K%}1@z^k zAL*!Rn`q{9*BD9!uvY;T+otg2hulRUx3^Oy60zFZs+d2;Q#c&9+~ZzQB>z1st*Ey8 zR4U4wAe_GwsumXzBG3My#l=MnudS`ks%NVrV*nd5;4%ba@*>I^03cj|V7a`!6xHRW zB^;D+ch*W^l-<8i?>96MV{<$p;>gTQ6;UPtU~=jMY~TC{LO@s@bC*`ZSJnjvuz(4X zV~ITbZ(-azR(b?J2y7+*G6)}4udJ+aSJq0#U`!bZWFSTrQOW?MTt`R8E&uX;fm?$a z?pRw}qn4Hy>rR5*eSd$yy(?uqkaE;E7z%|9eD>lHG#Ct8qkKlcv$K=c`vCyN9fhi@ zDuIpr0W1dx2b7bOBi>2&_V!%Q%e5i{frNsB0?`BscR6{E!A=4u55au_mC3_KnE)7p z1l$MsKPC@+h@Au+jj2u^ev~#r7(h4!P{);-ySNtsELnglU)PailJ(NnJrTf85rFw+ zgqwF>0$V1*O8~wIKmg0j%U*CZVgqcy3*d_Yo&`3ayOvC0`XV3@_-7CGvibNWj4?R| hzy7qnX5cMl;BW2}Ixh;&3=RMQ002ovPDHLkV1f>oZ$JP5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8c05cc1b9c4ca8bf807bda5e90aa4b6bee419340 GIT binary patch literal 841 zcmV-P1GfB$P)rj@`qw09-Rfd>gmmOaH@l~yipYP3;T+Niq@J(eTh3$T8v2@ zmOX+=lrSN@q^Ph)figj-+05fz`A%edFxa$#E~N}-hikT>6($66+I(QfvU>= zcb;Z;a-!MY9fIy>%X%M$o?WQdEbIH&vg#+`c!JAP+rKV3O@E4BYiqtk@NB{PRa;B# z!NoQVJ?cp#*^nHv?b$56ok3p$`ftIt(#)!L&glchH{}=I!2SV@$$ii24+ThQ4BUyW zx&QzG32;bRa{vGi!vFvd!vV){sAK>D0fI?HK~z`??NhNz!%!5x6`@c9QqTlLKOhb+ zx`!Zibnpu@23_+T?a;B4o4c!1zQDO#GL%4yScD?oV$LJ?(LO4@0m0>+<-T`w?mhRN zyhmhV9k32q2maZCUKjo8bXq%(qe_w_(Y5pWyhd`f*-)CMI^U)DQ7**uJg*_P-ELJx z5%vHgzJqtPSyuv@GFY5NIU>*a^C8~useXSPsMA4&huC!lc?g3CzVwhM65{!2Kp)F* zMJD zyXjxoA_p!mM{U#nK5)PU#KD(BQb`Ho)PG(@xm{>Y-ueVd6 z#IgFUi8CGs1h_Oew>CS8xFkzFN#f0#aCOo3^$u@~)(c&d+G4`N8|WSH{NHh{W45D! zh@(q#alH45x3*dufzONH{eEouyt49r@j*Gw4A;%sY+Xw?3G%k@@$O8`Kd&Sv@3jxlw@S`RDCY9d+!ZJ`EwdwMO6gJSL(EZjGsWzL z_#})LeAs#^*taflPWGqvBxSj|th-;mJX>0@s(I_4K#_0Uzq?wyuFZ0hYAF zX4~XB#Xxb-k`)`=8jT!Rs-Aq4f4}1J_5-^rOe$Z87#^9Ztbeazh3Ly!6K9FqD*HFC zI`y}FURqhvqMLVRo8G0Lu99z^7rWxR&g5By{7Iaz!D z6+f#-2G5<&wYz}f&spFRSn1lh z*B>Y@|Mu+u&HVE9l7dp46BuwH2ad+N{qyyhPBJOON%iv6mApylDMzx756!A zrJ3iKzb>iLe_6NRoKvarPr`@fJEkx9$UXWTb>aKf)6b)>gzaRyA8&88@8<-!#fi^u z>U06%9iluY_-SS7Ejcf?%lb_qiXNGKeZcEci%mgWA=HX<(}1R%LTScWic#}KE83{ zd>=Ko7SrkF;nC|g7@zY82Nv8be>LNMnf3e1Enh$F+~muo;(!AM*fXt=&Inl?`id#^ z@!?0Nt1pH=um4uVz;Jn$+x)o!Q<)<6q?zuT7Ot>bE<0rLUT(3_cV#zYwyu$zuB&#X zfAxaE-gQq!FRYPUE#~fAZmiQb`Ho)PG(@xm{>Y-ueVd6 z#IgFUi8CGs1h_Oew>CS8xFkzFN#f0#aCOo3^$u@~)(c&d+G4`N8|WSH{NHh{W45D! zh@(q#alH45x3*dufzONH{eEouyt49r@j*Gw4A;%sY+Xw?3G%k@@$O8`Kd&Sv@3jxlw@S`RDCY9d+!ZJ`EwdwMO6gJSL(EZjGsWzL z_#})LeAs#^*taflPWGqvBxSj|th-;mJX>0@s(I_4K#_0Uzq?wyuFZ0hYAF zX4~XB#Xxb-k`)`=8jT!Rs-Aq4f4}1J_5-^rOe$Z87#^9Ztbeazh3Ly!6K9FqD*HFC zI`y}FURqhvqMLVRo8G0Lu99z^7rWxR&g5By{7Iaz!D z6+f#-2G5<&wYz}f&spFRS<3 z&QMmC{%(H%-RwF+J|P80Tu9(WiPc24i?6>bg~zP)s>lK9n0p6!d1IomIfOVw#*EBjv`PcQxwzpFgU^~o}8gN@ghSEs*=J7mvNbg_GJ zYX8L)qnom81N!zon-#kLGgrv!t1B*M%t+Un?wz?cswto6$i_Ui#u}N$-<8(2*X`H; z{4*wN>#QxebAQ$zK2^1M+Qkf!=|LGbtM5fHyhyW}J8N0n;f0KW8SQfX=NFlObDdUl z#(cJK&b;<>G25p2=IaSWOkwe8z>fTU4m{;-c_ZA&6_fH!;?<5@_+Gvje!yyj2H$hjlH)hTo3 Date: Sat, 3 Aug 2024 17:46:01 +0200 Subject: [PATCH 05/86] Adds the Pharmacist Job muahahaha it works muahahaha --- .../Components/IdCardConsoleComponent.cs | 1 + Resources/Prototypes/Access/medical.yml | 1 + Resources/Prototypes/Access/misc.yml | 1 + .../Prototypes/DeltaV/Access/medical.yml | 4 + .../Catalog/Fills/Lockers/pharmacist.yml | 24 + .../DeltaV/Entities/Markers/Spawners/jobs.yml | 13 + .../Devices/Electronics/door_access.yml | 8 + .../DeltaV/Entities/Objects/Devices/pda.yml | 38 + .../Objects/Devices/station_beacon.yml | 8 + .../Objects/Misc/identification_cards.yml | 14 + .../DeltaV/Entities/Objects/Misc/paper.yml | 27 + .../Entities/Objects/Misc/rubber_stamp.yml | 14 + .../Structures/Doors/Airlocks/access.yml | 27 + .../Structures/Doors/Windoors/windoor.yml | 9 + .../Storage/Closets/Lockers/lockers.yml | 13 + .../Structures/Wallmounts/Signs/signs.yml | 10 +- .../Loadouts/Jobs/Medical/pharmacist.yml | 67 + .../DeltaV/Loadouts/loadout_groups.yml | 64 +- .../DeltaV/Loadouts/role_loadouts.yml | 15 +- .../DeltaV/Roles/Jobs/Medical/pharmacist.yml | 31 + .../DeltaV/Roles/play_time_trackers.yml | 3 + .../Prototypes/DeltaV/StatusEffects/job.yml | 7 + .../Objects/Tools/access_configurator.yml | 1 + .../Prototypes/Roles/Jobs/departments.yml | 1 + .../equipped-INNERCLOTHING-monkey.png | Bin 1501 -> 1534 bytes .../equipped-INNERCLOTHING.png | Bin 1895 -> 1905 bytes .../Jumpsuit/pharmacistshirt.rsi/icon.png | Bin 841 -> 861 bytes .../pharmacistshirt.rsi/inhand-left.png | Bin 1005 -> 1028 bytes .../pharmacistshirt.rsi/inhand-right.png | Bin 1010 -> 1033 bytes .../Misc/job_icons.rsi/Pharmacist.png | Bin 0 -> 532 bytes .../Interface/Misc/job_icons.rsi/meta.json | 3 + .../Paper/paper_heading_pharmacy.svg | 1346 +++++++++++++++++ .../paper_heading_pharmacy.svg.200dpi.png | Bin 0 -> 37648 bytes .../paper_heading_pharmacy.svg.200dpi.png.yml | 2 + .../DeltaV/Markers/jobs.rsi/meta.json | 3 + .../DeltaV/Markers/jobs.rsi/pharmacist.png | Bin 0 -> 1343 bytes .../DeltaV/Objects/Devices/pda.rsi/meta.json | 3 + .../Devices/pda.rsi/pda-pharmacist.png | Bin 0 -> 963 bytes .../Misc/id_cards.rsi/idpharmacist.png | Bin 0 -> 638 bytes .../Objects/Misc/id_cards.rsi/meta.json | 3 + .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 3 + .../Misc/stamps.rsi/stamp-pharmacist.png | Bin 0 -> 687 bytes .../signs.rsi/direction_pharmacy.png | Bin 0 -> 1070 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 4 + .../Objects/Misc/bureaucracy.rsi/meta.json | 3 + .../paper_stamp-pharmacist.png | Bin 0 -> 589 bytes .../Structures/Storage/closet.rsi/meta.json | 3 + .../Storage/closet.rsi/pharmacy_door.png | Bin 0 -> 788 bytes 48 files changed, 1771 insertions(+), 3 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Pharmacist.png create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png.yml create mode 100644 Resources/Textures/DeltaV/Markers/jobs.rsi/pharmacist.png create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-pharmacist.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idpharmacist.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-pharmacist.png create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_pharmacy.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-pharmacist.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/pharmacy_door.png diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index e13540eb6f3..ac4be60b09a 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -74,6 +74,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List1*ges5NLU2!bMrXl(9l3Aw#T110oa&V7G8=R7a(eJ(g71+8egXQ8N<&1g8}TTZO_ zy5H!*g$Fm@q-GflvH3V1*Y^VsRqunUSLb_eS8qCFY2fG)o`2R1vn(vr5ZNdjig$$v zwR|!yd@LL=WkBH@rKcMFsyNr+PsL_DItNbG)0b=ER10f)vnV_+>@OB7+TT3tOS~C< zDJFGT_6QbH!i4aVqQW`_$^@nAl39D-MBTSYNj#do4K^{wks~kOfT$Jenvt3nJtI$n zO_lrqJgw~1WPhW(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^UhofT7-_2r^!xHpI$BXIm%88YCloAyRmT=U zKlGrV)|iJ5H-0J;Uh%Uc0D$A|U#RcQTkLZO{}we+^zq)7M?3nVmk&|+*!u`p7rdk0 z3x9sr1gyuG35Om||G~jQiT{cwsrjBDyrUic(94G?eEYz&bP`nX_SeS~zLyhQl$Dhc zK0_@nEi^hhO85+IZf+uOFZPW1vatoQwNIb)1@9Xh8}a7(%RY@Ei5b;+jER$S;;ki)>}aL4}ZZUUIzT!px(XU8O<2jFE1~b zL1WgHzyYj^m6eset^zl{zT#?YYlRp5jQryFUKFY8QaPQ^}s%{9;08$Bn=G@8~b4N zt1ui!@K1+^bl*k5`bwqtU4hr#4aN@WhO(`1ZEcCpmmg%V^4)`0dl-roVM>Ch%+TaD zi)LqMCE~!q0O8gM5~GEZ8+~JR_kZjW+6$hfFYw8WWF)}8hv3+~)7~zwuMf+603#zK z6pO`VU;N{F>JGL!dikyZ3z!i20AFx70lvXU_^e7MUovh1J=^+u$45JtC+S$I;;%F~ zQsj`P#PhtL1=#afx>_Zk`t$Ah1$q&>Eq$7w9+P*PR9~iNMgrUh05ESi27gYUv;UUL z+p&&V?8j6+5>v1Iz$3zzi@0%m6dM4E$>h`~eJ$i5ax#!U+HX002ovPDHLkV1nq6y72%2 delta 1462 zcmV;n1xfn;3*8HlIe%)AnBh=RM1zBcgF+NUV;JOO4Qi0pqSvoL?Q*XY(i*fh2n|t7 zUqk;vtwC!+5EMZ~V{>0i$n8BUC{gEf?)&38=XrVWbHN@dXhpMY28yM!5evR;)w`hT_5Zy;S8qCFYG88;Pk(8;Q5KeIh-{Q~#XG_S zT0WT;J`xTXGNACa(o;=-QJib?hhifhodvt<>CJU;s)Mz>Q55zI`-+8%)|y9si91tT zj7c4qJ%UM;Fd@98sIW$XGC`>&$?R|6c*D2Ax_C5s>r^qsks~kOfT$Jenvt3nJtI$n zs>=O$o@RD(qJP=l9fIy>%X%M$o?WQdEbIH&vg#+`c!JAP+rKV3O@E4BYiqtk@NB{P zRa;B#!NoQVJ?cp#*^nHv?b$56ok3p$`ftIt(#)!L&glchH{}=I!2SV@$$ii24+ThQ z4BUyWx&QzG32;bRa{vGf6951U69E94oEQKA1Qtm|L4QMmq!5B_Y*Ywb2q7sfOm9Gmt%YC{E34Q96i#A(s)z(3MVhlSg~f3JQH$J zP=bx0x zPNh-;V}FK+huyKd?d0Ud866$94Qb^+H8rL1X`@I#L`)%y#o~nv?dXSJXrM+Q z6CYSGuK+>tuNW9*s}G*N7T>pj()G4RHPxfhDB;Rxv#LZrCtm^d!w>#tg9YgD;`@aN zieHrg0Q@-km7d@JfcMu5(m{AytuAMZYrH4XP@4}xE{00;SP`cc>>xd=M5 zvwyP+e|L9RmAJ=(h<^Ch!Zf~I@ElVFoxJ?|1i}xpVvFYHX2NG^U|@h278VGfp`)WC z*74jR zRaU~rulf}*`5}2E3`1#(VfxjouJJSneSaSW&+3Um{X`<6lEzcl1_GEBJ3BiyodsTe zbH?@b^oSt%75@^{Ntz{+H^D*7?5}m*4}W=i+3I0xj#dK5MFtCv9_yCn+FgebD|pI& zrXPa&VEp{JjTK-8SOHdm6<`He0akz&U8AG-gM~~1STdX#PRVl z%8LU+ZUIIKO90z6aI=LAv@^8y$f4EMRfRP@J&g@h8XFsPcZ+OE*!W{N2w1=bHVjyUa4~c^YinR$$w;2Uw3ymVG81^wP_q+!oUGsa5e$lN;9snb;2GeTe7*MO%P&p!dg1%!&TXs!E5Hh{0;~WlzzVPe|C$1S04p-3#P%^D Qb^rhX07*qoM6N<$g2Sb?cK`qY diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png index 04a6ce3b9bca954da2003a67378707070ddaebe6..41e039978410df1c98944f037b9cfb94975f4525 100644 GIT binary patch delta 1890 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 delta 797 zcmV+&1LFMM2FV7HIe%)AnBh=RM1zBcgF+NUV;JOO4Qi0pqSvoL?Q*XY(i*fh2n|t7 zUqk;vtwC!+5EMZ~V{>0i$n8BUC{gEf?)&38=XrVWbHN@dXhpMY28yM!5evR;)w`hT_5Zy;S8qCFYG88;Pk(8;Q5KeIh-{Q~#XG_S zT0WT;J`xTXGNACa(o;=-QJib?hhifhodvt<>CJU;s)Mz>Q55zI`-+8%)|y9si91tT zj7c4qJ%UM;Fd@98sIW$XGC`>&$?R|6c*D2Ax_C5s>r^qsks~kOfT$Jenvt3nJtI$n zs>=O$o@RD(qJP=l9fIy>%X%M$o?WQdEbIH&vg#+`c!JAP+rKV3O@E4BYiqtk@NB{P zRa;B#!NoQVJ?cp#*^nHv?b$56ok3p$`ftIt(#)!L&glchH{}=I!2SV@$$ii24+ThQ z4BUyWx&QzG32;bRa{vGi!vFvd!vV){sAK>D0fI?HL4Q2z8doJBbz&-n8p-tMV>e;laOL4=3cbp&|`g9pC!kS7x2 z`Dj2N%Wp+3ih}z6KE-iNWm&3-ebM9r@W7YiR6?9wztWexq&xc5bcp)CuZGddW-+^Y zrZaEUtj4?PU)LfBE-puH)BQehzy!p>mqO&g?0?}(J*`{ghQk39FHhr6&rsw5M8YuC z7mNQlJHUIBXAXC0FCJjETJ6XwtB@ bIu`H)#fjxvv{zkt00000NkvXXu0mjfNKt{2 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-left.png index 19fa1ff89a18fd2146bb89df6889b16b93553192..b7a6673fd72b213af59720ee287b250f40bbbb01 100644 GIT binary patch delta 985 zcmaFM-oi1#vcAqG(ao7xke5%4mn%@9H*rF@=?cfN?zsI-d*j}PDn&I))CALf<#93V&Xm8=h~KocZ8|;Jo^4JezfNE(_e$knSpP zW#3w3q+6pSW030bPhJ$HYu{W+sb9R?oF!I&+h0SjyVU`!Z+$!8nS0&u;8&jTs>|_{=A`X& zS#M_gU+_!*;iIL&-fs^-<>RrH^fZo~9%^<~b2htoZN8$y5>B&QO9X5hCJ1-Lc1d#G5+jJx_WcS@^N0UD4^L||88ohUg#Fx)6TuZMU*O16Ho85Z)>8Bl! zUo3vg*sy1X*q4i&Uahp>pxu#VC$D#?KbrIV@4cD=t&f}AES}YNmwlb^KFiU5^}Oip znE0n$HS6nBD~u;*ZOyt?A#-lY&74_wk7k^|v_`JJXaTdW$&2R~jZbpMKj$obUm(CT zb^UTjjoDufpKmHGee+-D(faGmlJ@t*`wmX&+ZJ~!Xjibsu5UN`nK|#rAL*&>uiGM( zyLZJt+0`+PQESDvMd>cy8MXF_uUb*x8H^>ySy^TO#0^AvU}N?ua{n}|73kYbpHA0X%)77Mc6yg3XCAjX{Vv)!*LL;kcp(Kw9H_BKs3CvBL$}pGm|T^Q9M0Z#(e--$rz(bq zWl!Da#{^7ds;KZa-!&!tz^0i$n8BUC{gEf?)&38=XrVWbHN@dXhpMY28yM!5evR;)w`hT_5Zy;S8qCFYG88;Pk(8;Q5KeIh-{Q~#XG_S zT0WT;J`xTXGNACa(o;=-QJib?hhifhodvt<>CJU;s)Mz>Q55zI`-+8%)|y9si91tT zj7c4qJ%UM;Fd@98sIW$XGC`>&$?R|6c*D2Ax_C5s>r^qsks~kOfT$Jenvt3nJtI$n zs>=O$o@RD(qJP=l9fIy>%X%M$o?WQdEbIH&vg#+`c!JAP+rKV3O@E4BYiqtk@NB{P zRa;B#!NoQVJ?cp#*^nHv?b$56ok3p$`ftIt(#)!L&glchH{}=I!2SV@$$ii24+ThQ z4BUyWx&QzG32;bRa{vGi!vFvd!vV){sAK>D0wzgBK~Ge80qvQwY63wJh9@B)q_eqN z@B!?tY(tWFNXqyUF^?e@vGf6w#(>z^rn=%9(IQw#z%JNb@-Lhm>z(YblY@hQz;k!@ z=HJV&l^5{I5w%$=v|KY&V&5r$I zvB2pyeb=LJ=cKJ?>t}tHE6{8<({{UUG}r63bh}-_KMa11n~vi{Tkq7gSEmMj#zv!& zESF1(qDXqZp8S2WWq-Tf%4|0CkvY7pt#=T%8fpNb8^^JcpG+nOgf*9US6i zQE=XO>X`3#JMVe4_42v0O#&o90wh2JBtQZrKmsH{0wh2JBtQZrKmsICKLV&5XjG$B z>H<~c!{Rlo(N*Vv_Iv;U)2c?FolunmSiEL6x|UZUs~&4qqfosI7FF(c*<7`(9+xd9 z)Q_v6QH`$U70|36s}@H?cQYhTt9o2p0Dz`ZJ+9?P5Q}H^7!+tEKmz9y_yw1Htgkl@ R5wQRO002ovPDHLkV1gFU!|wn9 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-right.png index 087444b10541fa89b23ea6191d363d64bc81d9a7..e895cd114d5a93d9b802c193feaceae41ac4d565 100644 GIT binary patch delta 990 zcmV<410nqK2Z;!fIe&gcVMap@5e*I&4GK{ZjbV_BHK;*Wi(bD1y1*ges5NLU2!bMrXl(9l3Aw#T110oa&V7G8=R7a(eJ(g71+8egXQ8N<&1g8}TTZO_ zy5H!*g$Fm@q-GflvH3V1*Y^VsRqunUSLb_eS8qCFY2fG)o`2R1vn(vr5ZNdjig$$v zwR|!yd@LL=WkBH@rKcMFsyNr+PsL_DItNbG)0b=ER10f)vnV_+>@OB7+TT3tOS~C< zDJFGT_6QbH!i4aVqQW`_$^@nAl39D-MBTSYNj#do4K^{wks~kOfT$Jenvt3nJtI$n zO_lrqJgw~1WPhW(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^D0zyedL4Qrna(9V>l@(l=-q!AX~bOGlRqa!=67!R;)#C2yL{ z+#Gj~Hh*+MpZV>5dN0fgXk${XR@>^DOeTW(zNA|dPaM#Cq0cO-^dccj5Cj{dsQbRJ z;w}P!Fz7QiBYu!x4E}n&3P0}zb5%klMOm#@DvthxlA7Cc#CB9K^r1kn){J$;>9t;g zpV^=EZih-{rBacnp0Db~Vo}A>?^4lvp$`Rmp?@0%>xk2PsYXQ}?RLBH{oD;@KHEgE zy_-$_cO8GLcV+PMP}l^|SUH(q94&o}25kvHUPZNCIr=8^w0f;qpj0Y_)oN9JV>+G6 zy9}j%AE-9s=r;wNvzHlCF73YFh`j05y7?vn5+DH*AOR8}0TLhq z5+DH*AOR8}0TLhqmkHQB0hb-)BrL7IfNdfcpC`xIwuVeG0MN#xP6X%3RmWIsJjxr3 z&y!<($f6Tp0qwvdIh|(UPO^B6 z+35|M39>k_W-gc7iT(jm!D$@W=zQ1eiBAB8(}8tu`>2NmNFXbLe;yCIxfWz=Qvd(} M07*qoM6N<$g3*S=T>t<8 delta 967 zcmeC=_{2WJvOa6#jE4aMF3ruY%}ydN$r4YJc(W#4U37iD!`q_uLYJhrm~ik0ddEBe zcUOffqlJ_(}*AGTf!_N@z?ll`eZNm*_#>+V-C&z2UfYTmjhP~;o;@2=LaYqQ*I zJFSDGdOT&P**1AjF;LvIWW@%zMkB|Sswdy%->*2l{lKmYlgig2hDRnU>)&fwA^LLG z#95-Y%KnY3PW>&PmsVD^sQ%_%*`{~tr>o>!=f$qLuJii$jZLrAA5=7*4!XTx&(gQP zD=s^GpYw;DgFi!~z26=@YQ|&x%2WB~1er~5Z|dxs>ln}UEC1luOJ`PAPbL}n$1_sUokH}&M2EM}}%y>M1MG6B0leVXeV|_>k4Z|z9{uocFUCM0`koP9w(VI7IQ9KxOLG2#Q+JeB&YNje*b-^ z%}9KI!`dQW|L1mwva^-Ob;p&f03UUwdj-XR_^*#IH{BY+szr*?xIks;*BfTiO5mczW@d_+8~$u1}U(8*IG3 zygL0|+#!3GqKn;&Q~NKb7~Paz8_>7!*{sm@pSeO-UtMuAV@A5pbnncqQBCgiE zHP*;1{;ssHy>7q$=btfITW4*#o%^%)@Tsc3(=KL+Ob^PiS$!{p;YFI&+*!-o4liU3 z%xIV6KflQQTfOVFk~8MBeRJlupNrWx#W!D1AYuxOM+0``=X2mGXUiLj-&@{)VU6j` z*yq!?adrFRB!+}u_h^oDfh+npUagpvZxXL|+`{+rz3>B88#MTyo0c5EA>Oq8;KXj` z*Q<@D)b8L)E$XS=Q5oNuEaMO%uju;L)5Lx2iZy&|)(Ky-5oO>w|L8#5l?~S({S|Ui ll8xx?FBVd0+$8*i(I;}v`Zqf6t-u7u;OXk;vd$@?2>?ghzuN!+ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Pharmacist.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Pharmacist.png new file mode 100644 index 0000000000000000000000000000000000000000..0ac2897cef41d22beac975954adae1788f0ac443 GIT binary patch literal 532 zcmV+v0_**WP)~?rFYkRWI3oqEXt`&hsF%%XIOJPStoXX$ z=)r{tH{PUX84I!bI33sb0}fU1gQ{2Odu>;5I%8?z=nOcj{Hi$D;7`S7JURzX)zg=2;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh& zSoR1OQNo1qk)pyn1XKP|-$dQFNJ%`JybU%n#gQW~-hikT>6($66+I(QflZbB z|2(bi)MTT(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^;*HIWH^Iq7$2?xBnlIR(I7Dt1t0-*K$-%W{V*D28Y76n=S={n WzbwYx8$KQY0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..e33cf183835800d22ba39d01724560b1913fae0a GIT binary patch literal 37648 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idpharmacist.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idpharmacist.png new file mode 100644 index 0000000000000000000000000000000000000000..dba3f5e9eecec47f9646e316ee655e8a0d60cd0d GIT binary patch literal 638 zcmV-^0)hRBP)~?rFYkRWI3oqEXt`&hsF%%XIOJPStoXX$ z=)r{tH{PUX84I!bI33sb0}fU1gQ{2Odu>;5I%8?z=nOcj{Hi$D;7`S7JURzX)zg=2;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh& zSoR1OQNo1qk)pyn1XKP|-$dQFNJ%`JybU%n#gQW~-hikT>6($66+I(QflZbB z|2(bi)MTT(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^> zUGyJa?f&LCqV=Qeh4G0p0A#t8loU)4oPPG~83Uz`V1k=Q1Y=2tGguXjCPE8AB_ufj zWEwRs2bo8b17c?E1?gdc(O?dR1W68n`5s17Xg63p3n_+B)8{aIiOK~a#k9(XFo%p> zny4r+im&=_<{v{+D4p84gyG!6HiG68Q~7@8Q%i7{tX&1eXWhQMeD4F3=S Y06=3UunJ8ZTmS$707*qoM6N<$f<1T%UH||9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index cd479792df3..0f8ce9abb8e 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -34,6 +34,9 @@ { "name": "idclerk" }, + { + "name": "idpharmacist" + }, { "name": "idprosecutor" }, diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index 04f59797615..4795cbd7df4 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "stamp-psychologist" + }, + { + "name": "stamp-pharmacist" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-pharmacist.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-pharmacist.png new file mode 100644 index 0000000000000000000000000000000000000000..5cbf50e34562c2f1feedf282e20d868fc07ce78a GIT binary patch literal 687 zcmV;g0#N;lP)~?rFYkRWI3oqEXt`&hsF%%XIOJPStoXX$ z=)r{tH{PUX84I!bI33sb0}fU1gQ{2Odu>;5I%8?z=nOcj{Hi$D;7`S7JURzX)zg=2;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh& zSoR1OQNo1qk)pyn1XKP|-$dQFNJ%`JybU%n#gQW~-hikT>6($66+I(QflZbB z|2(bi)MTT(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^<3x?e}d%y|GNsnG>A`@K|oDR91O0l1XFN6 z8HSPNfO^S^3}>%>1zQKAL40}wP;meEuAl!ufBkhZ4dO#F$?hOE1pbGHhBDaO+k-7S zwrT>H2Ju1SKtOU@Ak_h23#m!4kYkvbm>2`YwQURvAk9FU3&bZAknDg97cMYJNl9T? z_w3m-3^A$;fD#_iP@EVlPm;YPmtaxTcH>NF%d%WaHjgCNjw&7vfzc2c4S``90swS2 VNhcdyI#U1u002ovPDHLkV1n8oADI9E literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_pharmacy.png b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/direction_pharmacy.png new file mode 100644 index 0000000000000000000000000000000000000000..17d31a90c6a1a81ca0d87fadfeed4d551f477935 GIT binary patch literal 1070 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d>Qb`Ho)PG(@xm{>Y-ueVd6 z#IgE1mqa&bUO`?yF%Pq^?>&;WnrfvH z-#Ekq54C)lxag1->nWC{uO>xS-*>sY-NVyn)*fCn!=n?G_3t&T5Pdmo;w({HW&cLs zslWf*tbKDOW$|uvmRS95e+{|rRtK!U_3eCT?sdO|UwOi-F2_%rleW)gy_xBM!7urT zkCp~|zdihvkH=Qh(>QW^%%-_Fb@t46j%Q+fcVP3a6R+OS+3ente^P%}YqPV&?|$K8Nkc+Fg?7{c-nR_wO<-dTGG* zYQ2_n;Clh%UD0b_|NFJh>I1{9$Q^m^>khKsJ~c%y$uFk)<421dpV?o}Q`qy6H7EE! z^PMIC{PMi`pS!<%RQT-M_heg6n^i4S#{$u;={7*JrqKtw9_)(+1>x296c~rl%-M_#5q3*r8zy8|Z-*A*??xk;m z?R%to?><>ubiLj5OxWx_VY<6dpXj|`7PoTN+}(%E^6$R;zF22`gcf6L;|T-1Ea$vfxQ4tr@G|DG>5J9>{N^Q^n%dw$)=Ggr;~ zZ=A1ODz~SYwLxz7)r-?NRf;j##jT8ZcEDx zy*Yofnb@!JbL=g5x{FyA+xHjN&o8~{zuVu)ZrW=5>xY7Og*}DI|pPYCo?c;Oe~$a*V`#j z;#hs1OQM@IuOKg<7%x|#KyTuNZqpTxVcl{2nfAuL3ss70p2oING3#aa3;PwO8M+)z zN*x(F@3J{}?saEY{StGow%+EsjsE*uJqu;lwHZ6p7p|CoHpAjcwBMQ^yY9a@*vf8x zZ%LXY_r{+Vve&;e^M$@|UKRelIyXGuDmnAP3&DBUcsA?kTo$;gA>CEp%D%P6NVi5u z#vs+DdoMxU(xaYuM<$(HGOYb>HTd_a4bwO|{a9 zZyaKQhgv>NTy)5a^%Tp}SCb;E@4MXH?%`=OYY(rP;n9i8`u7@Eh`yXPah9m9vVWuR z)ZhPY*1oxtvUs;SORWC3zlL0Qs{>Zw`gXoE_qyM~uRP&Zm*XeRN!#bL-pusB;FtWv zM@xgf-yVL-$73t$X&gB{X4Bl8I(z0j$1}0LJFxlIiC6FEY^6$Ud z`xh=uzZWaG+8r4FoCO|{#S9GGLLkg|>2BR0pkSM)i(^OxXL5oB>taO%DJBFF!qNEW z>-GPWvw4JfN+tesn09|>K~rOld%zQh2}^~UO(lOGO_gxy>zK7|_L~U}l^q#UDLc#m z{`qe(zxjqswp-ANjw5O_IX`_oKHXo!L2-l5>8VPaJ+{d#YmAwH_)GsKghh)L85r81 WYh1gKbL}3`MGT&WP)~?rFYkRWI3oqEXt`&hsF%%XIOJPStoXX$ z=)r{tH{PUX84I!bI33sb0}fU1gQ{2Odu>;5I%8?z=nOcj{Hi$D;7`S7JURzX)zg=2;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh& zSoR1OQNo1qk)pyn1XKP|-$dQFNJ%`JybU%n#gQW~-hikT>6($66+I(QflZbB z|2(bi)MTT(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^Nyli4!OO zCsr*;U4DK(QD(D{VyKCU2~o<=oH;|3I*=kJqE*sJAx#|c|MzdAolA5SeEa;FVbv=k zq70V!@q;LJAVoww0Hio}ktT>D2zDE{5L5$GK#~J~mK=rY!%y$uk6#{1mL_Qc$$WxL zl0pENY4`8n$0bEjoGb^h_gI4shDFJnH*ZiZ;^g5$;p5|w90f4T7sp+P=Zd>`?=nlZFF7~0y}P~>**+{tk8;6W5ITpXeu05SlU0C5=x7uT(W zGYK(BasVjh69f3qFDFJBSPe-IK#zM|w(P_ufkk}4v*D-%NJ;~s>@^Cg9RdK Date: Sat, 3 Aug 2024 18:33:15 +0200 Subject: [PATCH 06/86] FTL touch up --- Resources/Locale/en-US/deltav/job/job-description.ftl | 1 + Resources/Locale/en-US/deltav/job/job-names.ftl | 2 ++ .../en-US/deltav/navmap-beacons/station-beacons.ftl | 1 + Resources/Locale/en-US/deltav/paper/stamp-component.ftl | 2 +- .../Locale/en-US/deltav/preferences/loadout-groups.ftl | 9 +++++++++ .../Locale/en-US/deltav/prototypes/access/accesses.ftl | 1 + Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml | 1 + 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index 11acc7237a1..bef6cdeb82b 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -4,3 +4,4 @@ job-description-clerk = Organize trials, notarize documents, review charges, and job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs. job-description-security-borg = Purpose-built to ensure the right of every crew member to liberty, justice and freedom, ensure the peace aboard the space station by following your laws and patrolling the halls. +job-description-pharmacist = A pharmaceutical engineer, focused on the manufacturing and prescription of pharmaceutical reagents on the station. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 622254ff1c1..99daa30f9fd 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -5,6 +5,7 @@ job-name-prosecutor = Prosecutor job-name-lawyer = Attorney job-name-courier = Courier job-name-security-borg = Security Cyborg +job-name-pharmacist = Pharmacist # Role timers JobMedicalBorg = Medical Cyborg @@ -13,3 +14,4 @@ JobChiefJustice = Chief Justice JobClerk = Clerk JobProsecutor = Prosecutor JobSecurityBorg = Security Cyborg +JobPharmacist = Pharmacist \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl index e8977c1009b..7aa7e7ff399 100644 --- a/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/deltav/navmap-beacons/station-beacons.ftl @@ -12,6 +12,7 @@ station-beacon-metempsychosis = Metempsychosis station-beacon-exam = Exam station-beacon-med-outpost = Med Outpost station-beacon-psych = Psych +station-beacon-pharmacy = Pharmacy station-beacon-glimmer-prober = Prober station-beacon-forensic-mantis = Mantis diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index fb53621389d..959cb2c493b 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,4 +1,4 @@ stamp-component-stamped-name-notary = NOTARY stamp-component-stamped-name-chiefjustice = Chief Justice stamp-component-stamped-name-psychologist = Psychologist - +stamp-component-stamped-name-pharmacist = Pharmacist diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 2e32ac21a50..531c0db71a9 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -47,6 +47,15 @@ loadout-group-chemist-neck = Chemist neck loadout-group-medical-doctor-neck = Medical Doctor neck +loadout-group-pharmacist-jumpsuit = Pharmacist jumpsuit +loadout-group-pharmacist-back = Pharmacist back +loadout-group-pharmacist-outerclothing = Pharmacist outer clothing +loadout-group-pharmacist-neck = Neck +loadout-group-pharmacist-gloves = Pharmacist gloves +loadout-group-pharmacist-glasses = Pharmacist glasses +loadout-group-pharmacist-belt = Pharmacist belt +loadout-group-pharmacist-shoes = Pharmacist shoes + # Miscellaneous loadout-group-scarfs = Scarf diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 07a6659b05b..8b09dc4d69b 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -5,3 +5,4 @@ id-card-access-level-prosecutor = Prosecutor id-card-access-level-clerk = Clerk id-card-access-level-justice = Justice id-card-access-level-corpsman = Corpsman +id-card-access-level-pharmacist = Pharmacist \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index 909bbcfbea9..b760faecce0 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -133,6 +133,7 @@ name: loadout-group-pharmacist-neck minLimit: 0 loadouts: + - Stethoscope - ScarfOrange - ScarfBlue From a34101bb715127bb3a325e01e236a8c7712bcc2e Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sun, 4 Aug 2024 20:47:48 +0200 Subject: [PATCH 07/86] Modified the prescription paper --- .../DeltaV/Entities/Objects/Misc/paper.yml | 5 +-- .../Paper/paper_heading_minipharmacy.svg | 37 ++++++++++++++++++ .../paper_heading_minipharmacy.svg.200dpi.png | Bin 0 -> 8252 bytes ...er_heading_minipharmacy.svg.200dpi.png.yml | 2 + 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg.200dpi.png create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg.200dpi.png.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index 357d24a922a..21610a6ff75 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -34,7 +34,7 @@ - type: entity name: pharmacy prescription parent: Paper - id: PaperPrecsription + id: PaperPrecsription2 description: 'A piece of paper to justify the reagents you detain on your person. Issued by the pharmacist.' components: - type: Sprite @@ -50,10 +50,9 @@ map: ["enum.PaperVisualLayers.Stamp"] visible: false - type: PaperVisuals - headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png" + headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg.200dpi.png" headerMargin: 0.0, 0.0, 10.0, 16.0 backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" backgroundModulate: "#ead9cc" backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 contentMargin: 32.0, 16.0, 32.0, 0.0 - diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg new file mode 100644 index 00000000000..c873e55d14e --- /dev/null +++ b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg.200dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..928676c542cdab1466261907dac0fe3b6834eb5c GIT binary patch literal 8252 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 Date: Mon, 5 Aug 2024 23:13:51 +0200 Subject: [PATCH 08/86] modified the coat and suit modified the colors from light blue to light green --- .../equipped-OUTERCLOTHING.png | Bin 1667 -> 1646 bytes .../labcoat_pharmacist.rsi/icon-open.png | Bin 969 -> 984 bytes .../Coats/labcoat_pharmacist.rsi/icon.png | Bin 925 -> 950 bytes .../labcoat_pharmacist.rsi/inhand-left.png | Bin 1025 -> 997 bytes .../labcoat_pharmacist.rsi/inhand-right.png | Bin 1015 -> 997 bytes .../open-equipped-OUTERCLOTHING.png | Bin 1657 -> 1640 bytes .../open-inhand-left.png | Bin 1011 -> 997 bytes .../open-inhand-right.png | Bin 1015 -> 997 bytes .../equipped-INNERCLOTHING-monkey.png | Bin 1534 -> 0 bytes .../equipped-INNERCLOTHING.png | Bin 1905 -> 1943 bytes .../Jumpsuit/pharmacistshirt.rsi/icon.png | Bin 861 -> 860 bytes .../pharmacistshirt.rsi/inhand-left.png | Bin 1028 -> 1042 bytes .../pharmacistshirt.rsi/inhand-right.png | Bin 1033 -> 1035 bytes 13 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/equipped-OUTERCLOTHING.png index 4071851a5e644bd31c646386b62e00af9db98cb4..145c314940e5e374df06ba2810457fa920c911c1 100644 GIT binary patch delta 1615 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 delta 947 zcmV;k15Etb2gwJJB!6vbLqkw$V`BgSD3NuMy-Pw-7{-5Uk(l97P(*`+g@ZyAL}M7_ zVhw7L)uPw0K<#p`64Dy9Gzbk*OJ76(L9Ib+K@b!{L}PPbOUUg#DkxFsa_;-%Ip=wK z?{mQ(DQHErYX*v?vJnl3yi18?Z_g`E>rj@`qw09-Rfd>gmmO zaH@l~yipYP3;T+Niq@J(eTh3$T8v2@mOX+=lrSN@q^Ph)figj-+05fz`A%e zdFxa$#E~N}-hY6o73rFhniV}GPl2k+{db;bc5?ZL%13_a>eBiWD~vhCR{yq!T`0{U;kwbIP0 zbJJ4-Xbjwmt-1gJ010qNS$}f?01m?d01m?e$8V@)00064 zNklNnY}u_Jkw^y*F##f%nckKfm+7d+&QdAOQmb1FxNd z1zQ4YwSStgHCNY*SbB4#CQ7A}bwA?*1;VF7!Pg@+Xst-|cpN6@t*FR-w&2=G!66$YwKtFZ%DgLsCE; zh?=5)%{3ij?jG3L{pPQ~-NxSed$_-+aK3t|*MI9WGU?{}Q;NkR+)oiW8_W0{`-!vD zLmYhhIJf_jR2$qrg!bV@FYx0(Sg+T^(eVkkHXWo=De15qtsxRx!>U0)O)=Vp7iWE} ztVE=Sz!bju*5*4@DwRim<}u$?<_cr2gt#TrO+K zS{o0*9}JHkS?Krs7z_q-6sZ%5g!mb^`79AxPs;+X@zZsF&iA6`K~ca!z`(0y;1>7g VDA?s0I>rD1002ovPDHLkV1lV=$|nE- diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/icon.png index 9a12cdc6c1d3bd4c6a4f490a2c3129c9fbaf8175..5aa962f3595be9e0b78fff5483dd5a992f57ebd9 100644 GIT binary patch delta 928 zcmV;R17G}|2et>0B!6ycLqkw$V`BgSD3NuMze@sP7{@e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcpG z?ny*JR9Fe^RIy3}K@c5{#2}n@iiaoxn>1;z41}|fpdeUlkv$OMN-p(#jBoPA<1OJ_Y1ziG4rBd+I zolFr z+74E?;^b7`>A5qYF7eKgA-{4%#)iS&4`2vD zi^U>WF19`YoNUV`-}lKK|5PM20bD7tAi)6K>2z4lX0tpelSwj7lNrGkh3H&G-k>rd zk$-l(%}s|Pm&;AQVV_P^B_4c~-htU*{eGWK!hqrj@`qw09-Rfd>gmmO zaH@l~yipYP3;T+Niq@J(eTh3$T8v2@mOX+=lrSN@q^Ph)figj-+05fz`A%e zdFxa$#E~N}-hY6o73rFhniV}GPl2k+{db;bc5?ZL%13_a>eBiWD~vhCR{yq!T`0{U;kwbIP0 zbJJ4-Xbjwmt-1gJ010qNS$}f?01m?d01m?e$8V@)0005j zNklsSpSp zDH5;7K=qjrqgMX2MNgoCt{bB zG@H7$Q{ikj3wym@C;<|T(Mn(p9PnlgOVB75HgZ4DH&mD*<{JE8}A=ctyal9&ysbpO@9}AF1t@t@j-H@Lf z(%mmvzu#wah$xjxT%n$GD4W`)9YsBXs1D)hcu1K{me+t74@f(m4!4p6065^a5i0;T z`X57je|h4XAkOFW+%K2Q++r*)00+Freyzv|hl4g6jrh>v$F}XLk38lhu(A{Dz@j=q z5Pxu59FXxMY+Oz)0K3C&HVo=TfSpXIQ@;H`hA0#YEJntd zHx0D|^MzZj77YdiLi?Xk3%~~kmkxF*J9S-`FB-{V-sD5Hl5o7^`S-jiw^H$BQQ|=2 cz*;)+1?K)NyWfo+;{X5v07*qoM6N<$g3fTKWdHyG diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/inhand-left.png index 58fdcfb38a77be34daa03561c1668d8e2c9d6860..b4d99e9e2658becaf6c7ca29e28d63bc9483a212 100644 GIT binary patch delta 975 zcmZqVc*;IOr9Lmy**PFHIhlb$V`AyV{oYK8636Ycf~GtSaCSMuE5^$fDA1cYq1$wY zV_5gR)pk?pz>htaIf7i*+ z`z^OaxpHs9c3{<9q0NcZ=5{Bi@N$C#|e--w}RZ_3|P2Lyq2TBKyLsRvpvt+HCqSAm`{} z;|F23TXTe$&x$x7$@)<6p@U-lwb!3l=zo+v+B)M(-A(2jE}X(n%C0j*KTVOC8a3ri z)bC?;wV&5?x=-JJl5LvBrYA@0rA4;t#PY6`yvSSmDQCr<|Iaeh)sAJ~tyTPBXMOIs zz?Sz;TOV26Ki(H?%XnTmMojvj>B-Dj!C$1_lPs0+0I0 zVg?4jLmEakt!T5HTq4(hcf#d6yf&@Ye1XLi zW1rw3mZsqCe6e$_t+qwC_gOu0zOpjf-rO~T+1`4t5C2d5UR3#g|Mxn@?RPp0 zCNOYfL-m{!8Z;Z@){9RQ)Oj7QHf`ql-+#{?N!CE zs3b+D^uha@Emr69ukP8I)%@)5(dWrq{#x$fabG;~Oxou8_1))9wUqqW|J}_qe^X** zB-igc#cJ0Ix7`!>e0XYezWdpxlV`k+zlb`TQjo#JaA5l3o`tOmOM{+LBLA*Vz`_&3k?{ zDO>+NwV*oS`tg3Rck9FzZ#pv=%!*@?xv<6LS>Bshzw;kiPyYEP>Ca3#rZ3DsYQm+O zd$=T39J}LMw9-3jFY-6UGq8I^xtDEwrD$-PvGn@KS{u(YT!}q?en)xEDxupt toMA87JMtGrY-o32?2h(qU@79PVPq>ZI9Xj*(hp2R44$rjF6*2UngCLN$!q`s delta 1003 zcmaFL-pDaQr9L;)**PFHIhlb$V`AyVz1~iN636PZCeC;m5a80>+}i9U;*u=!B#Ad` z!qr9B*E_r|S}$}-YKsX6Z=iR)^MA*+j@ga^B91P}#qr)J-r8zu1U@f%_xrKs^UBKi z#RugyGh8=kvvn=qB*@#o$GbB%|Gc)}8=gmp=3nutwKEfce!u=}X}|B)-3wlQ{lC{f zJl`rgE1{UnKXX^0*tE=!oGGP8tq(Cr+07KQ6XKIFTJT}(rC{H>z&Y8U+LM&!=Cba7 z_3~_K!K&u1djdtiasTdW?YcJ0y|&XjII71}cA9OI=M)3QJxf+>aBDPjT&a5UP5%9g z!`lz+sxYa19b$N7qO$(I`i2#vFK11hC2Fhe-?-}3-|~5BWkri_-j!{7mwviRzI9&g zit9SBf8W^jO8r4a)9Ikw`}Hh+>$~Ezv-dfF$T|2kG}`;^!J}q8wy!*uZ%&Ze^!BFC zp1F?kOuzCEZoPD7Rq45x%ty?hir+o(kFn=u?fF;ytR5LWcRJVZVqjq4Ebxe|FJ@ri zI|Ravq8eTe3=B+Go-U3d6^w6Z?e}7K6gXzCjj(?{0p90$KJg2?A-0$I|UxzepdFpY~RhlZ~tnhO-WK_ z6jH!~>VcwxO#9xqSF(Km^|Vv<+2>npBWLqY&z)c@X;?K`pk^sXk`*PU6iKW6go(z9BYA60MucG>B@ANMSallq=@@lV9ASeJE<0xfrM zZ(J45fAx{@w=ZSa_6I-S`RgiY)8!3UvqB$S&HpvC^wQ!r_4h=pnG{x=Th8@6d@w=a zT-s)hS=-jPZF4_={r-b5H9wr$t7fcyyY0DH)Z9q zz8sX|YoA)STlQ=H8_(?e4R3<1rWx?6I56QuAL==Gq|GtgcA0&B*3)lGo4v0JOqnEU zWpyJs)#<>=#bF9@&I~8knX)XJskmh0db#^oeUl^k8>||azc1PT<>lX(H0 WJUzj?Z89)@F?hQAxvXe@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wciMSa<^%i^LNkF=gw}mAQ}5 zZXG(pkcTK!w?07Nw>T7Bhd558xajxd+}S?=_oZ=%vr=p%KmsH{0wh2JBtQZrKmsH{ z0wh2JB!55xB%lcl27~lJpzzA$?S3akGXcPF`a-g8`jCgsFSE4vd z+5Y0=QJag!Ld9{M_If=volccnW@m->EV`eQ%YSq-nJDPjFU&_b4i6BFqDc2%he-pB zYSE1#XaIm;0D830A^7NCIRng>HXe^n*IL-Fx(fkxyWO=&*c9oi+jZIe z91dHZPDej~`^~+AvDa01FaRlp1W14cNPq-LfCNZ@1W14cNPq-LfCNZ@1W14cNT7&7 z=zrCsBK@Vt&C)X#qhx0DmkR7Kc@%B^RH_}OJ5MRB3`r!Zzl$w>QT<)!Rq2uZ$zi)n zh}^Z#0Hpq&y&&OIf6v{y#K7qGK*iVl3ZGk&B(?q$tfjF$ZMD|l^ER>gy=(lISe0FP z3r*b{z}~ajOy60koQO{V2taG%-hhC|CrE%h3qJa7Yn;yjbFpjv-CS3PUFY8309@b@CoE&F!JwSb4UOH002ovPDHLkV1iXv&Hn%Z delta 993 zcmaFL{+)e-N_}povvWXZaxw#h#>CQzd%c|kC63i+O`P#CAi$-$xwY9z#3fncNfK|? zgsY3LuXlJ`v|i|v)D{yC-azko=l_mt9kU$;L>yg`i{rgdytUQR2z*}j?)PKM=arT3 zix0|aX1H$7X6stINszaFk9TKk{&{V`H$0CH&A;MPYiB0@{C@q{(th8oyBECr`hTx| zc)nF~RzfkCf99@0v1yqdIa5lHS|4JLvYRPpC&VXVwBWgCzef>q61_XLW3%+I4M~du^w6a8!?{>@?dZ&nX6qdzP%&;MQp5xKj1xoBaC~ zhqoWtRbf*3I>hkEL}mSZ^$jaTU(T91OVn1`zj4*6zvc7N%8C}FrIO zJ#!u7nSSLT+O>_U(CS3 zcL;w_tpQHd&0u4sEV=yh!ISIk@%!)Vn@aKC{r}PZvBlN<;dlKUmq-XHFk(mbAc;m3rgh=n zm$t0`b4JHDnQ_XQM}M^S=NUdcs-6EN&nYd{qvWCQ;&XXXVSn%b*?U&vb?2X#$E61{_f)x@h!|}sI$30#df>gmA_9{_vtSEwJ7Q6v}2RRrdwIN^tdT+ z4f|`W>CqIQq;7L>p7i`f>)!DyM14y!x>zo@ZF-@K5X*tG!hDAVr{DH>tl7G2=XnNW zuY13CTdwaYoVal<;MZjkhi3n?lW9+mvfxutO!h1 N44$rjF6*2UngA^k%=Q2P diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-equipped-OUTERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-equipped-OUTERCLOTHING.png index bdbb17208d00e36b70858faa8365c5139928b41c..c99a5b03a69dbc5f2470558e46fd2058f600fe69 100644 GIT binary patch delta 1623 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 m9zMn^;1%!+cm=!yO8o@~Tac>fDm8=v0000FU diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-left.png b/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/labcoat_pharmacist.rsi/open-inhand-left.png index 8784fbec8e6454c3f444c335c492f30c7760a636..b4d99e9e2658becaf6c7ca29e28d63bc9483a212 100644 GIT binary patch delta 954 zcmV;r14aDv2jvHlB!6ycLqkw$V`BgSD3NuMze@sP7{@e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcfsPUU1cFny4qcr)I<{Mf zjymK+)TvuPK=dDdA*4y0OD;v>|CaZ1dH28fej&HqiExu30~vpSDS=+E7nTt$>sKb0 zna}(E&cbEG?~!F+78Lt2(tETzY5%O}jVxms+s*57cy_ui=|g@z>GDk4q?{@rdj>~uOZ9*;$oI=ZMvyOF%`B(hcw2E*x2~X8Jp{E>hE5KfQYVDG9sZtUv&Z{j%Q@ng~%iz>0r0MuQ_&$xGNsuJ5Q30CO`h;O1;u!leai(5&6 c1ab*{0S0m~$$NHmj{pDw07*qoM6N<$f<@fLI{*Lx delta 989 zcmV<310ww82lEGzB!6vbLqkw$V`BgSD3NuMy-Pw-7{-5Uk(l97P(*`+g@ZyAL}M7_ zVhw7L)uPw0K<#p`64Dy9Gzbk*OJ76(L9Ib+K@b!{L}PPbOUUg#DkxFsa_;-%Ip=wK z?{mQ(DQHErYX*v?vJnl3yi18?Z_g`E>rj@`qw09-Rfd>gmmO zaH@l~yipYP3;T+Niq@J(eTh3$T8v2@mOX+=lrSN@q^Ph)figj-+05fz`A%e zdFxa$#E~N}-hY6o73rFhniV}GPl2k+{db;bc5?ZL%13_a>eBiWD~vhCR{yq!T`0{U;kwbIP0 zbJJ4-Xbjwmt-1gJ010qNS$}f?01mz+WRm-w(3X1V)$uYJ%N&l?ty)0uH8+PpM z^iU-y`F7n@uy4DgMhAZJ23;GSxbLR^{-&EY_oiPB_0oD!%l600?J9H)fF=;daz|P?x%@%@`&Nhn`eFWkGCzDD1 zvUFccCvO7I0Q7pjyqH#YDV@BaVqXCS7z_q@V}~!S@pxS8cDrH!$DTKblwC?EB}@Ye zkbeLPkN^pg011!)36KB@kN^pg011!)36KB@kN^q%Ujnunr=6|z(W|F&`_jRsY6zTU zhE9$SluHQMdDIFdYX|_@wuV47GlVqu&C|QOZLR77P$%%bt`m^n{k$52i{ZV#w5UbE zyquhXUF7jij6YLDfO>%0Y-XJbuW~x@C{{?+B2<|}e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wciMSa<^%i^LNkF=gw}mAQ}5 zZXG(pkcTK!w?07Nw>T7Bhd558xajxd+}S?=_oZ=%vr=p%KmsH{0wh2JBtQZrKmsH{ z0wh2JB!55xB%lcl27~lJpzzA$?S3akGXcPF`a-g8`jCgsFSE4vd z+5Y0=QJag!Ld9{M_If=volccnW@m->EV`eQ%YSq-nJDPjFU&_b4i6BFqDc2%he-pB zYSE1#XaIm;0D830A^7NCIRng>HXe^n*IL-Fx(fkxyWO=&*c9oi+jZIe z91dHZPDej~`^~+AvDa01FaRlp1W14cNPq-LfCNZ@1W14cNPq-LfCNZ@1W14cNT7&7 z=zrCsBK@Vt&C)X#qhx0DmkR7Kc@%B^RH_}OJ5MRB3`r!Zzl$w>QT<)!Rq2uZ$zi)n zh}^Z#0Hpq&y&&OIf6v{y#K7qGK*iVl3ZGk&B(?q$tfjF$ZMD|l^ER>gy=(lISe0FP z3r*b{z}~ajOy60koQO{V2taG%-hhC|CrE%h3qJa7Yn;yjbFpjv-CS3PUFY8309@b@CoE&F!JwSb4UOH002ovPDHLkV1iXv&Hn%Z delta 993 zcmaFL{+)e-N_}povvWXZaxw#h#>CQzd%c|kC63i+O`P#CAi$-$xwY9z#3fncNfK|? zgsY3LuXlJ`v|i|v)D{yC-azko=l_mt9kU$;L>yg`i{rgdytUQR2z*}j?)PKM=arT3 zix0|aX1H$7X6stINszaFk9TKk{&{V`H$0CH&A;MPYiB0@{C@q{(th8oyBECr`hTx| zc)nF~RzfkCf99@0v1yqdIa5lHS|4JLvYRPpC&VXVwBWgCzef>q61_XLW3%+I4M~du^w6a8!?{>@?dZ&nX6qdzP%&;MQp5xKj1xoBaC~ zhqoWtRbf*3I>hkEL}mSZ^$jaTU(T91OVn1`zj4*6zvc7N%8C}FrIO zJ#!u7nSSLT+O>_U(CS3 zcL;w_tpQHd&0u4sEV=yh!ISIk@%!)Vn@aKC{r}PZvBlN<;dlKUmq-XHFk(mbAc;m3rgh=n zm$t0`b4JHDnQ_XQM}M^S=NUdcs-6EN&nYd{qvWCQ;&XXXVSn%b*?U&vb?2X#$E61{_f)x@h!|}sI$30#df>gmA_9{_vtSEwJ7Q6v}2RRrdwIN^tdT+ z4f|`W>CqIQq;7L>p7i`f>)!DyM14y!x>zo@ZF-@K5X*tG!hDAVr{DH>tl7G2=XnNW zuY13CTdwaYoVal<;MZjkhi3n?lW9+mvfxutO!h1 N44$rjF6*2UngA^k%=Q2P diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING-monkey.png deleted file mode 100644 index 2a76e991b9e693f5f323e266789304d348977a29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1534 zcmV~?rFYkRWI3oqEXt`&hsF%%XIOJPStoXX$ z=)r{tH{PUX84I!bI33sb0}fU1gQ{2Odu>;5I%8?z=nOcj{Hi$D;7`S7JURzX)zg=2;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh& zSoR1OQNo1qk)pyn1XKP|-$dQFNJ%`JybU%n#gQW~-hikT>6($66+I(QflZbB z|2(bi)MTT(Hw0ZTw*4^*-Fr~0+V;{)2JXPK+Q{nfoU=!WZ^B49ru!Su|v{1&;P(sNG ziQD_G+{f)X!_0lm43y`<_1$;xx#v6QyFX9nTp|``fEi#0m;q*h8DItuCuB` zU`%Icr!!WyZEtT|Jv}|9CXMv_`}-w+Fc@^kB@zi$H^x7#My7iTA;_{UvVp0jq(n3} zHc}`QqW8Z~iXVw(Dh*apN5@54T3Vusi3vF85R=ZPmv-RWBAT0<X^~ma*q!J z0FGI9%gyklyGcOLE{=1#r~uzC`>+-l7x%S65Bhe8EV;m!Ha>L~i;1hSDMT`vl%?tZ zGpCMr^g}Oapqe2aA6O7K0bcMAX&7m%2=x2%PdZvrESI|9?a7(%RY@ zEi5b;+jER$S;;ki)>}aL55Xf~2%b6_x?aBO3Qzf<-o4-%%^27(FE5utW7d_x0j!FZ zm6g1%0ynrS@Hc*WC@q4(Numt#55@iO!cFWUlhvgI0SOiWFf=f~U;T+p&&<{907*qoM6N<$f*Yv6(f|Me diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/equipped-INNERCLOTHING.png index 41e039978410df1c98944f037b9cfb94975f4525..0421c2684367abb90a26ec9e187dc36ff7b13fda 100644 GIT binary patch delta 1929 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 P00000NkvXXu0mjf)mM?B delta 838 zcmV-M1G)U%2HggbB!6vbLqkw$V`BgSD3NuMy-Pw-7{-5oL}5ll4G|3v77Yqf5RGAw zi#4c0R*PQ00=-`DRU%r0mIk3AYUyj}Kd3cmEeL`lh-hr?YYDl%M*}7FT+V%eJm)+w z?|m*fBL%H!xo4rMm(6H6yN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEYDT<%*g_wL>I-o4xrnKB8O1WW?|oItCI{$w(#y4|kW z;`_eZ8-GPn1#r1sQV;|RZ_;}w7vf2hR1ho6QjFMyISM1z!Q0uaDFIDoNpUGEN8qyl z+{DWzRj;=laXN@d6Bl=}N(4BB!2_Rr$UP46u-Bot>_bq~G^KXCO{39>4xFACF;8n8 z1s?d^+UF4OPoHUFXLL^QiVo35o(VGwtUtm*EPsp<4cFmczgY&3j(gt?K7R}VKmvLJ zQ+$1K%baB(ygm_6>rA`hNI^2>>2yjE&GVe(dOfoHvWYMt zg+FnS^^?Mk#8yVweOZ?f%~z*V_W;;zHf#0!{Ysi?DvlneOadkWlYmL!3;TfO${Nz$ Q^8f$<07*qoM6N<$f{!qSYybcN diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-left.png index b7a6673fd72b213af59720ee287b250f40bbbb01..b89a7a1f8e4621ff16ad67598ea7f81ab6b0477d 100644 GIT binary patch delta 980 zcmV;_11tQ52$BepB!6ycLqkw$V`BgSD3NuMze@sP7{@e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcpH zN=ZaPRCodHnZHT{K@i5rKM=8zG)X6sq!0K6A-#w%U}0y#+Sjl;2#A$MECd@Hi;xEp zs}$*yLWBe%g&;wY({Evq<-8nwmoaeg4J5Zad-Ltw?`E$V5gL;a0u+-T0ttVePABYk zyJ0*Q{!{C>Fl;aw zgyZozdgB49K9i{XC6!Jq>@81(b#ncyXV+e`f3 z?jQ&@-fs3odHsrFcJ{WS@z=+<1Sk9Qa29Mt&Xhr<_Zw$z6+Nr*?^l$rE&Inn!uu;R zbKlaBC#bC#*SB+(BTz1v!+O1LG$)gZ+%+0oY$pAFU#8Qk%;$6Oy|nex@?ZHI;EE52Lo@C5dIp5MmS?Q3 zmz0C|TS*FbeQ9N$(LF9?1porO$8ITbOadg3m%tC~iL>Kz1hNqT0000yN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEYSVaAvZ{x1uJa=HYsf)h$l#8 zVW$BbB_L^n-Nt`lWZ3L3v+HAF;U7?E-uV7``_0TYzX%(X5CRu}011#l9s<2yFYNdG zVKf)V(~8x@vKE#y{H)U^XNr&)W;|oZ8n>Q z%jNR8Zw1lD~Mt~A1=a=TM763y(tid?p-&c;ol#aGu%2K*hIJ)-Oj{^zcU&M@kkAAcoZM~?z z9jjb{TCEngS}miwTCL2|wPuh*s1 z>B!-YE!*u@rqiixHXGUPcHV1g>!sCy@;ks4pU>xJI2w%%2zM?|Ut2G(2Jc;oOLk*v z$2`mKTTN{}tIJ;!AOR8}0TLhq5+DH*AOR8}0TLhq5+DH*Ac1lcfN!ATMyvP&MI*$+ zYr4@z*MIV6dH{f?}+7cuhCDlvlvI#~N<5sxwr?Nhqy*tPKZOLBowMQ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/inhand-right.png index e895cd114d5a93d9b802c193feaceae41ac4d565..55910dfaa8f03aa5af4bc1a27c06f24478f62c23 100644 GIT binary patch delta 1013 zcmVe@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcpH zLrFwIRCodHnXyU(F&xJKRiWY{UD~Zw+P&Ztl-oso0S7nx0=|aRK|!4BAh@_Vlsi z;^<#1sktp1Y)AD%9}4tp%~(gAUh5V3eE*ia%YPFkvsSCg&8w&C#bQy#(eF~xdZ7;m zdZ8Ny>xk2PphiU=zV8=4?yI4E{m!F@$NTg8&wt#%sLIooUzi7XSlOCh94&o}o_z@) zZ$-6TIr=8^w0f;qpj0Y_^?F@>V>BAcL!%+5=YeV?j($_XF56l3T8}XjRw@yN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEY_1annFBt==RRw|DE zgOZxta>RC2FZ7{6uhxup#ObwOfuGr*^lpbrW`Ctpk*A)o>cwJF#nJCl(R!f|1$v Date: Mon, 5 Aug 2024 23:24:57 +0200 Subject: [PATCH 09/86] modified the job marker, pda, stamp and door changed the light blue to light green --- .../DeltaV/Markers/jobs.rsi/pharmacist.png | Bin 1343 -> 1354 bytes .../Devices/pda.rsi/pda-pharmacist.png | Bin 963 -> 960 bytes .../Misc/stamps.rsi/stamp-pharmacist.png | Bin 687 -> 714 bytes .../Storage/closet.rsi/pharmacy_door.png | Bin 788 -> 789 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/pharmacist.png b/Resources/Textures/DeltaV/Markers/jobs.rsi/pharmacist.png index 50d20314b324610d42fed2c272386ec1b05256c2..99bfb00ec9a948bbecf1e3cc8f14a7b04703f0ef 100644 GIT binary patch delta 1335 zcmV-71<3lp3d#zQB!6ycLqkw$V`BgSD3NuMze@sP7{@e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcNiVHkhDlFS%RA_vnP8)kAn zBXSU>6n|krve~S{uu8G>S;dR(oJ`#6{{DW;(6j88!Cs8g0qk&XZA~>Ajla48AMEgB zE;-UUJG?eK=V@O!95ze~5 z^z^#r1T;+}3`l!>JA;pnjZw0An@K=pZ6@WFgn#S!htFQ|VOw2YWsQS}A#1C1;kvj} zAixnLCmu)rN|z6cNgUgq%KV@IxC19h$hFkFK>FM>fTvqdd2td&R0T(;R>G3Tiap!f2!G!?8r4!NtS;L1o4CJ}# zg6%IMc6X_}jh@6W(~ok4%H=ZG93CE~rKKfm)PJ+a8nVB?&vA%H9`f1ouaDl|t7>52 zIuF#4c4McQXES8H0C(=BLUkEpnq5}7=$up=w^&Ca=9G6?T#3Bbi^#kJ32Zt zn=I#!1dxS7gM(2OjYg?(>kB3(nFwMcktP|$xdBEF#F4=6Zk++9b&yaMDQ--(1R z0VJac#?eKp;Rk6R?>9oaT;)(5b-x z`aKiC?ycl3yH%{&=K2f_4Mq8nMgR2Td|W$7XQv;ZV}=cJg~C_YufY`o6fiY|08Or* tXxJpi3kg>Q0AdCLm|4Up+U#?h{{f5piZ1vr?qUD{002ovPDHLkV1ia>gBkz; delta 1324 zcmV+{1=IS<3cm`FB!6vbLqkw$V`BgSD3NuMy-Pw-7{-5oL}5ll4G|3v77Yqf5RGAw zi#4c0R*PQ00=-`DRU%r0mIk3AYUyj}Kd3cmEeL`lh-hr?YYDl%M*}7FT+V%eJm)+w z?|m*fBL%H!xo4rMm(6H6yN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEY$fb~rXe~$rUObdsN_!}@7ym(e>OIM! z;K7CxDm~;9Y;tG_2sNk>!Qe$i5j3VG^%6yhy-fET`j*XRcQYgHgU!r)@0<6&dGlsB zL|sG(L4SB4xm-@*aa!W#bHcOj7Ee^iv9U2nsGHpptYhQ~V2Atr`=ZrqbyNX9*x|>V z*Kp;$^4<1w+I=GrS+L0Lkk0I&o6F zu1i3x0-P)wjZ*0IJ)&ZcV%0E}Ubbj;b=4%LOMk)>Z*3@Uw!OVQ*>q?;JghtQg=g@a zIGF@mJ@DW@2J>bZWNs2tZw-=INuUDIjVjPh2x#>{B9Rc~a+#{tYTJ23_xt@~d3hPT z@#$F@&wyi#Bl5Q2&LBT;_SE0a|!6*Fo0eM&GHwo9CW|7RqS z1VNbqvU4T40<6QwSgcdopy!(qLB^+^QhI)y4r?uW&IlR`g{V|2$sWK69ddPbC2_!G zoeBw00tou+XO#|jx9G*U-@Z&H1Cx}UoqrvAH}HxuvaGDENF4B3ry`!$uyL?Ojf3_u zyyHTlK;MHYdj9Z20$^uxTE{;7*l}HqV>B`Od|nI>57WuXiQK7i*J*Kakp>3`DVa>t z_MInmkx$Ut+L}BbRH)f(QZN`KUKb9BJ93x_j7ircU@(G0kQ{;ve3&1nxw$#1vwxj& z(x~v$l>l}Rv7R-W4T)2!lq3S3g>k%&?QUZS0iVxD{GfaYh$j|{$x)T^ z5`oSnj0%`*jAQUDzZ)q>J6Ua}?ij$u=y?n5Yc4M@O%p0G zG&Dq!NJM@E;IR5lV3&y&0c(BSd`}^ti^i1lXKXBt5kNCk5-8Qf?AUx8~%P-N6Ze@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wc;2%MhFR00keBn-C>gf0xEwZM1ePm9qa<;aC37qELyY~%m%3kIYLTG3ZjqzNzefx z{UFOrTT2*jJ-mcroSM8ILw9u#!{&_}8AK*bV6fc3AFc)zbvU91u7>DDcgNfs#i3$Ob0ephI80MghIXrlPp@xtE(IJ2E>HTL07={^& z&Oh$x2$Le3rfLYlq5za=i3LQ502?bS0}R6qN9V($0F)y_gHvG2@X|zw0L&Cn!h-=3 zF(DX};r+XJ44^0gyN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEY=M1=sz06sxp40F)M93DKtP(w(7=zkFS^!_sg48sgX z=O1@;gh>%iQ#Ax&Q2m(;lY52 zm=KJ~@c!L922d1$asf?30F>Q80F>}}1$f|z^4a58a7VzRfa)OtDri7?9Txz}g8(cF zNC^R=q5$M0P(h=#JAap9is5{)Wp0NO89qBSg4yT(^b diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-pharmacist.png b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/stamp-pharmacist.png index 5cbf50e34562c2f1feedf282e20d868fc07ce78a..0a0acfb682e63ddbc01c3920cb8299aef6385b04 100644 GIT binary patch delta 661 zcmV;G0&4xQ1e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcF6XAut*OqaiRF0z)+fOe53(M@`%PA4F5)2S#!KVBqbP-$)M5? vmkrCZTuC+$msz9YqaiRF0;3@?azX$A(iuw&;7g)600000NkvXXu0mjfXelT^ delta 634 zcmV-=0)_p`1+N8=B!6vbLqkw$V`BgSD3NuMy-Pw-7{-5oL}5ll4G|3v77Yqf5RGAw zi#4c0R*PQ00=-`DRU%r0mIk3AYUyj}Kd3cmEeL`lh-hr?YYDl%M*}7FT+V%eJm)+w z?|m*fBL%H!xo4rMm(6H6yN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEY3cxgoPnJPIO-$ry1o<2cuB`-9a6TD^k>!AT$%zbSuYCnu2ckiIdIC^z|M#w+ z|382Ibucgu;zKdX?jSV;{)dK!GT7VOgDpC?Y66%B@j>E1Kyq3j)d64&sY$SqW0;tj z7z2}O0wF$t5+2Y{oER!klD#CCU{TX{<4kDFvRp|vk0jTQDjp4i(GVC7fngZ}0CYA< UCmUNjQvd(}07*qoM6N<$g36~87XSbN diff --git a/Resources/Textures/Structures/Storage/closet.rsi/pharmacy_door.png b/Resources/Textures/Structures/Storage/closet.rsi/pharmacy_door.png index d9aa2cb9b3ad78d88643a4df9c661a81ecad401e..12c89b28364e5f8beb051c189d2c553f073c2f51 100644 GIT binary patch delta 564 zcmV-40?YlB29*YoB!6ycLqkw$V`BgSD3NuMze@sP7{@e@h{ooAEg{$Qrl5qq$9vC*@B4lq zp8FoSBYC}Gw@pK#ShAwwkhYju(%N6?z)LRy29vsN&c$Zq{C~T??s2JlH>!I5f3M~0 zN*lHgt`6Zz-Ly)=G7XXSlBsw{xL405)51r>K}!Y{zE*mw#xIJqHU3a+#iKLeRz0HH#D5zUwJco?sTt7?dGc(i-2dijXC}sL-F+eOK0D6)5VY??wcKbWB&7jR_8JA$4gml;g-j8SKA?{P0000yN0}fU1gQ{2Odu>;5 zI%8?z=nOcj{Hi$D;7`S7JURzX)zg=2 z;ZzH2d9x@yF6=KBD%#&X>Px&CeJLh&SoR1OQNo1qk)pyn1XKP|-$dQFNJ%`J zybU%n#gQW~-hY6o73rFhniV}GPk~L9`~N(x?9^nVyEg<~FSh+L3f+59tJ?O@iEY6Oc9ABCA_#UHw-8hVQ$UgfewG}C>BCR&-;ZA&NtPyQ0LgrUOp-zXmudI!-^V3I zP@F6Wu=iMl4TeR@n>TMzEaK$hLE+=$kQ@at%NNI8hm&CfBm+$B9g~OxQ#tt0FDFJB zSPe-IK#zM|w(P_ufkk}4v*D-%NJ;~s>@^Cg9RdK Date: Mon, 5 Aug 2024 23:41:11 +0200 Subject: [PATCH 10/86] added discrete pharmacist chem bag added discrete pharmacist chem bag + fixed pharmacistshirt.rsi --- .../Chemistry/chem_bag_pharmacist.yml | 33 ++++++++++++++++++ .../Jumpsuit/pharmacistshirt.rsi/meta.json | 4 --- .../chem_bag_pharmacist.rsi/equipped-BELT.png | Bin 0 -> 898 bytes .../chem_bag_pharmacist.rsi/icon.png | Bin 0 -> 1182 bytes .../chem_bag_pharmacist.rsi/inhand-left.png | Bin 0 -> 1071 bytes .../chem_bag_pharmacist.rsi/inhand-right.png | Bin 0 -> 944 bytes .../chem_bag_pharmacist.rsi/meta.json | 26 ++++++++++++++ 7 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/equipped-BELT.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml new file mode 100644 index 00000000000..e11ba1edc0f --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml @@ -0,0 +1,33 @@ +- type: entity + name: pharmacist bag + id: ChemBagPharmacist + parent: BaseStorageItem + description: A bag for storing pharmacy products, such as pills, pill canisters, bottles, and syringes. + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi + state: icon + - type: Clothing + sprite: DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi + quickEquip: false + slots: + - belt + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Normal # allow up to 5 large beakers / 10 beakers / 10 pill canisters + grid: + - 0,0,4,3 + quickInsert: true + areaInsert: true + whitelist: + components: + - FitsInDispenser + - Pill + tags: + - Document + - PillCanister + - Bottle + - Syringe + - HandLabeler + - type: Dumpable diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/meta.json index b0df83e8a62..9ba488c4c56 100644 --- a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-INNERCLOTHING", "directions": 4 }, - { - "name": "equipped-INNERCLOTHING-monkey", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..1acca1b847c68602bd70d1ebe1d8b5542490e29c GIT binary patch literal 898 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/meta.json new file mode 100644 index 00000000000..ea268612458 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Specific/Chemistry/chem_bag_pharmacist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by BriBrooo (GitHub). Taken from ParadiseSS13/Paradise at https://github.com/ParadiseSS13/Paradise/blob/ebf9a7b5e89f5523c5e1c3d2692bf54dac322cae/icons/obj/chemical.dmi and rescaled by reapsnI, inhand sprites by лазік#7305", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 8384290c059858cad1dd4f5d3cbf1e8a6bc4f27d Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 00:19:07 +0200 Subject: [PATCH 11/86] Added the chembag to basic loadout --- .../Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml | 2 +- Resources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml index 5a9c6542a92..a61665e0c53 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml @@ -16,7 +16,7 @@ - id: BoxPillCanister - id: BoxBottle - id: BoxVial - - id: ChemBag + - id: ChemBagPharmacist - id: ClothingHandsGlovesLatex - id: ClothingHeadsetMedical - id: ClothingMaskSterile diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml index 7172c9cf9cf..3c905cf9216 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml @@ -28,4 +28,5 @@ equipment: id: PharmacistPDA ears: ClothingHeadsetMedical + belt: ChemBagPharmacist pocket1: HandLabeler \ No newline at end of file From d6778f38fcbdc36f71d5b6dc5ca825df3ff26f5d Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 00:23:25 +0200 Subject: [PATCH 12/86] updates rp chem group --- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 1b1a81d3bf0..04adcdb824b 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -1,7 +1,7 @@ - type: reagent id: Serenitol name: reagent-name-serenitol - group: Medicine + group: Pharmacy desc: reagent-desc-serenitol physicalDesc: reagent-physical-desc-tart flavor: medicine @@ -44,7 +44,7 @@ - type: reagent id: Neurozenium name: reagent-name-neurozenium - group: Medicine + group: Pharmacy desc: reagent-desc-neurozenium physicalDesc: reagent-physical-desc-crystalline flavor: metallic @@ -109,7 +109,7 @@ - type: reagent id: Blissifylovene name: reagent-name-blissifylovene - group: Medicine + group: Pharmacy desc: reagent-desc-blissifylovene physicalDesc: reagent-physical-desc-bending flavor: bitter @@ -254,7 +254,7 @@ - type: reagent id: Calmafluxine name: reagent-name-calmafluxine - group: Medicine + group: Pharmacy desc: reagent-desc-calmafluxine physicalDesc: reagent-physical-desc-syrupy flavor: bitter @@ -292,7 +292,7 @@ - type: reagent id: Tranquinase name: reagent-name-tranquinase - group: Medicine + group: Pharmacy desc: reagent-desc-tranquinase physicalDesc: reagent-physical-desc-odorless flavor: sweet @@ -377,7 +377,7 @@ - type: reagent id: Equilibrazine name: reagent-name-equilibrazine - group: Medicine + group: Pharmacy desc: reagent-desc-equilibrazine physicalDesc: reagent-physical-desc-translucent flavor: metallic @@ -559,7 +559,7 @@ - type: reagent id: Stubantazine name: reagent-name-stubantazine - group: Medicine + group: Pharmacy desc: reagent-desc-stubantazine physicalDesc: reagent-physical-desc-sour flavor: sour @@ -612,7 +612,7 @@ - type: reagent id: Soretizone name: reagent-name-soretizone - group: Medicine + group: Pharmacy desc: reagent-desc-soretizone physicalDesc: reagent-physical-desc-thick flavor: tingly @@ -679,7 +679,7 @@ - type: reagent id: Agonolexyne name: reagent-name-agonolexyne - group: Medicine + group: Pharmacy desc: reagent-desc-agonolexyne physicalDesc: reagent-physical-desc-overpowering flavor: nothing From c733f4552a097589edcf24696133ef1fec68f5a6 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 03:15:51 +0200 Subject: [PATCH 13/86] Adds Asparatine and the whole process behind it (12 new reagents) Adds Asparatine, Sodium Salicylate, Acetyl Chloride, Acetic Acid, Methyl Salicylate, Salicylic Acid, Methanol, Sodium Phenolate, Benzenesulforic Acid, Acetic Anhydride, Hydrogen Chloride and Hydrochloric Acid --- .../deltav/reagents/meta/pharmachemicals.ftl | 32 ++- .../en-US/deltav/reagents/meta/pharmacy.ftl | 7 +- .../en-US/deltav/reagents/pharmacymsg.ftl | 23 +- .../DeltaV/Reagents/pharmachemicals.yml | 218 +++++++++++++++++- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 36 +++ .../Recipes/Reactions/pharmachemicals.yml | 119 +++++++++- .../DeltaV/Recipes/Reactions/pharmacy.yml | 20 ++ 7 files changed, 443 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index 42c339463ac..9938cc511d6 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -5,4 +5,34 @@ reagent-name-sodiumamalgam = sodium amalgam reagent-desc-sodiumamalgam = Comes from an exothermic reaction to sodium and mercury. Really ugly. reagent-name-barbituricacid = barbituric acid -reagent-desc-barbituricacid = Odorless reagent, barbituric acid itself is not pharmacologically active on its own. Legend says its name comes from "Barbara". \ No newline at end of file +reagent-desc-barbituricacid = Odorless reagent, barbituric acid itself is not pharmacologically active on its own. Legend says its name comes from "Barbara". + +reagent-name-benzenesulfonicacid = benzenesulfonic acid +reagent-desc-benzenesulfonicacid = A strongly acidic reagent, a mix of benzene and sulfuric acid. + +reagent-name-sodiumphenolate = sodium phenolate +reagent-desc-sodiumphenolate = Precursor to many other organic compounds, such as salicylic acid, it can also be called sodium phenoxide, for intimate discussions... + +reagent-name-salicylicacid = salicylic acid +reagent-desc-salicylicacid = A teratogen, from the Latin salix, which means willow tree. It was used as an ingredient in anti-acne reagents. + +reagent-name-methanol = methanol +reagent-name-methanol = Also might have heard your mother call it wood spirit, this is way more toxic than regular ethanol. + +reagent-name-methylsalicylate = methyl salicylate +reagent-desc-methylsalicylate = This reagent is more often used to flavor your mint candies than chugged from the jug. + +reagent-name-hydrogenchloride = hydrogen chloride +reagent-desc-hydrogenchloride = Also called chlorane, (HCl) is also a light diatomic molecule involved with the formation of hydrochloric acid, which is made on contact with the body + +reagent-name-hydrochloricacid = hydrochloric acid +reagent-desc-hydrochloricacid = Forms whenever hydrogen chloride enters in contact with water, you don't want that in your stomach... + +reagent-name-aceticanhydride = acetic anhydride +reagent-desc-aceticanhydride = Acetic anhydride is a carboxylic acid anhydride commonly used for the acetylation of amines and alcohols... it's used to make more complex reagents for the big picture. + +reagent-name-aceticacid = acetic acid +reagent-desc-aceticacid = Historically used to make vinegar, acetic acid, or ethanoic acid, this reagent was a big lap in modern technologies we know today. + +reagent-name-acetylchloride = acetyl chloride +reagent-desc-acetylchloride = Derived from acetic acid, this reagent is used for esterfication and the Friedel-Crafts reaction, but that's really nerdy. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index aa60a15b90c..a4eed571235 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -32,7 +32,10 @@ reagent-name-vicodilicaine = Vicodilicaine reagent-desc-vicodilicaine = Used to treat moderate to severe pain to the head. Most of the time is taken by mouth. Recreational use is common due to its hallucinogen properties. Discouraged to pair with other strong painkillers, antidepressants, and anxiety medication, though totally safe with alcohol. reagent-name-asparatine = Asparatine -reagent-desc-asparatine = A basic nonsteroidal anti-inflammatory drug used to combat light headaches. Overdose or consumption of alcohol will obliterate your digestive system. +reagent-desc-asparatine = Also called acetylsalicylic acid for nerds, this is a basic nonsteroidal anti-inflammatory drug used to combat light headaches. Overdose or consumption of alcohol will obliterate your digestive system. reagent-name-zepprocane = Zepprocane -reagent-desc-zepprocane = A high-quality barbiturate, used as an anxiolitic and anticonvulsant medicicine. From its complex form, it goes along well with antidepressants and alcohol, but is incompatible with most painkillers. \ No newline at end of file +reagent-desc-zepprocane = A high-quality barbiturate, used as an anxiolitic and anticonvulsant medicicine. From its complex form, it goes along well with antidepressants and alcohol, but is incompatible with most painkillers. + +reagent-name-sodiumsalicylate = sodium salicylate +reagent-desc-sodiumsalicylate = The sodium salt of salicylic acid, from the salicylate family. A replacement for Asparatine on very light doses only. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index a12b8f8419e..e3198016774 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -30,6 +30,7 @@ reagent-effect-antidepressant-strongoverdose9 = They're all liars. LIARS! reagent-effect-antidepressant-fade = The antidepressant effects start to fade... + reagent-effect-anxietymed-mild1 = You feel a bit calmer. reagent-effect-anxietymed-mild2 = You feel a little tired. reagent-effect-anxietymed-mild3 = You feel slightly relaxed. @@ -59,6 +60,7 @@ reagent-effect-anxietymed-strong7 = You feel like you can take on the world! reagent-effect-anxietymed-fade = The calming effects start to fade... + reagent-effect-medaddiction-1 = You're yearning for another high. reagent-effect-medaddiction-2 = You really need some more drugs. reagent-effect-medaddiction-3 = You feel empty. Find another fix. @@ -68,17 +70,20 @@ reagent-effect-medaddiction-6 = You can feel your hands shaking. reagent-effect-medaddiction-7 = You could use another hit right now reagent-effect-medaddiction-8 = One more fix couldn't hurt, right? -reagent-effect-painkiller-mild1 = Your body hurts a bit less. -reagent-effect-painkiller-mild2 = You feel a little bit dizzy. -reagent-effect-painkiller-mild3 = You feel a tiny bit numb. -reagent-effect-painkiller-mild4 = Any pain you had has faded slightly. - +reagent-effect-painkiller-light1 = You feel a tiny bit better. +reagent-effect-painkiller-light2 = The pain is manageable. For now. +reagent-effect-painkiller-light3 = It will be okay, the pain is slowly fading. reagent-effect-painkiller-normal1 = Any pain you had has faded significantly. reagent-effect-painkiller-normal2 = You feel dizzy. reagent-effect-painkiller-normal3 = Your entire body goes numb briefly. reagent-effect-painkiller-normal4 = You feel your pain fade somewhat. +reagent-effect-painkiller-mild1 = Your body hurts a bit less. +reagent-effect-painkiller-mild2 = You feel a little bit dizzy. +reagent-effect-painkiller-mild3 = You feel a tiny bit numb. +reagent-effect-painkiller-mild4 = Any pain you had has faded slightly. + reagent-effect-painkiller-strong1 = You forgot what pain feels like. reagent-effect-painkiller-strong2 = You can't see straight. reagent-effect-painkiller-strong3 = You feel a sense of deep nostalgia. @@ -88,11 +93,15 @@ reagent-effect-painkiller-strong6 = Any pain you were feeling is gone. reagent-effect-painkiller-fade = The painkiller's effects start to fade... + reagent-effect-painkiller-head = Your head feels numb. reagent-effect-painkiller-head2 = You feel like you can think properly. reagent-effect-painkiller-head3 = You can finally focus. reagent-effect-painkiller-head4 = You feel relieved. -reagent-effect-painkiller-head-fade = You feel like your head is about to explode + +reagent-effect-painkiller-head-fade = You feel like your head is about to explode. + reagent-effect-asparatine-overdose = Your tummy aches. -reagent-effect-asparatine-overdose2 = It feels like you're getting stabbed in the guts \ No newline at end of file +reagent-effect-asparatine-overdose2 = It feels like you're getting stabbed in the guts. +reagent-effect-asparatine-overdose3 = It is digging inside you. diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 7625495a8c0..f1b09f2d162 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -1,3 +1,5 @@ +# Zepprocane involved reagents + - type: reagent id: HydrogenIodide name: reagent-name-hydrogeniodide @@ -45,4 +47,218 @@ - !type:ActivateArtifact conditions: - !type:ReagentThreshold - min: 5 \ No newline at end of file + min: 5 + +# Asparatine involved reagents + +- type: reagent + id: BenzenesulfonicAcid + name: reagent-name-benzenesulfonicacid + desc: reagent-name-benzenesulfonicacid + physicalDesc: reagent-physical-desc-translucent + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 7 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 + +- type: reagent + id: SodiumPhenolate + name: reagent-name-sodiumphenolate + desc: reagent-name-sodiumphenolate + physicalDesc: reagent-physical-desc-opaque + color: "#white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.5 + +- type: reagent + id: SalicylicAcid + name: reagent-name-salicylicacid + desc: reagent-desc-salicylicacid + physicalDesc: reagent-physical-desc-powdery + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 1.5 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 + +- type: reagent + id: Methanol + name: reagent-name-methanol + desc: reagent-name-methanol + physicalDesc: reagent-physical-desc-translucent + flavor: bitter + color: "#75b1f0" + metabolisms: + Drink: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 2.5 + +- type: reagent + id: MethylSalicylate + name: reagent-name-methylsalicylate + desc: reagent-desc-methylsalicylate + physicalDesc: reagent-physical-desc-translucent + flavor: rootbeersoda + color: "white" + metabolisms: + Poison: + !type:HealthChange # precursor to asparatine, poisons and pierces your intestins + conditions: + - !type:ReagentThreshold + min: 5.7 + damage: + types: + Poison: 2 + Piercing: 1 + +- type: reagent + id: HydrogenChloride + name: reagent-name-hydrogenchloride + desc: reagent-desc-hydrogenchloride + physicalDesc: reagent-physical-desc-translucent + flavor: sharp + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 1 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 10 + +- type: reagent + id: HydrochloricAcid + name: reagent-name-hydrochloricacid + desc: reagent-desc-hydrochloricacid + physicalDesc: reagent-physical-desc-translucent + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 4.3 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 + +- type: reagent + id: AceticAnhydride + name: reagent-name-aceticanhydride + desc: reagent-desc-aceticanhydride + physicalDesc: reagent-physical-desc-translucent + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 1 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5.5 + +- type: reagent + id: AceticAcid + name: reagent-name-aceticacid + desc: reagent-desc-aceticacid + physicalDesc: reagent-physical-desc-translucent + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 0.5 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 10 + +- type: reagent + id: AcetylChloride + name: reagent-name-acetylchloride + desc: reagent-desc-acetylchloride + physicalDesc: reagent-physical-desc-translucent + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 6.2 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 2 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 04adcdb824b..6825cfa1a0d 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -849,6 +849,35 @@ refresh: false type: Add +- type : reagent + id: SodiumSalicylate + group: Pharmacy + name: reagent-name-sodiumsalicylate + desc: reagent-desc-sodiumsalicylate + physicalDesc: reagent-physical-desc-powdery + color: "white" + metabolisms: + Medicine: + metabolismRate: 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-light1" + - "reagent-effect-painkiller-light2" + - "reagent-effect-painkiller-light3" + probability: 0.085 + Poison: + effects: + - !type!HealthChange + conditions: + - !type!ReagentThreshold + min: 4.5 + damage: + types: + Caustic: 0.25 + - type: reagent id: Asparatine name: reagent-name-asparatine @@ -893,6 +922,13 @@ conditions: - !type:ReagentThreshold max: 0.1 + - !type:PopupMessage + type: Local + visualType: LargeCaution + messages: + - "reagent-effect-asparatine-overdose" + - "reagent-effect-asparatine-overdose2" + - "reagent-effect-asparatine-overdose3" - type: reagent id: Zepprocane diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 0114ff1f288..da10f3f6022 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -41,4 +41,121 @@ SodiumAmalgam: amount: 1 products: - BarbituricAcid: 2 \ No newline at end of file + BarbituricAcid: 2 + +# Asparatine involved reagents + +- type: reaction + id: BenzenesulfonicAcid + reactants: + Benzene: + amount: 1 + SulfuricAcid: + amount: 1 + products: + BenzenesulfonicAcid: 2 + +- type: reaction + id: SodiumPhenolate + mintemp: 333 + reactants: + BenzenesulfonicAcid: + amount: 1 + products: + SodiumPhenolate: 1 + +- type: reaction + id: SalicylicAcid + reactants: + SodiumPhenolate: + amount: 1 + CarbonDioxide: + amount: 1 + SulfuricAcid: + amount: 1 + catalyst: true + +- type: reaction + id: Methanol + reactants: + Hydrogen: + amount: 2 + Carbon: + amount: 1 + Copper: + amount: 1 + catalyst: true + products: + Methanol: 3 + +- type: reaction + id: MethylSalicylate + reactants: + SalicylicAcid: + amount: 1 + SodiumHydroxide: + amount: 1 + products: + MethylSalicylate: 2 + +- type: reaction + id: HydrogenChloride + reactants: + Hydrogene: + amount: 1 + Chlorine: + amount: 1 + Water: + catalyst: true + amount: 1 + products: + HydrogenChloride: 2 + +- type: reaction + id: HydrochloricAcid + effects: + - !type:PopupMessage + messages: [ "Your stomach burns with pain!" ] + type: Local + visualType: LargeCaution + reactants: + Water: + amount: 1 + HydrogenChloride: + amount: 1 + products: + HydrochloricAcid: 2 + +- type: reaction + id: AceticAnhydride + reactants: + Methanol: + amount: 1 + CarbonDioxide: + amount: 1 + products: + AceticAnhydride: 2 + +- type: reaction + id: AceticMethanol + reactants: + AceticAcid: + amount: 1 + Methanol: + amount: 1 + SulfuricAcid: + catalyst: true + amount: 1 + products: + AceticAnhydride: 2 + +- type: reaction + id: AcetylChloride + reactants: + AceticAnhydride: + amount: 1 + HydrogenChloride: + amount: 1 + products: + AcetylChloride: 1.5 + AceticAcid: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index f95c04ce8ee..580d9ee2d02 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -146,3 +146,23 @@ amount: 1 products: Zepprocane: 2 + +- type: reaction + id: SodiumSalicylate + reactants: + MethylSalicylate: + amount: 1 + SodiumHydroxide: + amount: 1 + products: + SodiumSalicylate: 2 + +- type: reaction + id: Asparatine + reactants: + SodiumSalicylate: + amount: 1 + AcetylChloride: + amount: 1 + products: + Asparatine: 2 \ No newline at end of file From ae8574d8583cc7ab9d52e4ed7b7e7a3d794eb7e6 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 03:29:41 +0200 Subject: [PATCH 14/86] Fixed FATL bugs --- .../Prototypes/DeltaV/Reagents/pharmachemicals.yml | 12 ++++++------ Resources/Prototypes/DeltaV/Reagents/pharmacy.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index f1b09f2d162..fcd1686c1a1 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -114,7 +114,7 @@ - type: reagent id: Methanol name: reagent-name-methanol - desc: reagent-name-methanol + desc: reagent-desc-methanol physicalDesc: reagent-physical-desc-translucent flavor: bitter color: "#75b1f0" @@ -140,13 +140,13 @@ metabolisms: Poison: !type:HealthChange # precursor to asparatine, poisons and pierces your intestins - conditions: + conditions: - !type:ReagentThreshold min: 5.7 - damage: - types: - Poison: 2 - Piercing: 1 + damage: + types: + Poison: 2 + Piercing: 1 - type: reagent id: HydrogenChloride diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 6825cfa1a0d..ff41c7dfe60 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -870,7 +870,7 @@ probability: 0.085 Poison: effects: - - !type!HealthChange + - !type:HealthChange conditions: - !type!ReagentThreshold min: 4.5 From 1f4cc1ee8f1ae2bdafb4dc33e277ef226f202fd7 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 03:37:37 +0200 Subject: [PATCH 15/86] Fixed even more FATL bugs --- .../deltav/reagents/meta/pharmachemicals.ftl | 2 +- .../DeltaV/Reagents/pharmachemicals.yml | 17 +++++++++-------- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index 9938cc511d6..0a47f2c9676 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -17,7 +17,7 @@ reagent-name-salicylicacid = salicylic acid reagent-desc-salicylicacid = A teratogen, from the Latin salix, which means willow tree. It was used as an ingredient in anti-acne reagents. reagent-name-methanol = methanol -reagent-name-methanol = Also might have heard your mother call it wood spirit, this is way more toxic than regular ethanol. +reagent-desc-methanol = Also might have heard your mother call it wood spirit, this is way more toxic than regular ethanol. reagent-name-methylsalicylate = methyl salicylate reagent-desc-methylsalicylate = This reagent is more often used to flavor your mint candies than chugged from the jug. diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index fcd1686c1a1..5105a251d77 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -139,14 +139,15 @@ color: "white" metabolisms: Poison: - !type:HealthChange # precursor to asparatine, poisons and pierces your intestins - conditions: - - !type:ReagentThreshold - min: 5.7 - damage: - types: - Poison: 2 - Piercing: 1 + effects: + !type:HealthChange # precursor to asparatine, poisons and pierces your intestins + conditions: + - !type:ReagentThreshold + min: 5.7 + damage: + types: + Poison: 2 + Piercing: 1 - type: reagent id: HydrogenChloride diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index ff41c7dfe60..191c8aeab72 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -872,7 +872,7 @@ effects: - !type:HealthChange conditions: - - !type!ReagentThreshold + - !type:ReagentThreshold min: 4.5 damage: types: From 8b72fa4fedb0cf8989d7e276d0afb179dce86dae Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 03:55:29 +0200 Subject: [PATCH 16/86] Fixed bugs again --- .../DeltaV/Reagents/pharmachemicals.yml | 15 ++++++++------- .../DeltaV/Recipes/Reactions/pharmachemicals.yml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 5105a251d77..a1d9bf62309 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -77,9 +77,9 @@ - type: reagent id: SodiumPhenolate name: reagent-name-sodiumphenolate - desc: reagent-name-sodiumphenolate + desc: reagent-desc-sodiumphenolate physicalDesc: reagent-physical-desc-opaque - color: "#white" + color: "white" metabolisms: Poison: effects: @@ -120,9 +120,10 @@ color: "#75b1f0" metabolisms: Drink: - - !type:AdjustReagent - reagent: Ethanol - amount: 0.2 + effects: + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 Poison: effects: - !type:HealthChange @@ -140,7 +141,7 @@ metabolisms: Poison: effects: - !type:HealthChange # precursor to asparatine, poisons and pierces your intestins + - !type:HealthChange # precursor to asparatine, poisons and pierces your intestins conditions: - !type:ReagentThreshold min: 5.7 @@ -262,4 +263,4 @@ - !type:ActivateArtifact conditions: - !type:ReagentThreshold - min: 2 \ No newline at end of file + min: 2 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index da10f3f6022..0055dd38293 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -57,7 +57,7 @@ - type: reaction id: SodiumPhenolate - mintemp: 333 + mintemp: 366 reactants: BenzenesulfonicAcid: amount: 1 From e43db5cde52069961726854fd5c358cbef6c7d87 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 04:00:03 +0200 Subject: [PATCH 17/86] Fixed a bug... --- Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index a1d9bf62309..a6fbb190241 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -121,9 +121,9 @@ metabolisms: Drink: effects: - - !type:AdjustReagent - reagent: Ethanol - amount: 0.2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 Poison: effects: - !type:HealthChange From 1ab0cf282230e19bcda24735fb077036a0cbf276 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 14:30:35 +0200 Subject: [PATCH 18/86] Finally fixes bugs and whatnot --- .../DeltaV/Recipes/Reactions/pharmachemicals.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 0055dd38293..0e4c7c68a2e 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -57,7 +57,7 @@ - type: reaction id: SodiumPhenolate - mintemp: 366 + mintemp: 370 reactants: BenzenesulfonicAcid: amount: 1 @@ -74,6 +74,8 @@ SulfuricAcid: amount: 1 catalyst: true + products: + SalicylicAcid: 2 - type: reaction id: Methanol @@ -83,8 +85,8 @@ Carbon: amount: 1 Copper: - amount: 1 - catalyst: true + amount: 1 + catalyst: true products: Methanol: 3 @@ -101,7 +103,7 @@ - type: reaction id: HydrogenChloride reactants: - Hydrogene: + Hydrogen: amount: 1 Chlorine: amount: 1 @@ -113,11 +115,6 @@ - type: reaction id: HydrochloricAcid - effects: - - !type:PopupMessage - messages: [ "Your stomach burns with pain!" ] - type: Local - visualType: LargeCaution reactants: Water: amount: 1 From 21e0653002a0369b4c9d0d8c9d2a40eba58fbef1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Tue, 6 Aug 2024 23:26:04 +0200 Subject: [PATCH 19/86] Adds Naguuprofen (and 6 new reagents) And all of that bugs-free! --- .../deltav/reagents/meta/pharmachemicals.ftl | 18 +++ .../en-US/deltav/reagents/meta/pharmacy.ftl | 5 +- .../en-US/deltav/reagents/pharmacymsg.ftl | 12 +- .../{sodiumamalgam.flt => sodiumamalgam.ftl} | 0 .../DeltaV/Reagents/pharmachemicals.yml | 115 ++++++++++++++++++ .../Prototypes/DeltaV/Reagents/pharmacy.yml | 46 ++++++- .../Recipes/Reactions/pharmachemicals.yml | 78 +++++++++++- .../DeltaV/Recipes/Reactions/pharmacy.yml | 20 ++- 8 files changed, 283 insertions(+), 11 deletions(-) rename Resources/Locale/en-US/deltav/reagents/{sodiumamalgam.flt => sodiumamalgam.ftl} (100%) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index 0a47f2c9676..797e35a4588 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -36,3 +36,21 @@ reagent-desc-aceticacid = Historically used to make vinegar, acetic acid, or eth reagent-name-acetylchloride = acetyl chloride reagent-desc-acetylchloride = Derived from acetic acid, this reagent is used for esterfication and the Friedel-Crafts reaction, but that's really nerdy. + +reagent-name-propene = propene +reagent-desc-propene = The simplest member of the alkene class of hydrocarbons, also known as propylene. + +reagent-name-toluene = toluene +reagent-desc-toluene = Made from the phenyl group of the mix of benzene and methanol, toluol, or toluene was once used in some contact cements. + +reagent-name-hydrogenfluoride = hydrogen fluoride +reagent-desc-hydrogenfluoride = Also called fluorane, (HF) is a colorless liquid and is an important feedstock in the preparation of important compounds including pharamaceuticals and polymers. + +reagent-name-isobutylbenzene = isobutylbenzene +reagent-desc-isobutylbenzene = Used in the manufacture of Naguuprofen. Highly flammable and irritant. + +reagent-name-isobutylacetophenone = isobutylacetophenone +reagent-desc-isobutylacetophenone = Used in the manufacture of Naguuprofen. This used to cost nearly a 1000 spesos for 3 ampules of 0.2u. + +reagent-name-isobutylphenylethanol = isobutylphenylethanol +reagent-desc-isobutylphenylethanol = A complex molecule used in pharamaceutics. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index a4eed571235..e5417ae8103 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -38,4 +38,7 @@ reagent-name-zepprocane = Zepprocane reagent-desc-zepprocane = A high-quality barbiturate, used as an anxiolitic and anticonvulsant medicicine. From its complex form, it goes along well with antidepressants and alcohol, but is incompatible with most painkillers. reagent-name-sodiumsalicylate = sodium salicylate -reagent-desc-sodiumsalicylate = The sodium salt of salicylic acid, from the salicylate family. A replacement for Asparatine on very light doses only. \ No newline at end of file +reagent-desc-sodiumsalicylate = The sodium salt of salicylic acid, from the salicylate family. A replacement for Asparatine on very light doses only. + +reagent-name-naguuprofen = Naguuprofen +reagent-desc-naguuprofen = Used to treat light to mild headaches, and also hangovers. Not to be paired with Asparatine. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index e3198016774..4a9644f3eb5 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -93,11 +93,13 @@ reagent-effect-painkiller-strong6 = Any pain you were feeling is gone. reagent-effect-painkiller-fade = The painkiller's effects start to fade... +reagent-effect-painkiller-head-mild1 = Your head aches less. +reagent-effect-painkiller-head-mild2 = You don't feel woozy anymore. -reagent-effect-painkiller-head = Your head feels numb. -reagent-effect-painkiller-head2 = You feel like you can think properly. -reagent-effect-painkiller-head3 = You can finally focus. -reagent-effect-painkiller-head4 = You feel relieved. +reagent-effect-painkiller-head-strong1 = Your head feels numb. +reagent-effect-painkiller-head-strong2 = You feel like you can think properly. +reagent-effect-painkiller-head-strong3 = You can finally focus. +reagent-effect-painkiller-head-strong4 = You feel extremely relieved. reagent-effect-painkiller-head-fade = You feel like your head is about to explode. @@ -105,3 +107,5 @@ reagent-effect-painkiller-head-fade = You feel like your head is about to explod reagent-effect-asparatine-overdose = Your tummy aches. reagent-effect-asparatine-overdose2 = It feels like you're getting stabbed in the guts. reagent-effect-asparatine-overdose3 = It is digging inside you. + +reagent-effect-asparatine-naguuprofen-mix1 = The Asparatine and Naguuprofen weren't a good idea... \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.flt b/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/reagents/sodiumamalgam.flt rename to Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index a6fbb190241..ff55c20c474 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -264,3 +264,118 @@ conditions: - !type:ReagentThreshold min: 2 + +# Naguuprofen involved reagents + +- type: reagent + id: Propene + name: reagent-name-propene + desc: reagent-desc-propene + physicalDesc: reagent-physical-desc-gaseous + flavor: bitter + color: "#66ff33" + tileReactions: # GHS Hazard Statements: H225: Highly flammable liquid and vapour + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.8 + +- type: reagent + id: Toluene + name: reagent-name-toluene + desc: reagent-desc-toluene + physicalDesc: reagent-physical-desc-pungent + flavor: bitter + color: "#77b58e" + tileReactions: # GHS Hazard Statements: H225: Highly flammable liquid and vapour + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.8 + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.5 + +- type: reagent + id: HydrogenFluoride + name: reagent-name-hydrogenfluoride + desc: reagent-desc-hydrogenfluoride + physicalDesc: reagent-physical-desc-pungent + flavor: bitter + color: "#d7ee46" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + Caustic: 0.5 + +- type: reagent + id: Isobutylbenzene + name: reagent-name-isobutylbenzene + desc: reagent-desc-isobutylbenzene + physicalDesc: reagent-physical-desc-aromatic + flavor: bitter + color: "#343434" + tileReactions: # GHS Hazard Statements: H225: Highly flammable liquid and vapour + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.8 + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1.5 + +- type: reagent + id: Isobutylacetophenone + name: reagent-name-isobutylacetophenone + desc: reagent-desc-isobutylacetophenone + physicalDesc: reagent-physical-desc-aromatic + flavor: bitter + color: "#343434" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 2 + +- type: reagent + id: Isobutylphenylethanol + name: reagent-name-isobutylphenylethanol + desc: reagent-desc-isobutylphenylethanol + physicalDesc: reagent-physical-desc-strong-smelling + flavor: bitter + color: "#343434" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1.5 + Asphyxiation: 1.5 + Caustic: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 191c8aeab72..e2424693b85 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -778,10 +778,10 @@ type: Local visualType: Large messages: - - "reagent-effect-painkiller-head" - - "reagent-effect-painkiller-head2" - - "reagent-effect-painkiller-head3" - - "reagent-effect-painkiller-head4" + - "reagent-effect-painkiller-head-strong1" + - "reagent-effect-painkiller-head-strong2" + - "reagent-effect-painkiller-head-strong3" + - "reagent-effect-painkiller-head-strong4" probability: 0.085 - !type:HealthChange # Poisons and pierces your intestins on overdose conditions: @@ -982,3 +982,41 @@ component: ForcedSleeping refresh: false type: Add + + +- type: reagent + id: Naguuprofen + name: reagent-name-naguuprofen + group: Pharmacy + desc: reagent-desc-naguuprofen + physicalDesc: reagent-physical-desc-powdery + color: "#294e07" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-head-mild1" + - "reagent-effect-painkiller-head-mild2" + probability: 0.085 + - !type:PopupMessage + visualType: LargeCaution + type: Local + messages: + - "reagent-effect-asparatine-naguuprofen-mix1" + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Asparatine + min: 0.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 20.2 + damage: + types: + Poison: 2 + Piercing: 1 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 0e4c7c68a2e..6a86ef5d6d7 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -155,4 +155,80 @@ amount: 1 products: AcetylChloride: 1.5 - AceticAcid: 0.5 \ No newline at end of file + AceticAcid: 0.5 + +# Naguuprofen involved reactions + +- type: reaction + id: Propene + minTemp: 370 + reactants: + Acetone: + amount: 1 + Charcoal: + amount: 1 + products: + Propene: 2 + +- type: reaction + id: Toluene + reactants: + Benzene: + amount: 1 + Methanol: + amount: 1 + SulfuricAcid: + amount: 1 + catalyst: true + products: + Toluene: 2 + +- type: reaction + id: HydrogenFluoride + mintemp: 370 + reactants: + Hydrogen: + amount: 1 + Fluorine: + amount: 1 + products: + HydrogenFluoride: 1 + +- type: reaction + id: Isobutylbenzene + reactants: + Toluene: + amount: 1 + Propene: + amount: 1 + Sodium: + amount: 1 + catalyst: true + Potassium: + amount: 1 + catalyst: true + products: + Isobutylbenzene: 2 + +- type: reaction + id: Isobutylacetophenone + reactants: + Isobutylbenzene: + amount: 1 + HydrogenFluoride: + amount: 1 + products: + Isobutylacetophenone: 2 + +- type: reaction + id: Isobutylphenylethanol + mintemp: 370 + reactants: + Isobutylacetophenone: + amount: 1 + Hydrogen: + amount: 1 + Oxygen: + amount: 1 + products: + Isobutylphenylethanol: 3 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index 580d9ee2d02..d55536c0e3b 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -165,4 +165,22 @@ AcetylChloride: amount: 1 products: - Asparatine: 2 \ No newline at end of file + Asparatine: 2 + +- type: reaction + id: Naguuprofen + mintemp: 370 + reactants: + Isobutylphenylethanol: + amount: 1 + Carbon: + amount: 1 + Oxygen: + amount: 1 + HydrogenChloride: + amount: 1 + Iron: + amount: 1 + catalyst: true + products: + Naguuprofen: 4 \ No newline at end of file From b93cdcbabf41b167b7f00ccada7eccc791a9350f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 7 Aug 2024 01:45:53 +0200 Subject: [PATCH 20/86] Added Guidebook Entry --- .../Locale/en-US/deltav/guidebook/guides.ftl | 1 + .../DeltaV/Entities/Objects/Misc/paper.yml | 2 +- .../Prototypes/DeltaV/Guidebook/medical.yml | 4 ++ Resources/Prototypes/Guidebook/medical.yml | 1 + Resources/ServerInfo/Guidebook/Chemicals.xml | 2 + .../Guidebook/DeltaV/Medical/Pharmacist.xml | 39 +++++++++++++++++++ .../ServerInfo/Guidebook/Medical/Medicine.xml | 15 ++----- 7 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Guidebook/medical.yml create mode 100644 Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml diff --git a/Resources/Locale/en-US/deltav/guidebook/guides.ftl b/Resources/Locale/en-US/deltav/guidebook/guides.ftl index 583905aed58..6a983f62e74 100644 --- a/Resources/Locale/en-US/deltav/guidebook/guides.ftl +++ b/Resources/Locale/en-US/deltav/guidebook/guides.ftl @@ -18,5 +18,6 @@ guide-entry-deltav-rule-c3 = C3. Follow Antagonist Guidelines guide-entry-alert-levels = Alert Levels guide-entry-justice = Justice +guide-entry-pharmacist = Pharmacist guide-entry-glimmer-creatures = Glimmer Creatures diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index 21610a6ff75..fa6089532e2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -34,7 +34,7 @@ - type: entity name: pharmacy prescription parent: Paper - id: PaperPrecsription2 + id: PaperPrecsription description: 'A piece of paper to justify the reagents you detain on your person. Issued by the pharmacist.' components: - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Guidebook/medical.yml b/Resources/Prototypes/DeltaV/Guidebook/medical.yml new file mode 100644 index 00000000000..edac621be0a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Guidebook/medical.yml @@ -0,0 +1,4 @@ +- type: guideEntry + id: Pharmacist + name: guide-entry-pharmacist + text: "/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml" \ No newline at end of file diff --git a/Resources/Prototypes/Guidebook/medical.yml b/Resources/Prototypes/Guidebook/medical.yml index 0c7b1c781e4..625be41e08b 100644 --- a/Resources/Prototypes/Guidebook/medical.yml +++ b/Resources/Prototypes/Guidebook/medical.yml @@ -5,6 +5,7 @@ children: - Medical Doctor - Chemist + - Pharmacist # DeltaV - Pharmacist Job - Cloning - Cryogenics diff --git a/Resources/ServerInfo/Guidebook/Chemicals.xml b/Resources/ServerInfo/Guidebook/Chemicals.xml index b1893805d1f..6ef36989482 100644 --- a/Resources/ServerInfo/Guidebook/Chemicals.xml +++ b/Resources/ServerInfo/Guidebook/Chemicals.xml @@ -10,6 +10,8 @@ Knowing different types of chemicals and their effects is important for being ab ## Medicine + +## Pharmaceutics ## Narcotics diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml new file mode 100644 index 00000000000..dcf3bb57303 --- /dev/null +++ b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml @@ -0,0 +1,39 @@ + +# Pharmacist +The "crème de la crème" in terms of knowledge in chemistry, the Pharmacist is the best at its domain! That they studied at Interdyne Pharmaceutics or at the Andromeda Initiative Laboratories, their valuable knowledge is to be respected. +They sacrifice the general purpose of Chemistry to the indomitable world of pharmaceutics, working more closely to the crew, the psychologist, medical doctors that actually do check-ups, atmospheric technicians, ... +The Pharmacist is a social role, where social interactions are needed if you wish to excell at handing out prescriptions. + +## Equipment: + + + + + + + + + + + + + + + +## You're on your own! + +The Pharmacist runs his own booth, where people can checkout or ask for a prescription. You are sort of a store-keep in some way. +Use your lab's design to your advantage, having a storefront, and a lab behind it! + +## Prescriptions + +The Pharmacist has access to unique items, his own stamp, and prescriptions. + +Write your prescription template, hand out to doctors, stamp it for legal reasons and make copies! Your job is half-reagent half-paperwork! What a nightmare! +Your PDA has an built-in scanner, so don't worry about rushing to medbay and ask what's wrong with someone. + +## Pharmaceutic Reagents + +A lot of the reagents the Pharmacist has to deal with are hard to synthetize, a lot of them need a lot of refining, and overall a lot of ressources, so try to be as noble and humble on your dosage, or harrass logistics for more! + + \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml index 730c615f31b..435ce77c36f 100644 --- a/Resources/ServerInfo/Guidebook/Medical/Medicine.xml +++ b/Resources/ServerInfo/Guidebook/Medical/Medicine.xml @@ -27,18 +27,9 @@ These medications tend to have specific use cases. -# Pharmacologist Medications - -These medications are used by the pharmacologist. - - - - - - - - - +# Pharmacist Medications + +These medications are used by the pharmacist. # All Medications From d6f3e54d71b8fe5eaf345451376d1086c0a1acb5 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 7 Aug 2024 02:34:52 +0200 Subject: [PATCH 21/86] Adds a jumpsuit and jumpskirt alternative --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 +++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../pharmacist.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1438 bytes .../Jumpskirt/pharmacist.rsi/icon.png | Bin 0 -> 875 bytes .../Jumpskirt/pharmacist.rsi/inhand-left.png | Bin 0 -> 1036 bytes .../Jumpskirt/pharmacist.rsi/inhand-right.png | Bin 0 -> 1025 bytes .../Jumpskirt/pharmacist.rsi/meta.json | 26 ++++++++++++++++++ .../pharmacist.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1661 bytes .../Uniforms/Jumpsuit/pharmacist.rsi/icon.png | Bin 0 -> 880 bytes .../Jumpsuit/pharmacist.rsi/inhand-left.png | Bin 0 -> 1036 bytes .../Jumpsuit/pharmacist.rsi/inhand-right.png | Bin 0 -> 1025 bytes .../Jumpsuit/pharmacist.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 73 insertions(+) create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 4853aa235b0..0d9b50c5e6e 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -127,3 +127,13 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtPharma + name: pharmacist jumpskirt + description: There's still some odd stains on this jumpskirt. Hm. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 9e4bdfc1bc5..5cfde18bf92 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -331,3 +331,14 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/pharmacistshirt.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitPharma + name: pharmacist jumpsuit + description: There's still some odd stains on this jumpsuit. Hm. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..467c72d400f764f5af712e353fb7372a7d2498d8 GIT binary patch literal 1438 zcmV;P1!4M$P)i6#x!gGe?r=`eTTN4tFW6=z6x0@DOIqs- zURvm86mML&jM@2_C=J)=9WGUGhgGk}_v)_pWXjUPPvj7!os}N zUfF$ELS#(9H(*&o=3PS)ci%sY4St#a!u<$0RJYOUDmY3 zE}U;c&w~*+<3Ex|wmY4M*Hh?-LFWy$EmyPpJ?G>eq8svyu3>K<2Iang0;^3>X8(fH7bU7z4(@*<@fqQ}*lXyXM4|OH!#+ zBJ1k)dUNf|H+eok7n##wr1=7$^T>k&T#6RoJ6RSFpm3pSb4=`iwTr%`bfeK|+Xt(aBmdUAUPu@pcu9gh zwD^Nb!C=4halEJR<)Fg%b}p4lO%z=y6l8yYKUQyS zY{<~ikgTt-d&gxF-Lwxr^1{o|;Cp=pyCui@VzJ1_Q=`2IAp58aEXN7$*d_3f^T}$< z6W@EQvM3Zt;c?&?+Yh4If?V58=Y{W0025>)9J@M?!rl0IK5qPQJ~lQ6i~(c77%&Em z0b{@zFb0ePW55_N28;n?;A}9!j_^sT7ERKu9bvD3in@gYh}|IMK_dsO zLr%2&#!>qb5UpuSze!+`-E#3QPPGF*Uw9?uuQNfb8~|vDqD9sh_MM7QJTQUHrYzd` z$PGDaL`47svsDg2S9mO3TVBs$EabwrycRRHIT{xXeScZ}9snL*KDwyHMk%|)aqD_* zBPPh09Bf_S_;)8ke(tHD)H?vtLBieQITcVZomo6%BA4LB(4f$20{;9u5d1*iZr*QS zkKqLc1$JgvVnHJZh?|!tu<8h0-F+cz=d1E$>_Y?tZ>3*Hz}*3EE+7LrF3DUZza)c- z00dcnxGT$Yy(1p)3*5Ll(_znRFf}#RzLOBfn0Ohsq>np4i6#x!gGe?r=`eTTN4tFW6=z6x0@DOIqs- zURvm86mML&jM@2_C=J)=9WGUGhgGk}_v)_pWXjUPPvj7!os}N zUfF$ELS#(9H(*&o=3PS)ci%sY4St#a!u<$0RJYOUDmY3 zE}U;c&w~*+<3Ex|wmY4M*Hh?-LFWy$EmyPpJ?G>eq8svyu3>K<2Iang#zczJraAaL8SPHnwRaLP(l`cHwlrZ)L)8uA4m+Z1yW|c4of$ z-8~`?zX87izX8920vovKU#U2bl_>;v_)R{Wt!#5jAChlxZE91#5bN;sS;qeQjHD8B zTKJ$#{Am+v&``sDlKJ%+MZ4YZx8iVWeir94d9aQ&x}Va{UV}ylCHm;aD|#4)^zisZ zkV%rP?B)LM7e9-0f%Od>-nP`u$p&!~To4i%CXtrXuA9w@BM$MJVEI@Z;JCq2i%MtH z67>G%HTBL)2~&V&E{H8p5W8~Pmf?sZvxw~CGbrglg)WmoD>BZ zd>yRgEdWKXz_|e~!i}&lWs$-%&Y%4T{09DY1E02f__|nAMF#)?002ovPDHLkV1nw5 Bk)Z$p literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5a3b4d864275451d5b507642733e544af87ee76f GIT binary patch literal 1036 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq;S=|Qchhu_*8V>1>VbI(=s{M-)wu7`%uqT+Mi3F zi`_>u;D^`CPAz-wb0I%tH%j*UG)I5EVpMPOvHk0snc{Ln@6JE>`t{!Cm3Pg`Lx=WU ziMv@F;ld&4qU_iiT6BZQTh}A)Ypt^VKFh907oX;C=+o@uiTudsqU(8m%9SlIG%JhN ztiJRAdFImN$5-90b{HC-ZNnl&v`>>NENa=Z+B!g)k3lZnfT#qy_^n#}W^_3x&g zc(mR1U0K@m*?aH%t&$bw6H;Krff}_~+72h0&Gp-yr1Qpg_W3Qe zSsnd;OSFN%<;B^booCXFUzS*@wI6Dbb-q5c^QrrFML&C~(+j!(2H1LQJzmB8;MJE1 zx%YZcKL5?0zWVEKQ^9AKXR@3=^EY#FTXu~@b+u4p8dP><@a;UeBe81??s>b~>FTn%oE6TRgAU;J~RX7}B$U!U!6?_Q^W*?G>d zT&aC_>o=8jCOWST^RC)EZ^574ch~u-2}iEKZY0;Ax;5%#+UAevM5E7d`>#CP_{#Pe zJ>L@-j4w3u^YwWH&8SLfS zXUply)N#{!f(nDo*46F@o?b8V6l;i^ckQiWN162+m+xPDt~v{BwNHqbpMO4hd%MC- sE(Vsr(oY&+R8O79();wYz2FZvMg7RWbiI_Tz(mI2>FVdQ&MBb@0CTR+9smFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e16d969d4af155c246285b63e4036144314d42a4 GIT binary patch literal 1025 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq;S=|Qchhu_*8V>1>VbI(=s{M-)wu7`%uqT+Mi3F zi`_>u;D^`CPAz-wb0I%tH%j*UG)I5EVpMPOvHk0snc{Ln@6JE>`t{!Cm3Pg`Lx=WU ziMv@F;ld&4qU_iiT6BZQTh}A)Ypt^VKFh907oX;C=+o@uiTudsqU(8m%9SlIG%JhN ztiJRAdFImN$5-90bFMGaQo;CkrlA+Jqe$EQMG2}) zJO!fpC)oLN#5pM5h^}NhpE&W5@{%tsimpj>mDB}hFX7aP;Mnv_e~-aAzqGQ=yR5nY zi_ENjfA-A3_qRR2b{9-w;KYR*4rG{k}!mC^k3td%^m)7eb_t>AmnWcT7ofP~^+Nrv#{$3In+E6#r(e|uZo z;fLS4mHVx(9W^-h>MTRWu3F2A>c3M?_y5*CTef@dH?CbL7Wb7JGH9$eXJ+tioyC21 zHJk9I$E&Rww?wV|a_X^tDqru`ylby&!faRhZ_QX!dUp2a&r-?G%P&tnn4qxZ-`~3U zWtUg3xt=}KM{QHo+LX;VExylc5C0nD_I{%OlcJqIryqZ`V0{=Z?VKyW*Lwe=_qUFG z`6^m-`OB)jb1Du@*pYxS<8)1~-)E-w@8l1jeOcT<{KaOg4N|XVRwu9d^)Dxk{hCd{ z*~=4{v)^^TwY<)2ARCb@)qCWXgm~i|Zih(rZ5<0%U4O>JP`uHzuTZdKC&L4W`G;pM zk8=r`nqABs@Y+*0Ty*8eYo_<7R4zBqFmGU+{Y2vSukxdDzopr09-K5U;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/meta.json new file mode 100644 index 00000000000..a18b4cb7fd7 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by Bribrooo (github). Edit by Nairodian (github) of paramedic_skirt from tgstation at pull request https://github.com/tgstation/tgstation/pull/48236.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..30cb9208aabec78789c51f8c12d57f6d3463ffcd GIT binary patch literal 1661 zcmV-@27>vCP)i6#x!gGe?r=`eTTN4tFW6=z6x0@DOIqs- zURvm86mML&jM@2_C=J)=9WGUGhgGk}_v)_pWXjUPPvj7!os}N zUfF$ELS#(9H(*&o=3PS)ci%sY4St#a!u<$0RJYOUDmY3 zE}U;c&w~*+<3Ex|wmY4M*Hh?-LFWy$EmyPpJ?G>eq8svyu3>K<2Iang87{%CWV{1gB7W9@j^fW~I2*$*cMnVwb0tILcgwI>|_s-co z_I8(@cY7-dZ<6DE&CGA+_ulRS^N6fi1}p=X0n318z%pPNune3{1~QVgUyr_Xu3WxI zy}i9$BN*r%Ti zDGBT+v<0{>*loJ4@LH%t;esEZvHZ9^pD4aFmUCur68rXAfDa7~l_d`arSIAa z^9)oE!v{_n0TTS0KvZpV?o)xfujOd&R)&fr)80x?Pmg*O(9X=vc=OrO-jcp+mxTE7 zffpu-LyDgbbB6ibAM?)mgA2q#;MwQIu|7L9g~lTS>xwKldDy{TDH#3;!jE!gf*(l$ zgN@zIQ|56&y)Z}Lyr+>T57kmzTbpVz#ykXi&`(lyeEqcPr-A3C_>qsm{+}blM;HB# z>z~ICK!WUa-MD>IKN7o00w(VN2>hA^+d=GeVqtc?9=8qilO%p50a1bSk>fT>w;F3n z;Rfz-M8HmSb2H)DZ*6U*{{DWNnwp}GjSX5~U#G3DEtpDuM!+3ka7P-e8#e2K$NCg z(k6kEJSmn~3Asw56Y%-`E9&_=s7mDkKtU8GvQ*gDGD7me1U46CQNBlPh*2UU0^pcS z{JR1yUMgKw;zB7`howQ7=rbnB=+3$qIR4#9 zpr899cj6NO?;zn$N4*FrNo7u+eIgdMF+3q?#RTmBJ|cV|ZwvRl>oG}HYvaVuSZEOg zM2{lIm=z#2;cZA1j zv_Y6bv7Ho)=mfyoz`#J6Prfg3{l;L~S~Vv6`ue;(34Z_2U%d2BMUIbumqn@)<#IWv zp`k$)L0ei{JZ-Mgudc3E^?m>VaYvz}qeEfiegMnn<|bvcS=!mzp+cc_p^Mj|S`h(o z1QP1&OWyz>Ade3kwS-xQW;RyV4D) zhycz4FQ2p}Da?up$Ye_IP?MKWrGzmi$55$1Yi}7iqYV572L%Us&9QBY00000NkvXX Hu0mjfiKhMw literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4fcc135874c3bd73d445ee3cd6a1c6ee348f0700 GIT binary patch literal 880 zcmV-$1CRWPP)i6#x!gGe?r=`eTTN4tFW6=z6x0@DOIqs- zURvm86mML&jM@2_C=J)=9WGUGhgGk}_v)_pWXjUPPvj7!os}N zUfF$ELS#(9H(*&o=3PS)ci%sY4St#a!u<$0RJYOUDmY3 zE}U;c&w~*+<3Ex|wmY4M*Hh?-LFWy$EmyPpJ?G>eq8svyu3>K<2Iang!kS5_2tSnL; z*J|J@OB-!WZ6zd-&L3f+2v_(MQi(qyNKQ$YGHFFTE=@o|Lf|;>O|t6}5;G@u*@3;? z`Plbn-|i7vvkF)R)?I-@9sz3EKG6`xvtAQ zFvEwTIn=T9-=F6*N|kjwofJfa!GLG@%21bwTO=1i5B;gk)O=_BFbw(RICZsJopRpo z^8E4?(a{5mutisJeX>sgJ>T0V5MzLJJRb9`V#uRTH!F}r)BteqFAr$)nf#nKi*>tQ zO@W4xN8RbpmX5Dlh#GjjcrARqP3ZXRif(QL-9)KWVtkMzjy&p6zl!)zc|1JR>h-$m z@`KC^EKy_3LkEDS96O0000Z|(wjL@ zq;S=|Qchhu_*8V>1>VbI(=s{M-)wu7`%uqT+Mi3F zi`_>u;D^`CPAz-wb0I%tH%j*UG)I5EVpMPOvHk0snc{Ln@6JE>`t{!Cm3Pg`Lx=WU ziMv@F;ld&4qU_iiT6BZQTh}A)Ypt^VKFh907oX;C=+o@uiTudsqU(8m%9SlIG%JhN ztiJRAdFImN$5-90b{HC-ZNnl&v`>>NENa=Z+B!g)k3lZnfT#qy_^n#}W^_3x&g zc(mR1U0K@m*?aH%t&$bw6H;Krff}_~+72h0&Gp-yr1Qpg_W3Qe zSsnd;OSFN%<;B^booCXFUzS*@wI6Dbb-q5c^QrrFML&C~(+j!(2H1LQJzmB8;MJE1 zx%YZcKL5?0zWVEKQ^9AKXR@3=^EY#FTXu~@b+u4p8dP><@a;UeBe81??s>b~>FTn%oE6TRgAU;J~RX7}B$U!U!6?_Q^W*?G>d zT&aC_>o=8jCOWST^RC)EZ^574ch~u-2}iEKZY0;Ax;5%#+UAevM5E7d`>#CP_{#Pe zJ>L@-j4w3u^YwWH&8SLfS zXUply)N#{!f(nDo*46F@o?b8V6l;i^ckQiWN162+m+xPDt~v{BwNHqbpMO4hd%MC- sE(Vsr(oY&+R8O79();wYz2FZvMg7RWbiI_Tz(mI2>FVdQ&MBb@0CTR+9smFU literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e16d969d4af155c246285b63e4036144314d42a4 GIT binary patch literal 1025 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|(wjL@ zq;S=|Qchhu_*8V>1>VbI(=s{M-)wu7`%uqT+Mi3F zi`_>u;D^`CPAz-wb0I%tH%j*UG)I5EVpMPOvHk0snc{Ln@6JE>`t{!Cm3Pg`Lx=WU ziMv@F;ld&4qU_iiT6BZQTh}A)Ypt^VKFh907oX;C=+o@uiTudsqU(8m%9SlIG%JhN ztiJRAdFImN$5-90bFMGaQo;CkrlA+Jqe$EQMG2}) zJO!fpC)oLN#5pM5h^}NhpE&W5@{%tsimpj>mDB}hFX7aP;Mnv_e~-aAzqGQ=yR5nY zi_ENjfA-A3_qRR2b{9-w;KYR*4rG{k}!mC^k3td%^m)7eb_t>AmnWcT7ofP~^+Nrv#{$3In+E6#r(e|uZo z;fLS4mHVx(9W^-h>MTRWu3F2A>c3M?_y5*CTef@dH?CbL7Wb7JGH9$eXJ+tioyC21 zHJk9I$E&Rww?wV|a_X^tDqru`ylby&!faRhZ_QX!dUp2a&r-?G%P&tnn4qxZ-`~3U zWtUg3xt=}KM{QHo+LX;VExylc5C0nD_I{%OlcJqIryqZ`V0{=Z?VKyW*Lwe=_qUFG z`6^m-`OB)jb1Du@*pYxS<8)1~-)E-w@8l1jeOcT<{KaOg4N|XVRwu9d^)Dxk{hCd{ z*~=4{v)^^TwY<)2ARCb@)qCWXgm~i|Zih(rZ5<0%U4O>JP`uHzuTZdKC&L4W`G;pM zk8=r`nqABs@Y+*0Ty*8eYo_<7R4zBqFmGU+{Y2vSukxdDzopr09-K5U;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/meta.json new file mode 100644 index 00000000000..2eb98e73425 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/pharmacist.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by Bribrooo (github). from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 77e65d99245fb1ff8fa03dcd9e3407458b350cfa Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Wed, 7 Aug 2024 02:38:37 +0200 Subject: [PATCH 22/86] Update identification_cards.yml --- .../DeltaV/Entities/Objects/Misc/identification_cards.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 7ae4e9dd6e9..cd87ef20ba1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -62,4 +62,3 @@ - state: default - sprite: DeltaV/Objects/Misc/id_cards.rsi state: idpharmacist - From 9658672bf63eda9c2da060774511971d5de24478 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 8 Aug 2024 18:50:52 +0200 Subject: [PATCH 23/86] Update loadout-groups.ftl --- Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 531c0db71a9..336158f211d 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -47,6 +47,7 @@ loadout-group-chemist-neck = Chemist neck loadout-group-medical-doctor-neck = Medical Doctor neck + loadout-group-pharmacist-jumpsuit = Pharmacist jumpsuit loadout-group-pharmacist-back = Pharmacist back loadout-group-pharmacist-outerclothing = Pharmacist outer clothing @@ -56,6 +57,7 @@ loadout-group-pharmacist-glasses = Pharmacist glasses loadout-group-pharmacist-belt = Pharmacist belt loadout-group-pharmacist-shoes = Pharmacist shoes + # Miscellaneous loadout-group-scarfs = Scarf From cb17ed29913e729ef35746a3fc8a9f7a528c2069 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 8 Aug 2024 19:09:25 +0200 Subject: [PATCH 24/86] Update identification_cards.yml --- .../DeltaV/Entities/Objects/Misc/identification_cards.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index cd87ef20ba1..b8885a23c5b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -49,6 +49,7 @@ state: nyanomailcarrier - type: PresetIdCard job: Courier + jobName: Courier - type: entity parent: IDCardStandard From 1e5f50c5ea6f624656c221eae6febbd9c77faf23 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 06:52:09 +0200 Subject: [PATCH 25/86] =?UTF-8?q?Prepares=20future=20=CE=B2-blockers=20rea?= =?UTF-8?q?gents=20+=20Sodium=20Amalgam=20spark=20SFX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds Aryloxypropanolamine, Epichlorohydrin, AllylChloride, Catechol, HydrogenPeroxide and modifies the sparks of the sodium amalgam effect. --- .../Audio/DeltaV/Effects/sodiumspark1.ogg | Bin 0 -> 19305 bytes .../Audio/DeltaV/Effects/sodiumspark2.ogg | Bin 0 -> 29338 bytes .../deltav/reagents/meta/pharmachemicals.ftl | 17 ++- .../deltav/reagents/meta/physical-desc.ftl | 3 +- .../DeltaV/Reagents/pharmachemicals.yml | 129 +++++++++++++++++- .../Recipes/Reactions/pharmachemicals.yml | 71 +++++++++- .../DeltaV/Recipes/Reactions/pharmacy.yml | 5 +- .../DeltaV/SoundCollections/explosion.yml | 5 + 8 files changed, 217 insertions(+), 13 deletions(-) create mode 100644 Resources/Audio/DeltaV/Effects/sodiumspark1.ogg create mode 100644 Resources/Audio/DeltaV/Effects/sodiumspark2.ogg create mode 100644 Resources/Prototypes/DeltaV/SoundCollections/explosion.yml diff --git a/Resources/Audio/DeltaV/Effects/sodiumspark1.ogg b/Resources/Audio/DeltaV/Effects/sodiumspark1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8221ee77cdf2160ef3cdea4010662ca925732c18 GIT binary patch literal 19305 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/DeltaV/Effects/sodiumspark2.ogg b/Resources/Audio/DeltaV/Effects/sodiumspark2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..66181f18d775a6e2fc6a840b05a379e11564fefa GIT binary patch literal 29338 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 Ef9JEyr2qf` literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index 797e35a4588..637127f8539 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -53,4 +53,19 @@ reagent-name-isobutylacetophenone = isobutylacetophenone reagent-desc-isobutylacetophenone = Used in the manufacture of Naguuprofen. This used to cost nearly a 1000 spesos for 3 ampules of 0.2u. reagent-name-isobutylphenylethanol = isobutylphenylethanol -reagent-desc-isobutylphenylethanol = A complex molecule used in pharamaceutics. \ No newline at end of file +reagent-desc-isobutylphenylethanol = A complex molecule used in pharamaceutics. + +reagent-name-hydrogenperoxide = hydrogen peroxide +reagent-desc-hydrogenperoxide = Also called peroxol, (H202) used to be a bleaching agent, or an oxidizer. + +reagent-name-catechol = catechol +reagent-desc-catechol = Found naturally in fruits and vegetables, or as the extract of catechin, and also called pyrocatechol, just if you wondered. + +reagent-name-allylchloride = allyl chloride +reagent-desc-allylchloride = A hazardous organic compound mainly used in reactions, without a real purpose in existence if not to be transformed. + +reagent-name-epichlorohydrin = epichlorohydrin +reagent-name-epichlorohydrin = Often used to make epoxy related sticky liquids like resins and glues. Still not a pretext to sniff it. + +reagent-name-aryloxypropanolamine = aryloxypropanolamine +reagent-desc-aryloxypropanolamine = An organic compound often used in the synthesis of β-blockers. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl index 63ebd60c032..4feb88b9633 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl @@ -1 +1,2 @@ -reagent-physical-desc-bending = light bending \ No newline at end of file +reagent-physical-desc-bending = light bending +reagent-physical-desc-sharp = sharp \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index ff55c20c474..dfd2de68a3d 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -74,8 +74,8 @@ - !type:ReagentThreshold min: 5 -- type: reagent - id: SodiumPhenolate +- type: reagent + id: SodiumPhenolate # Also used in β-blocker synthesis name: reagent-name-sodiumphenolate desc: reagent-desc-sodiumphenolate physicalDesc: reagent-physical-desc-opaque @@ -378,4 +378,127 @@ types: Poison: 1.5 Asphyxiation: 1.5 - Caustic: 0.5 \ No newline at end of file + Caustic: 0.5 + +# β-blocker reagents + +- type: reagent + id: HydrogenPeroxide + name: reagent-name-hydrogenperoxide + desc: reagent-desc-hydrogenperoxide + physicalDesc: reagent-physical-desc-sharp + color: "#d6fffe" + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + type: + Brute: 0.5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 2 + damage: + types: + Poison: 2 + +- type: reagent + id: Catechol + name: reagent-name-catechol + desc: reagent-desc-catechol + physicalDesc: reagent-physical-desc-translucent + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 9.2 + damage: + types: + Poison: 1 + reactiveEffects: + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 + +- type: reagent + id: AllylChloride + name: reagent-name-allylchloride + desc: reagent-desc-allylchloride + physicalDesc: reagent-physical-desc-allylchloride + color: "#fdff85" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + tileReactions: # GHS Hazard Statements: H225: Highly flammable liquid and vapour + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.8 + +- type: reagent + id: Epichlorohydrin + name: reagent-name-epichlorohydrin + desc: reagent-desc-epichlorohydrin + physicalDesc: reagent-physical-desc-pungent + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 2.6 + damage: + types: + Poison: 1 + Genetic: 0.25 # GHS Hazard Statements: H350: May cause cancer + reactiveEffects: # GHS Pictograms: GHS05: Corrosive + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 + tileReactions: # GHS Hazard Statements: H226: Flammable liquid and vapour + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.5 + +- type: reagent + id: Aryloxypropanolamine + name: reagent-name-aryloxypropanolamine + desc: reagent-desc-aryloxypropanolamine + physicalDesc: reagent-physical-desc-translucent + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 4.2 + damage: + types: + Poison: 1 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 6a86ef5d6d7..202978b9d1f 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -12,25 +12,21 @@ - type: reaction id: SodiumAmalgam impact: Medium - mintemp: 310 + mintemp: 370 reactants: Sodium: amount: 1 Mercury: amount: 1 effects: - - !type:ExplosionReactionEffect - explosionType: Default # 15 damage per intensity. - maxIntensity: 0.0001 - intensityPerUnit: 0.0001 - intensitySlope: 0.0001 - maxTotalIntensity: 0.0001 - !type:PopupMessage messages: [ "The sodium melts with the mercury!" ] type: Pvs visualType: LargeCaution products: SodiumAmalgam: 2 + sound: + collection: SodiumSpark - type: reaction id: BarbituricAcid @@ -232,3 +228,64 @@ amount: 1 products: Isobutylphenylethanol: 3 + + +# β-blocker reactions + +- type: reaction + id: PhenolBreakdown + source: true + requiredMixerCategories: + - Electrolysis + reactants: + Phenol: + amount: 1 + products: + HydrogenPeroxide: 2 + +- type: reaction + id: Catechol + reactants: + Phenol: + amount: 1 + HydrogenPeroxide: + amount: 1 + products: + Catechol: 2 + +- type: reaction + id: AllylChloride + mintemp: 473.15 + reactants: + Propene: + amount: 1 + Chlorine: + amount: 1 + products: + AllylChloride: 2 + +- type: reaction + id: Epichlorohydrin + reactants: + AllylChloride: + amount: 1 + HydrogenChloride: # Could have made HCl but that would mean I'd need to rewrite how water works and its whole acidity. + amount: 1 + products: + Epichlorohydrine: 2 + +- type: reaction + id: Aryloxypropanolamine # Used for α and β1 antagonist + reactants: + Catechol: + amount: 1 + Epichlorohydrin: + amount: 1 + SodiumPhenolate: # Alkali metal phenolate (a phenoxide or phenolate) + amount: 1 + products: + Aryloxypropanolamine: 1 + +# cordivol: +# hydroxypropyl + propylene glycol +# propylene glycol = propylene oxide + sulfuric acid (catalyst) (= dipropylene glycol (able to electrosys to get back some elements)) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index d55536c0e3b..33ee6aa9805 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -183,4 +183,7 @@ amount: 1 catalyst: true products: - Naguuprofen: 4 \ No newline at end of file + Naguuprofen: 4 + +# (Nebivolol) "β1-selective" β1 antagonist, β3 agonist, considered STRONG for in game standards = dilation of blood vessels, blocks adrenergic receptors in the heart (no more neurotransmission) +# Cordivol (Carvedilol) "α1- + β-selective" α1 antagonist, non-selective: β1 + β2 antagonist = dilation of blood vessels \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/SoundCollections/explosion.yml b/Resources/Prototypes/DeltaV/SoundCollections/explosion.yml new file mode 100644 index 00000000000..2622f06945d --- /dev/null +++ b/Resources/Prototypes/DeltaV/SoundCollections/explosion.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: SodiumSpark + files: + - /Audio/DeltaV/Effects/sodiumspark1.ogg + - /Audio/DeltaV/Effects/sodiumspark2.ogg \ No newline at end of file From e3d091e1d3624ff0bca7f7d4e25508ef57b7b3c5 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 07:56:32 +0200 Subject: [PATCH 26/86] Adds Propene glycol and propene oxide and everything bug free too --- .../deltav/reagents/meta/pharmachemicals.ftl | 10 +++- .../DeltaV/Reagents/pharmachemicals.yml | 56 +++++++++++++++++-- .../Recipes/Reactions/pharmachemicals.yml | 25 ++++++++- .../DeltaV/Recipes/Reactions/pharmacy.yml | 13 +++++ 4 files changed, 94 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index 637127f8539..a1e2cd83c60 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -65,7 +65,13 @@ reagent-name-allylchloride = allyl chloride reagent-desc-allylchloride = A hazardous organic compound mainly used in reactions, without a real purpose in existence if not to be transformed. reagent-name-epichlorohydrin = epichlorohydrin -reagent-name-epichlorohydrin = Often used to make epoxy related sticky liquids like resins and glues. Still not a pretext to sniff it. +reagent-desc-epichlorohydrin = Often used to make epoxy related sticky liquids like resins and glues. Still not a pretext to sniff it. reagent-name-aryloxypropanolamine = aryloxypropanolamine -reagent-desc-aryloxypropanolamine = An organic compound often used in the synthesis of β-blockers. \ No newline at end of file +reagent-desc-aryloxypropanolamine = An organic compound often used in the synthesis of β-blockers. + +reagent-name-propeneoxide = propene oxide +reagent-desc-propeneoxide = An acutely toxic and carcinogenic organic compound often used in the industrial sector in large quantities. + +reagent-name-propeneglycol = propene glycol +reagent-desc-propeneglycol = A sweet, viscous liquid. Produced on a large scale for the production of polymers. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index dfd2de68a3d..089e25425f4 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -467,7 +467,7 @@ damage: types: Poison: 1 - Genetic: 0.25 # GHS Hazard Statements: H350: May cause cancer + Cellular: 0.25 # GHS Hazard Statements: H350: May cause cancer reactiveEffects: # GHS Pictograms: GHS05: Corrosive Acidic: methods: [ Touch ] @@ -476,15 +476,15 @@ conditions: - !type:ReagentThreshold min: 5 - tileReactions: # GHS Hazard Statements: H226: Flammable liquid and vapour - - !type:FlammableTileReaction - temperatureMultiplier: 2.0 - reactiveEffects: Flammable: methods: [ Touch ] effects: - !type:FlammableReaction multiplier: 0.5 + tileReactions: # GHS Hazard Statements: H226: Flammable liquid and vapour + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + - type: reagent id: Aryloxypropanolamine @@ -502,3 +502,49 @@ damage: types: Poison: 1 + +- type: reagent + id: PropeneOxide + name: reagent-name-propeneoxide + desc: reagent-desc-propeneoxide + physicalDesc: reagent-physical-desc-acidic + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 2.6 + damage: + types: + Poison: 1 + Cellular: 1 # carcinogenic + tileReactions: # GHS Hazard Statements: GHS02: Flammable + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.3 + +- type: reagent + id: PropeneGlycol + name: reagent-name-propeneglycol + desc: reagent-desc-propeneglycol + physicalDesc: reagent-physical-desc-crystalline + flavor: sweet + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange # Toxicity is insignificant even at large doses + conditions: + - !type:ReagentThreshold + min: 50 + damage: + types: + Poison: 0.1 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 202978b9d1f..9d727666ddc 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -286,6 +286,25 @@ products: Aryloxypropanolamine: 1 -# cordivol: -# hydroxypropyl + propylene glycol -# propylene glycol = propylene oxide + sulfuric acid (catalyst) (= dipropylene glycol (able to electrosys to get back some elements)) +- type: reaction + id: PropeneOxide + reactants: + Propene: + amount: 1 + Chlorine: + amount: 1 + Hydrogen: + amount: 1 + products: + PropeneOxide: 1 + +- type: reaction + id: PropeneGlycol + reactants: + PropeneOxide: + amount: 1 + SulfuricAcid: + amount: 1 + catalyst: true + products: + PropeneGlycol: 1 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index 33ee6aa9805..bbc39fb9d00 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -185,5 +185,18 @@ products: Naguuprofen: 4 +- type: reaction + id: Cordivol + mintemp: 370 + reactants: + PropeneOxide: + amount: 1 + PropeneGlycol: + amount: 1 + Aryloxypropanolamine: + amount: 1 + products: + Cordivol: 1 + # (Nebivolol) "β1-selective" β1 antagonist, β3 agonist, considered STRONG for in game standards = dilation of blood vessels, blocks adrenergic receptors in the heart (no more neurotransmission) # Cordivol (Carvedilol) "α1- + β-selective" α1 antagonist, non-selective: β1 + β2 antagonist = dilation of blood vessels \ No newline at end of file From 84cd261d17c59445c8bd0104a9f4266887762755 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 08:28:24 +0200 Subject: [PATCH 27/86] Adds Cordivol and fixes the guidebook (i think?) bug free too!! --- .../en-US/deltav/reagents/meta/pharmacy.ftl | 5 +- .../en-US/deltav/reagents/pharmacymsg.ftl | 14 +++- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 83 ++++++++++++++++++- .../Guidebook/DeltaV/Medical/Pharmacist.xml | 17 ++-- 4 files changed, 106 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index e5417ae8103..ca82c042bc9 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -41,4 +41,7 @@ reagent-name-sodiumsalicylate = sodium salicylate reagent-desc-sodiumsalicylate = The sodium salt of salicylic acid, from the salicylate family. A replacement for Asparatine on very light doses only. reagent-name-naguuprofen = Naguuprofen -reagent-desc-naguuprofen = Used to treat light to mild headaches, and also hangovers. Not to be paired with Asparatine. \ No newline at end of file +reagent-desc-naguuprofen = Used to treat light to mild headaches, and also hangovers. Not to be paired with Asparatine. + +reagent-name-cordivol = Cordivol +reagent-desc-cordivol = An α1 antagonist, non-selective β-blocker. Used in severe cases of systolic heart failure. No real issues with mixing other drugs, alcohol is safe. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index 4a9644f3eb5..3b69393acb9 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -108,4 +108,16 @@ reagent-effect-asparatine-overdose = Your tummy aches. reagent-effect-asparatine-overdose2 = It feels like you're getting stabbed in the guts. reagent-effect-asparatine-overdose3 = It is digging inside you. -reagent-effect-asparatine-naguuprofen-mix1 = The Asparatine and Naguuprofen weren't a good idea... \ No newline at end of file +reagent-effect-asparatine-naguuprofen-mix1 = The Asparatine and Naguuprofen weren't a good idea... + +reagent-effect-betablocker1 = You feel light-headed. +reagent-effect-betablocker2 = You stop shaking so much. +reagent-effect-betablocker3 = You can breathe easy. +reagent-effect-betablocker4 = Any shaking is gone. +reagent-effect-betablocker5 = Your breathe calmly. +reagent-effect-betablocker6 = You feel easy. +reagent-effect-betablocker7 = Your chest is at ease. + +reagent-effect-betablocker-fade1 = You start to shake. +reagent-effect-betablocker-fade2 = Your heart starts to race. +reagent-effect-betablocker-fade3 = You breathe shakily. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index e2424693b85..9489db9cf29 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -772,7 +772,7 @@ key: SeeingRainbows component: SeeingRainbows type: Add - time: 5 + time: 2.2 refresh: false - !type:PopupMessage type: Local @@ -795,7 +795,7 @@ type: Local visualType: Medium messages: - - "reagent-effect-painkiller-fade" + - "reagent-effect-painkiller-head-fade" probability: 0.4 conditions: - !type:ReagentThreshold @@ -953,6 +953,12 @@ - "reagent-effect-anxietymed-strong6" - "reagent-effect-anxietymed-strong7" probability: 0.085 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.32 - !type:GenericStatusEffect conditions: - !type:ReagentThreshold @@ -1012,6 +1018,15 @@ - !type:ReagentThreshold reagent: Asparatine min: 0.1 + - !type:PopupMessage # A decent chance to notify the player when their meds run out + type: Local + visualType: Medium + messages: + - "reagent-effect-painkiller-head-fade" + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.2 - !type:HealthChange conditions: - !type:ReagentThreshold @@ -1019,4 +1034,66 @@ damage: types: Poison: 2 - Piercing: 1 \ No newline at end of file + Piercing: 1 + +- type: reagent + id: Cordivol + name: reagent-name-cordivol + group: Pharmacy + desc: reagent-desc-cordivol + physicalDesc: reagent-physical-desc-powdery + color: "#44bcc8" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-betablocker1" + - "reagent-effect-betablocker2" + - "reagent-effect-betablocker3" + - "reagent-effect-betablocker4" + - "reagent-effect-betablocker5" + - "reagent-effect-betablocker6" + probability: 0.085 + - !type:PopupMessage # A decent chance to notify the player when their meds run out + type: Local + visualType: Medium + messages: + - "reagent-effect-betablocker-fade1" + - "reagent-effect-betablocker-fade2" + - "reagent-effect-betablocker-fade3" + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.2 + - !type:PopupMessage + type: Local + visualType: MediumCaution + messages: + - "reagent-effect-betablocker-overdose1" + - "reagent-effect-betablocker-overdose2" + - "reagent-effect-betablocker-overdose3" + probability: 0.15 + conditions: + - !type:ReagentThreshold + min: 11.2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 11.2 + damage: + types: + Poison: 0.5 + Asphyxiation: 0.66 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 11.2 + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 2.2 + refresh: false \ No newline at end of file diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml index dcf3bb57303..9cf53c09b09 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml @@ -1,8 +1,8 @@ # Pharmacist -The "crème de la crème" in terms of knowledge in chemistry, the Pharmacist is the best at its domain! That they studied at Interdyne Pharmaceutics or at the Andromeda Initiative Laboratories, their valuable knowledge is to be respected. -They sacrifice the general purpose of Chemistry to the indomitable world of pharmaceutics, working more closely to the crew, the psychologist, medical doctors that actually do check-ups, atmospheric technicians, ... -The Pharmacist is a social role, where social interactions are needed if you wish to excell at handing out prescriptions. +The "crème de la crème" in terms of knowledge in chemistry, the Pharmacist is the best at its domain! Whether they studied at Interdyne Pharmaceutics or the Andromeda Initiative Laboratories, their valuable knowledge is to be respected. +They sacrifice the general purpose of Chemistry to the indomitable world of pharmaceutics, working more closely with the crew, the psychologist, medical doctors who actually do check-ups, and atmospheric technicians, ... +The Pharmacist is a social role, where social interactions are needed if you wish to excel at handing out prescriptions. ## Equipment: @@ -22,18 +22,19 @@ The Pharmacist is a social role, where social interactions are needed if you wis ## You're on your own! -The Pharmacist runs his own booth, where people can checkout or ask for a prescription. You are sort of a store-keep in some way. +The Pharmacist runs his own booth, where people can check out or ask for a prescription. You are a store-keep in some way. Use your lab's design to your advantage, having a storefront, and a lab behind it! ## Prescriptions The Pharmacist has access to unique items, his own stamp, and prescriptions. -Write your prescription template, hand out to doctors, stamp it for legal reasons and make copies! Your job is half-reagent half-paperwork! What a nightmare! -Your PDA has an built-in scanner, so don't worry about rushing to medbay and ask what's wrong with someone. +Write your prescription template, hand it out to doctors, stamp it for legal reasons, and make copies! Your job is half-reagent half-paperwork! What a nightmare! +Your PDA has a built-in scanner, so don't worry about rushing to Medbay and asking what's wrong with someone. ## Pharmaceutic Reagents -A lot of the reagents the Pharmacist has to deal with are hard to synthetize, a lot of them need a lot of refining, and overall a lot of ressources, so try to be as noble and humble on your dosage, or harrass logistics for more! +Many of the reagents the Pharmacist has to deal with are hard to synthesize, a lot of them need a lot of refining, and overall a lot of resources, so try to be as noble and humble on your dosage, or harass logistics for more! + + - \ No newline at end of file From 769a8f4ff6e0c730e69f5da67ad2b54530d94b65 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 08:33:43 +0200 Subject: [PATCH 28/86] forgot to save last file open... --- Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index 3b69393acb9..f5f7c9c1017 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -120,4 +120,8 @@ reagent-effect-betablocker7 = Your chest is at ease. reagent-effect-betablocker-fade1 = You start to shake. reagent-effect-betablocker-fade2 = Your heart starts to race. -reagent-effect-betablocker-fade3 = You breathe shakily. \ No newline at end of file +reagent-effect-betablocker-fade3 = You breathe shakily. + +reagent-effect-betablocker-overdose1 = Your heart beats too fast! +reagent-effect-betablocker-overdose2 = You feel like you're about to pass out! +reagent-effect-betablocker-overdose3 = You can't breathe properly! \ No newline at end of file From c70a1a651087e0a571f8dd53d2651815c0db5dac Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 10:54:00 +0200 Subject: [PATCH 29/86] =?UTF-8?q?Adds=20Debivolol=20+=20=CE=B2-blocker=20t?= =?UTF-8?q?ouch=20ups?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Audio/DeltaV/Effects/sodiumspark1.ogg | Bin 19305 -> 16830 bytes .../Audio/DeltaV/Effects/sodiumspark2.ogg | Bin 29338 -> 24008 bytes .../deltav/reagents/meta/pharmachemicals.ftl | 8 +- .../en-US/deltav/reagents/meta/pharmacy.ftl | 5 +- .../deltav/reagents/meta/physical-desc.ftl | 3 +- .../en-US/deltav/reagents/pharmacymsg.ftl | 8 +- .../DeltaV/Reagents/pharmachemicals.yml | 83 +++++++++++++ .../Prototypes/DeltaV/Reagents/pharmacy.yml | 115 +++++++++++++++++- .../Recipes/Reactions/pharmachemicals.yml | 59 +++++++++ .../DeltaV/Recipes/Reactions/pharmacy.yml | 4 +- 10 files changed, 277 insertions(+), 8 deletions(-) diff --git a/Resources/Audio/DeltaV/Effects/sodiumspark1.ogg b/Resources/Audio/DeltaV/Effects/sodiumspark1.ogg index 8221ee77cdf2160ef3cdea4010662ca925732c18..ada9cbba874ee664df0c063607e2827661285e24 100644 GIT binary patch delta 15778 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 literal 19305 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 diff --git a/Resources/Audio/DeltaV/Effects/sodiumspark2.ogg b/Resources/Audio/DeltaV/Effects/sodiumspark2.ogg index 66181f18d775a6e2fc6a840b05a379e11564fefa..a286ca5bf5a4caf75ce22251e775629f210961a7 100644 GIT binary patch delta 23085 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 Ef9JEyr2qf` diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index a1e2cd83c60..dce40aa6ad4 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -74,4 +74,10 @@ reagent-name-propeneoxide = propene oxide reagent-desc-propeneoxide = An acutely toxic and carcinogenic organic compound often used in the industrial sector in large quantities. reagent-name-propeneglycol = propene glycol -reagent-desc-propeneglycol = A sweet, viscous liquid. Produced on a large scale for the production of polymers. \ No newline at end of file +reagent-desc-propeneglycol = A sweet, viscous liquid. Produced on a large scale for the production of polymers. + +reagent-name-sulfurtrioxide = sulfur trioxide +reagent-desc-sulfurtrioxide = Once was described as "unquestionably the most [economically] important sulfur oxide". + +reagent-name-chlorosulfuricacid = chlorosulfuric acid +reagent-desc-chlorosulfuricacid = May cause respiratory irritation, also caustic. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index ca82c042bc9..2a471cff4cc 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -44,4 +44,7 @@ reagent-name-naguuprofen = Naguuprofen reagent-desc-naguuprofen = Used to treat light to mild headaches, and also hangovers. Not to be paired with Asparatine. reagent-name-cordivol = Cordivol -reagent-desc-cordivol = An α1 antagonist, non-selective β-blocker. Used in severe cases of systolic heart failure. No real issues with mixing other drugs, alcohol is safe. \ No newline at end of file +reagent-desc-cordivol = An α1 antagonist, non-selective β-blocker. Used in severe cases of systolic heart failure. No real issues with mixing other drugs, alcohol is safe. + +reagent-name-debivolol = X-Debivolol +reagent-desc-debivolol = placeholder script. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl index 4feb88b9633..eee133128d3 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl @@ -1,2 +1,3 @@ reagent-physical-desc-bending = light bending -reagent-physical-desc-sharp = sharp \ No newline at end of file +reagent-physical-desc-sharp = sharp +reagent-physical-desc-solidlauryl = white and solid \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index f5f7c9c1017..d7ed3d7d4a1 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -124,4 +124,10 @@ reagent-effect-betablocker-fade3 = You breathe shakily. reagent-effect-betablocker-overdose1 = Your heart beats too fast! reagent-effect-betablocker-overdose2 = You feel like you're about to pass out! -reagent-effect-betablocker-overdose3 = You can't breathe properly! \ No newline at end of file +reagent-effect-betablocker-overdose3 = You can't breathe properly! + +reagent-effect-cordivol-debivolol-mix1 = The Cordivol and Debivolol mix wasn't a good idea... +reagent-effect-cordivol-debivolol-mix2 = You feel like you're about to die... +reagent-effect-cordivol-debivolol-mix3 = I need air... Fresh air... +reagent-effect-cordivol-debivolol-mix4 = Can't... Chest... +reagent-effect-cordivol-debivolol-mix5 = My... heart... \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 089e25425f4..7905c3976d3 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -503,6 +503,8 @@ types: Poison: 1 +## Cordivol + - type: reagent id: PropeneOxide name: reagent-name-propeneoxide @@ -548,3 +550,84 @@ damage: types: Poison: 0.1 + +## X-Devivolol + +- type: reagent + id: SulfurTrioxide + name: reagent-name-sulfurtrioxide + desc: reagent-desc-sulfurtrioxide + physicalDesc: reagent-physical-desc-acidic + flavor: bitter + color: "#dfdf00" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 1 + reactiveEffects: # GHS Pictograms: GHS05: Corrosive + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 5 + +- type: reagent + id: ChlorosulfuricAcid + name: reagent-name-chlorosulfuricacid + desc: reagent-desc-chlorosulfuricacid + physicalDesc: reagent-physical-desc-acidic + flavor: bitter + color: "#b3afa9" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Caustic: 1.5 + reactiveEffects: # GHS Pictograms: GHS05: Corrosive + Acidic: + methods: [ Touch ] + effects: + - !type:ActivateArtifact + conditions: + - !type:ReagentThreshold + min: 3.7 + +- type: reagent + id: Dodecanol + name: reagent-name-dodecanol + desc: reagent-desc-dodecanol + physicalDesc: reagent-physical-desc-oily + flavor: alcohol + color: "#b05b3c" + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 1.2 + +- type: reagent + id: SodiumLauryl + name: reagent-name-sodiumlauryl + desc: reagent-desc-sodiumlauryl + physicalDesc: reagent-physical-desc-solidlauryl + flavor: bitter + color: "white" + metabolisms: + Poison: + effects: + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 10 + damage: + types: + Poison: 2 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 9489db9cf29..51c9865dc0a 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -929,6 +929,16 @@ - "reagent-effect-asparatine-overdose" - "reagent-effect-asparatine-overdose2" - "reagent-effect-asparatine-overdose3" + - !type:PopupMessage + visualType: LargeCaution + type: Local + messages: + - "reagent-effect-asparatine-naguuprofen-mix1" + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Naguuprofen + min: 0.1 - type: reagent id: Zepprocane @@ -1015,9 +1025,9 @@ - "reagent-effect-asparatine-naguuprofen-mix1" probability: 0.1 conditions: - - !type:ReagentThreshold - reagent: Asparatine - min: 0.1 + - !type:ReagentThreshold + reagent: Asparatine + min: 0.1 - !type:PopupMessage # A decent chance to notify the player when their meds run out type: Local visualType: Medium @@ -1088,6 +1098,105 @@ types: Poison: 0.5 Asphyxiation: 0.66 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 11.2 + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 2.2 + refresh: false + - !type:PopupMessage + visualType: LargeCaution + type: Local + messages: + - "reagent-effect-cordivol-debivol-mix1" + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Debivolol + min: 0.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + reagent: Debivolol + min: 0.1 + damage: + types: + Poison: 5 + +- type: reagent + id: Debivolol + name: reagent-name-debivolol + group: Pharmacy + desc: reagent-desc-debivolol + physicalDesc: reagent-physical-desc-powdery + color: "#44bcc8" + flavor: medicine + metabolisms: + Medicine: + metabolismRate: 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-betablocker1" + - "reagent-effect-betablocker2" + - "reagent-effect-betablocker3" + - "reagent-effect-betablocker4" + - "reagent-effect-betablocker5" + - "reagent-effect-betablocker6" + probability: 0.085 + - !type:PopupMessage # A decent chance to notify the player when their meds run out + type: Local + visualType: Medium + messages: + - "reagent-effect-betablocker-fade1" + - "reagent-effect-betablocker-fade2" + - "reagent-effect-betablocker-fade3" + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.2 + - !type:PopupMessage + type: Local + visualType: MediumCaution + messages: + - "reagent-effect-betablocker-overdose1" + - "reagent-effect-betablocker-overdose2" + - "reagent-effect-betablocker-overdose3" + probability: 0.15 + conditions: + - !type:ReagentThreshold + min: 11.2 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 11.2 + damage: + types: + Poison: 0.5 + Asphyxiation: 0.66 + - !type:PopupMessage + visualType: LargeCaution + type: Local + messages: + - "reagent-effect-cordivol-debivol-mix1" + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Debivolol + min: 0.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + reagent: Debivolol + min: 0.1 + damage: + types: + Poison: 5 - !type:GenericStatusEffect conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 9d727666ddc..4cb1a7b932d 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -286,6 +286,8 @@ products: Aryloxypropanolamine: 1 +## Cordivol + - type: reaction id: PropeneOxide reactants: @@ -308,3 +310,60 @@ catalyst: true products: PropeneGlycol: 1 + +## X-Devivolol + +- type: reaction + id: SulfurTrioxide + reactants: + Sulfur: + amount: 1 + Oxygen: + amount: 3 + products: + SulfurTrioxide: 2 + +- type: reaction # Sulfur Trioxide becomes sulfuric acid in contact with water. + id: SulfuricAcidTrioxide + reactants: + SulfurTrioxide: + amount: 1 + Water: + amount: 1 + products: + SulfuricAcid: 2 + +- type: reaction + id: ChlorosulfuricAcid + reactants: + HydrogenChloride: + amount: 1 + SulfurTrioxide: + amount: 1 + SulfuricAcid: + amount: 1 + catalyst: true + products: + ChlorosulfuricAcid: 2 + +- type: reaction + id: Dodecanol + reactants: + Ethanol: + amount: 1 + Sodium: + amount: 1 + Carbon: + amount: 1 + products: + Dodecanol: 3 + +- type: reaction + id: SodiumLauryl + reactants: + ChlorosulfuricAcid: + amount: 1 + Dodecanol: + amount: 1 + products: + SodiumLauryl: 4 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index bbc39fb9d00..9dc5ff4c20c 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -198,5 +198,7 @@ products: Cordivol: 1 -# (Nebivolol) "β1-selective" β1 antagonist, β3 agonist, considered STRONG for in game standards = dilation of blood vessels, blocks adrenergic receptors in the heart (no more neurotransmission) +# X-Debivolol(Nebivolol) "β1-selective" β1 antagonist, β3 agonist, considered STRONG for in game standards = dilation of blood vessels, blocks adrenergic receptors in the heart (no more neurotransmission) +# Sodium_dodecyl_sulfate + silicon +# dodecanol + chlorosulfuric acid # Cordivol (Carvedilol) "α1- + β-selective" α1 antagonist, non-selective: β1 + β2 antagonist = dilation of blood vessels \ No newline at end of file From b696fcceb5b569b19a114eb9f3925b9973b0476f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 11:12:49 +0200 Subject: [PATCH 30/86] Update pharmacy.yml --- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 51c9865dc0a..5282f2fb364 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -1180,15 +1180,15 @@ Poison: 0.5 Asphyxiation: 0.66 - !type:PopupMessage - visualType: LargeCaution - type: Local - messages: - - "reagent-effect-cordivol-debivol-mix1" - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Debivolol - min: 0.1 + visualType: LargeCaution + type: Local + messages: + - "reagent-effect-cordivol-debivol-mix1" + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Debivolol + min: 0.1 - !type:HealthChange conditions: - !type:ReagentThreshold From 25784e92c402b4dea845ed98332f8386f9b98cb1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 11:19:17 +0200 Subject: [PATCH 31/86] Update pharmacy.yml --- .../Prototypes/DeltaV/Reagents/pharmacy.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 5282f2fb364..6b72e27f311 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -1179,16 +1179,16 @@ types: Poison: 0.5 Asphyxiation: 0.66 - - !type:PopupMessage - visualType: LargeCaution - type: Local - messages: - - "reagent-effect-cordivol-debivol-mix1" - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Debivolol - min: 0.1 + - !type:PopupMessage + visualType: LargeCaution + type: Local + messages: + - "reagent-effect-cordivol-debivol-mix1" + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Debivolol + min: 0.1 - !type:HealthChange conditions: - !type:ReagentThreshold From 066195cdb738606913ad456ef4af331827e3077a Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 14:36:42 +0200 Subject: [PATCH 32/86] bug fixes --- .../deltav/reagents/meta/pharmachemicals.ftl | 8 +++++++- Resources/Prototypes/DeltaV/Access/misc.yml | 1 + .../Entities/Objects/Devices/station_beacon.yml | 2 +- .../Objects/Misc/identification_cards.yml | 2 +- .../DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 2 +- .../Prototypes/DeltaV/Loadouts/loadout_groups.yml | 15 --------------- .../DeltaV/Reagents/pharmachemicals.yml | 4 ++-- .../DeltaV/Recipes/Reactions/pharmachemicals.yml | 6 +++--- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index dce40aa6ad4..cf1358726e4 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -80,4 +80,10 @@ reagent-name-sulfurtrioxide = sulfur trioxide reagent-desc-sulfurtrioxide = Once was described as "unquestionably the most [economically] important sulfur oxide". reagent-name-chlorosulfuricacid = chlorosulfuric acid -reagent-desc-chlorosulfuricacid = May cause respiratory irritation, also caustic. \ No newline at end of file +reagent-desc-chlorosulfuricacid = May cause respiratory irritation, also caustic. + +reagent-name-dodecanol = dodecanol +reagent-desc-dodecanol = Fat alcohol. Was previously made from coconut and whatnots. + +reagent-name-sodiumlauryl = sodiun lauryl +reagent-desc-sodiumlauryl = A complex reagent used in the synthesis of beta blockers. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml index 495e4cb456d..f7d7bba59a2 100644 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ b/Resources/Prototypes/DeltaV/Access/misc.yml @@ -40,6 +40,7 @@ - Mantis - Paramedic - Psychologist + - Pharmacist - Boxer - Clown - Library diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml index 8776083199a..5cd34d636bb 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml @@ -54,7 +54,7 @@ suffix: Pharmacist components: - type: NavMapBeacon - defaultText: station-beacon-pharmacist + defaultText: station-beacon-pharmacy #Epistemics - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 94545d4e9d2..03d33661b00 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -57,7 +57,7 @@ name: pharmacist ID card components: - type: PresetIdCard - job: Pharmacist + jobName: Pharmacist - type: Sprite layers: - state: default diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index 8467b8a0834..d6c0ed1748f 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -49,7 +49,7 @@ # Glasses - type: loadout id: PharmacistGlasses - equipment: PharmacistGlasses + equipment: Chem - type: startingGear id: PharmacistGlasses diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index cde03601ee2..b9a94f1d7cb 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -140,26 +140,11 @@ - type: loadoutGroup id: PharmacistGloves name: loadout-group-pharmacist-gloves - minLimit: 0 loadouts: - LatexGloves - NitrileGloves - ChemistGloves -- type: loadoutGroup - id: PharmacistGlasses - name: loadout-group-pharmacist-glasses - minlimit: 0 - loadouts: - - ChemGlass - -- type: loadoutGroup - id: PharmacistBelt - name: loadout-group-pharmacist-belt - minlimit: 0 - loadouts: - - ChemBag - - type: loadoutGroup id: PharmacistShoes name: loadout-group-pharmacist-shoes diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 7905c3976d3..072b7a88880 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -15,7 +15,7 @@ name: reagent-name-sodiumamalgam desc: reagent-desc-sodiumamalgam physicalDesc: reagent-physical-desc-shiny - flavor: metalic + flavor: shiny color: "#c9bba3" metabolisms: Poison: @@ -432,7 +432,7 @@ id: AllylChloride name: reagent-name-allylchloride desc: reagent-desc-allylchloride - physicalDesc: reagent-physical-desc-allylchloride + physicalDesc: reagent-physical-desc-translucent color: "#fdff85" metabolisms: Poison: diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 4cb1a7b932d..3d224894d8c 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -30,7 +30,7 @@ - type: reaction id: BarbituricAcid - minTemp: 370 + mintemp: 370 reactants: HydrogenIodide: amount: 1 @@ -157,7 +157,7 @@ - type: reaction id: Propene - minTemp: 370 + mintemp: 370 reactants: Acetone: amount: 1 @@ -272,7 +272,7 @@ HydrogenChloride: # Could have made HCl but that would mean I'd need to rewrite how water works and its whole acidity. amount: 1 products: - Epichlorohydrine: 2 + Epichlorohydrin: 2 - type: reaction id: Aryloxypropanolamine # Used for α and β1 antagonist From 96e71f5bb275b25446fad4ff5f7521a882ac5170 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 23:26:04 +0200 Subject: [PATCH 33/86] bug fixes --- .../Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 5 ----- Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index d6c0ed1748f..43ac6101f97 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -46,11 +46,6 @@ equipment: outerClothing: ClothingOuterCoatLabPharma -# Glasses -- type: loadout - id: PharmacistGlasses - equipment: Chem - - type: startingGear id: PharmacistGlasses equipment: diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 072b7a88880..8ca42bd3900 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -14,7 +14,7 @@ id: SodiumAmalgam name: reagent-name-sodiumamalgam desc: reagent-desc-sodiumamalgam - physicalDesc: reagent-physical-desc-shiny + physicalDesc: reagent-physical-desc-crystalline flavor: shiny color: "#c9bba3" metabolisms: From 353f929c17828aa8b2bbe2d6c27bf3650f229b16 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 9 Aug 2024 23:47:25 +0200 Subject: [PATCH 34/86] bug fixes requiem --- .../DeltaV/Entities/Objects/Misc/identification_cards.yml | 1 - Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 2 +- .../Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 03d33661b00..ec73bd03053 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -48,7 +48,6 @@ - sprite: DeltaV/Objects/Misc/id_cards.rsi state: nyanomailcarrier - type: PresetIdCard - job: Courier jobName: Courier - type: entity diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 8ca42bd3900..df7022f9639 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -15,7 +15,7 @@ name: reagent-name-sodiumamalgam desc: reagent-desc-sodiumamalgam physicalDesc: reagent-physical-desc-crystalline - flavor: shiny + flavor: bitter color: "#c9bba3" metabolisms: Poison: diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index 9dc5ff4c20c..cdb858db2db 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -27,7 +27,7 @@ - type: reaction id: Blissifylovene - minTemp: 340 + mintemp: 340 reactants: Serenitol: amount: 1 @@ -40,7 +40,7 @@ - type: reaction id: Calmafluxine - minTemp: 325 + mintemp: 325 reactants: Phenol: amount: 1 @@ -93,7 +93,7 @@ - type: reaction id: Soretizone - minTemp: 340 + mintemp: 340 reactants: Bicaridine: amount: 1 @@ -109,7 +109,7 @@ - type: reaction id: Agonolexyne - minTemp: 350 + mintemp: 350 reactants: Bicaridine: amount: 1 From 6e9dcecf5c39d4089618ec8b1ff5a16dfa1daa2e Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 10 Aug 2024 00:05:32 +0200 Subject: [PATCH 35/86] Update pharmachemicals.yml --- .../DeltaV/Recipes/Reactions/pharmachemicals.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index 3d224894d8c..be358eeb7ed 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -1,6 +1,6 @@ - type: reaction id: HydrogenIodide - mintemp: 310 + minTemp: 310 reactants: Hydrogen: amount: 2 @@ -12,7 +12,7 @@ - type: reaction id: SodiumAmalgam impact: Medium - mintemp: 370 + minTemp: 370 reactants: Sodium: amount: 1 @@ -30,7 +30,7 @@ - type: reaction id: BarbituricAcid - mintemp: 370 + minTemp: 370 reactants: HydrogenIodide: amount: 1 @@ -53,7 +53,7 @@ - type: reaction id: SodiumPhenolate - mintemp: 370 + minTemp: 370 reactants: BenzenesulfonicAcid: amount: 1 @@ -157,7 +157,7 @@ - type: reaction id: Propene - mintemp: 370 + minTemp: 370 reactants: Acetone: amount: 1 @@ -181,7 +181,7 @@ - type: reaction id: HydrogenFluoride - mintemp: 370 + minTemp: 370 reactants: Hydrogen: amount: 1 @@ -218,7 +218,7 @@ - type: reaction id: Isobutylphenylethanol - mintemp: 370 + minTemp: 370 reactants: Isobutylacetophenone: amount: 1 @@ -255,7 +255,7 @@ - type: reaction id: AllylChloride - mintemp: 473.15 + minTemp: 473.15 reactants: Propene: amount: 1 From 331d359a487e56b613d931ea85721c853e9f47ae Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 10 Aug 2024 00:09:54 +0200 Subject: [PATCH 36/86] Update pharmacy.yml --- .../Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index cdb858db2db..873297fcf71 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -27,7 +27,7 @@ - type: reaction id: Blissifylovene - mintemp: 340 + minTemp: 340 reactants: Serenitol: amount: 1 @@ -40,7 +40,7 @@ - type: reaction id: Calmafluxine - mintemp: 325 + minTemp: 325 reactants: Phenol: amount: 1 @@ -93,7 +93,7 @@ - type: reaction id: Soretizone - mintemp: 340 + minTemp: 340 reactants: Bicaridine: amount: 1 @@ -109,7 +109,7 @@ - type: reaction id: Agonolexyne - mintemp: 350 + minTemp: 350 reactants: Bicaridine: amount: 1 @@ -169,7 +169,7 @@ - type: reaction id: Naguuprofen - mintemp: 370 + minTemp: 370 reactants: Isobutylphenylethanol: amount: 1 @@ -187,7 +187,7 @@ - type: reaction id: Cordivol - mintemp: 370 + minTemp: 370 reactants: PropeneOxide: amount: 1 From 4c8cdbf120c2eeb25763a66ce01f2154ab9f0f2f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 04:36:06 +0200 Subject: [PATCH 37/86] fixes (?) --- .../DeltaV/Loadouts/loadout_groups.yml | 93 ++++++++++++------- 1 file changed, 60 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index b9a94f1d7cb..c76d6764ff9 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -71,38 +71,6 @@ - CourierPDA - MailCarrierPDA -# Security -## Brig Medic -- type: loadoutGroup - id: BrigMedicHead - name: loadout-group-brig-medic-head - minLimit: 0 - loadouts: - - CorpsmanBeret - -- type: loadoutGroup - id: BrigMedicNeck - name: loadout-group-brig-medic-neck - minLimit: 0 - loadouts: - - ScarfRed - - ScarfBlue - -- type: loadoutGroup - id: BrigMedicJumpsuit - name: loadout-group-brig-medic-jumpsuit - loadouts: - - BrigMedicJumpsuit - - BrigMedicJumpskirt - -- type: loadoutGroup - id: BrigMedicBack - name: loadout-group-brig-medic-back - loadouts: - - BrigMedicBackpack - - BrigMedicSatchel - - BrigMedicDuffel - # Medical ## Pharmacist - type: loadoutGroup @@ -151,6 +119,65 @@ loadouts: - PharmacistShoes +# Security +## Brig Medic +- type: loadoutGroup + id: BrigMedicHead + name: loadout-group-brig-medic-head + minLimit: 0 + loadouts: + - CorpsmanBeret + +- type: loadoutGroup + id: BrigMedicNeck + name: loadout-group-brig-medic-neck + minLimit: 0 + loadouts: + - ScarfRed + - ScarfBlue + +- type: loadoutGroup + id: BrigMedicJumpsuit + name: loadout-group-brig-medic-jumpsuit + loadouts: + - BrigMedicJumpsuit + - BrigMedicJumpskirt + +- type: loadoutGroup + id: BrigMedicBack + name: loadout-group-brig-medic-back + loadouts: + - BrigMedicBackpack + - BrigMedicSatchel + - BrigMedicDuffel + +- type: loadoutGroup + id: SurvivalCorpsman + name: loadout-group-survival-corpsman + minLimit: 2 + hidden: true + loadouts: + - EmergencyNitrogenCorpsman + - EmergencyOxygenCorpsman + - LoadoutSpeciesVoxNitrogen + +- type: loadoutGroup + id: GroupSpeciesBreathToolCorpsman + name: loadout-group-breath-tool + minLimit: 1 + maxLimit: 1 + hidden: true + loadouts: + - LoadoutSpeciesBreathToolCorpsman + +## Security Cadet +- type: loadoutGroup + id: SecurityCadetHead + name: loadout-group-security-cadet-head + minLimit: 0 + loadouts: + - MimeHead + # Justice ## Chief Justice - type: loadoutGroup @@ -330,4 +357,4 @@ - ScarfBrown - ScarfOrange - ScarfBlack - - ScarfZebra + - ScarfZebra \ No newline at end of file From ab566e9bb2c7b75b037b53c5ce1444a2dabdaa72 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 04:38:35 +0200 Subject: [PATCH 38/86] fixes (?) chap. 2 uncertitudes extended --- .../DeltaV/Loadouts/role_loadouts.yml | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index c89f6322abf..d058004b2a5 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -9,20 +9,9 @@ - CourierPDA - CargoTechnicianBackpack - CourierShoes + - Survival - Trinkets - -# Security -- type: roleLoadout - id: JobBrigmedic - groups: - - BrigMedicHead - - BrigMedicNeck - - BrigMedicJumpsuit - - BrigMedicBack - - SecurityShoes - - SecurityOuterClothing - - MedicalGloves - - Trinkets + - GroupSpeciesBreathTool # Medical - type: roleLoadout @@ -36,6 +25,20 @@ - PharmacistShoes - Trinkets +# Security +- type: roleLoadout + id: JobBrigmedic + groups: + - BrigMedicHead + - BrigMedicNeck + - BrigMedicJumpsuit + - BrigMedicBack + - SecurityShoes + - SecurityOuterClothing + - MedicalGloves + - SurvivalCorpsman + - Trinkets + - GroupSpeciesBreathToolCorpsman # Justice - type: roleLoadout @@ -48,8 +51,10 @@ - CommonBackpack - ChiefJusticeShoes - Glasses + - Survival - Trinkets - + - GroupSpeciesBreathTool + - type: roleLoadout id: JobClerk groups: @@ -59,13 +64,18 @@ - CommonBackpack - ClerkShoes - Glasses + - Survival - Trinkets - + - GroupSpeciesBreathTool + - type: roleLoadout id: JobProsecutor groups: + - GroupTankHarness - ProsecutorJumpsuit - ProsecutorNeck - - LawyerBackpack + - CommonBackpack - Glasses + - Survival - Trinkets + - GroupSpeciesBreathTool \ No newline at end of file From a068a81bd443289fa3bda24100fa1fdb180f7d3b Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 04:48:24 +0200 Subject: [PATCH 39/86] I want to eat myself --- .../{StatusEffects => StatusIcon}/job.yml | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) rename Resources/Prototypes/DeltaV/{StatusEffects => StatusIcon}/job.yml (62%) diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusIcon/job.yml similarity index 62% rename from Resources/Prototypes/DeltaV/StatusEffects/job.yml rename to Resources/Prototypes/DeltaV/StatusIcon/job.yml index b46ba7f90ac..5d53c9bc5b3 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusIcon/job.yml @@ -1,41 +1,55 @@ -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconMedicalBorg icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: MedicalBorg + jobName: job-name-medical-borg -- type: statusIcon +- type: jobIcon + parent: JobIcon + id: JobIconCourier + icon: + sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi + state: nyanoMailCarrier + jobName: job-name-courier + +- type: jobIcon parent: JobIcon id: JobIconChiefJustice icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: ChiefJustice + jobName: job-name-chief-justice -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconClerk icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: Clerk + jobName: job-name-clerk -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconProsecutor icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: Prosecutor + jobName: job-name-prosecutor -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSecurityBorg icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: SecurityBorg + jobName: job-name-security-borg -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconPharmacist icon: sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi state: Pharmacist + jobName: job-name-pharmacist \ No newline at end of file From 642b81fedb57b67774e81679eecd6416cadd3a1d Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:02:48 +0200 Subject: [PATCH 40/86] loadout fixes --- .../DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 12 ++++++------ .../Prototypes/DeltaV/Loadouts/loadout_groups.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index 43ac6101f97..b92ba773e80 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -1,12 +1,12 @@ # Jumpsuit -- type: loadout - id: PharmacistSuit - equipment: PharmacistSuit +- type: loadout + id: PharmacistJumpsuit + equipment: PharmacistJumpsuit -- type: startingGear - id: PharmacistSuit +- type: startingGear + id: PharmacistJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitPharmaShirt + jumpsuit: ClothingUniformJumpsuitPharma # Back - type: loadout diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index c76d6764ff9..c0c76963dad 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -77,7 +77,7 @@ id: PharmacistJumpsuit name: loadout-group-pharmacist-jumpsuit loadouts: - - PharmacistSuit + - PharmacistJumpsuit - type: loadoutGroup id: PharmacistBack From ac02047ac603d7ee8b7ec40c1396c904ea71e53a Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:10:08 +0200 Subject: [PATCH 41/86] Update role_loadouts.yml --- Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index a693e0c6205..7012009c68d 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -80,3 +80,4 @@ - Survival - Trinkets - GroupSpeciesBreathTool + From ef74dfc4be6725dbdca91b4db149368ac5a2f094 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:24:46 +0200 Subject: [PATCH 42/86] trying to fix and not break my house --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 14 ++++++++++---- .../Prototypes/DeltaV/Loadouts/loadout_groups.yml | 3 +++ .../Prototypes/DeltaV/Loadouts/role_loadouts.yml | 1 - 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 5cfde18bf92..926620a5b5a 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -324,7 +324,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitPharmaShirt - name: pharmacist shirt + name: pharmacist formal suit description: There's still some odd stains on this suit. Hm. components: - type: Sprite diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index b92ba773e80..a0df1ec073d 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -1,13 +1,19 @@ # Jumpsuit - type: loadout - id: PharmacistJumpsuit - equipment: PharmacistJumpsuit - -- type: startingGear id: PharmacistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitPharma +- type: loadout + id: PharmacistJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtPharma + +- type: loadout + id: PharmacistJumpsuitFormal + equipment: + jumpsuit: ClothingUniformJumpsuitPharmaShirt + # Back - type: loadout id: PharmacistBackpack diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index c0c76963dad..da5ac44c7f0 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -73,11 +73,14 @@ # Medical ## Pharmacist + - type: loadoutGroup id: PharmacistJumpsuit name: loadout-group-pharmacist-jumpsuit loadouts: - PharmacistJumpsuit + - PharmacistJumpskirt + - PharmacistJumpsuitFormal - type: loadoutGroup id: PharmacistBack diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index 7012009c68d..a693e0c6205 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -80,4 +80,3 @@ - Survival - Trinkets - GroupSpeciesBreathTool - From 79ff8bca72c3e8ca45b06331d9caa19e82b409ad Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:32:51 +0200 Subject: [PATCH 43/86] Update pharmacist.yml --- .../Loadouts/Jobs/Medical/pharmacist.yml | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index a0df1ec073d..d5a787d6713 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -16,31 +16,19 @@ # Back - type: loadout - id: PharmacistBackpack - equipment: PharmacistBackpack - -- type: startingGear id: PharmacistBackpack equipment: - back: ClothingBackpackChemistryFilled + back: ClothingBackpackChemistry - type: loadout - id: PharmacistSatchel - equipment: ChemistSatchel - -- type: startingGear id: PharmacistSatchel equipment: - back: ClothingBackpackSatchelChemistryFilled + back: ClothingBackpackSatchelChemistry - type: loadout - id: PharmacistDuffel - equipment: ChemistDuffel - -- type: startingGear id: PharmacistDuffel equipment: - back: ClothingBackpackDuffelChemistryFilled + back: ClothingBackpackDuffelChemistry # Outer clothing - type: loadout From 15e07fa02c82289ea85ad0735f5b9e29803142a1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:38:57 +0200 Subject: [PATCH 44/86] Update pharmacist.yml --- .../DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index d5a787d6713..220e2965efc 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -35,22 +35,18 @@ id: PharmacistLabCoat equipment: PharmacistLabCoat -- type: startingGear +- type: loadout id: PharmacistLabCoat equipment: outerClothing: ClothingOuterCoatLabPharma -- type: startingGear +- type: loadout id: PharmacistGlasses equipment: glasses: ClothingEyesGlassesChemical # Shoes - type: loadout - id: PharmacistShoes - equipment: PharmacistShoes - -- type: startingGear id: PharmacistShoes equipment: shoes: ClothingShoesEnclosedChem From bd4e6445261d3916800c0f357c4a562feebba707 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:42:35 +0200 Subject: [PATCH 45/86] Update pharmacist.yml --- .../Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index 220e2965efc..d609e693ba3 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -35,11 +35,6 @@ id: PharmacistLabCoat equipment: PharmacistLabCoat -- type: loadout - id: PharmacistLabCoat - equipment: - outerClothing: ClothingOuterCoatLabPharma - - type: loadout id: PharmacistGlasses equipment: From 5ff6c383a2879830c77c206ae18942fa3d795671 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:46:48 +0200 Subject: [PATCH 46/86] Update pharmacist.yml --- .../Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index d609e693ba3..ab2fbec74f0 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -33,7 +33,8 @@ # Outer clothing - type: loadout id: PharmacistLabCoat - equipment: PharmacistLabCoat + equipment: + outerClothing: ClothingOuterCoatLabPharma - type: loadout id: PharmacistGlasses From af6ef354e77ec2c4dbdda4cf9c9826fe40e36d18 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 05:53:00 +0200 Subject: [PATCH 47/86] Update identification_cards.yml --- .../DeltaV/Entities/Objects/Misc/identification_cards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index eaddb5230f8..04f3ac2da22 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -56,7 +56,7 @@ name: pharmacist ID card components: - type: PresetIdCard - jobName: Pharmacist + name: Pharmacist - type: Sprite layers: - state: default From 2cbeb1e3bf17bc32374723bac6c139d3cbf3f54b Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 07:09:33 +0200 Subject: [PATCH 48/86] tried fix --- Resources/Prototypes/DeltaV/Reagents/pharmacy.yml | 2 +- .../DeltaV/Recipes/Reactions/pharmacy.yml | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 6b72e27f311..53da79b2df9 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -1205,4 +1205,4 @@ component: SeeingRainbows type: Add time: 2.2 - refresh: false \ No newline at end of file + refresh: false diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml index 873297fcf71..5277a920317 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmacy.yml @@ -198,7 +198,13 @@ products: Cordivol: 1 -# X-Debivolol(Nebivolol) "β1-selective" β1 antagonist, β3 agonist, considered STRONG for in game standards = dilation of blood vessels, blocks adrenergic receptors in the heart (no more neurotransmission) -# Sodium_dodecyl_sulfate + silicon -# dodecanol + chlorosulfuric acid -# Cordivol (Carvedilol) "α1- + β-selective" α1 antagonist, non-selective: β1 + β2 antagonist = dilation of blood vessels \ No newline at end of file +- type: reaction + id: Debivolol + minTemp: 370 + reactants: + SodiumLauryl: + amount: 1 + Silicon: + amount: 1 + products: + Debivolol: 2 From f42748983a1623f2af5c845d301bdb1e7abb495d Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 17 Aug 2024 07:32:38 +0200 Subject: [PATCH 49/86] Update pharmachemicals.yml --- .../Prototypes/DeltaV/Reagents/pharmachemicals.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index df7022f9639..c0f95aa5bc1 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -291,7 +291,7 @@ physicalDesc: reagent-physical-desc-pungent flavor: bitter color: "#77b58e" - tileReactions: # GHS Hazard Statements: H225: Highly flammable liquid and vapour + tileReactions: # GHS Hazard Statements H225 - !type:FlammableTileReaction temperatureMultiplier: 2.0 reactiveEffects: @@ -303,10 +303,10 @@ metabolisms: Poison: effects: - - !type:HealthChange - damage: - types: - Poison: 0.5 + - !type:HealthChange + damage: + types: + Poison: 0.5 - type: reagent id: HydrogenFluoride From c18e5c235c88248e7554180b56d15872c720d173 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:43:21 +0200 Subject: [PATCH 50/86] Update Resources/Locale/en-US/deltav/job/job-description.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Locale/en-US/deltav/job/job-description.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl index bef6cdeb82b..69d2823ee10 100644 --- a/Resources/Locale/en-US/deltav/job/job-description.ftl +++ b/Resources/Locale/en-US/deltav/job/job-description.ftl @@ -4,4 +4,4 @@ job-description-clerk = Organize trials, notarize documents, review charges, and job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes. job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs. job-description-security-borg = Purpose-built to ensure the right of every crew member to liberty, justice and freedom, ensure the peace aboard the space station by following your laws and patrolling the halls. -job-description-pharmacist = A pharmaceutical engineer, focused on the manufacturing and prescription of pharmaceutical reagents on the station. \ No newline at end of file +job-description-pharmacist = A pharmaceutical engineer, focused on the manufacturing and prescription of pharmaceutical reagents on the station. From 90c2383b1a5e9c8a552019f2c78410ae8086fd30 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:43:54 +0200 Subject: [PATCH 51/86] Update Resources/Locale/en-US/deltav/job/job-names.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Locale/en-US/deltav/job/job-names.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index 99daa30f9fd..0cc4a57d324 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -14,4 +14,4 @@ JobChiefJustice = Chief Justice JobClerk = Clerk JobProsecutor = Prosecutor JobSecurityBorg = Security Cyborg -JobPharmacist = Pharmacist \ No newline at end of file +JobPharmacist = Pharmacist From ce76bf8f7e6b91b4d863b9d43128b97ae375eace Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:44:07 +0200 Subject: [PATCH 52/86] Update Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index 2a471cff4cc..c7d8b6e9657 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -47,4 +47,4 @@ reagent-name-cordivol = Cordivol reagent-desc-cordivol = An α1 antagonist, non-selective β-blocker. Used in severe cases of systolic heart failure. No real issues with mixing other drugs, alcohol is safe. reagent-name-debivolol = X-Debivolol -reagent-desc-debivolol = placeholder script. \ No newline at end of file +reagent-desc-debivolol = placeholder script. From 06578aa61222e0d8395436fc46e96807c3d34306 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:44:18 +0200 Subject: [PATCH 53/86] Update Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl index eee133128d3..15f21614023 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl @@ -1,3 +1,3 @@ reagent-physical-desc-bending = light bending reagent-physical-desc-sharp = sharp -reagent-physical-desc-solidlauryl = white and solid \ No newline at end of file +reagent-physical-desc-solidlauryl = white and solid From fc7667652f654890fbc2d4d76d7d5f023ee301fe Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:45:01 +0200 Subject: [PATCH 54/86] Update Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl b/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl index 4d4b90ebb5c..a41b7c6177c 100644 --- a/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl +++ b/Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl @@ -1 +1 @@ -sodiumamalgam-spark = The sodium melts with the mercury! \ No newline at end of file +sodiumamalgam-spark = The sodium melts with the mercury! From 4af8976dc816e82d0e17b3cae0c3056dfdf0f9dc Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:45:14 +0200 Subject: [PATCH 55/86] Update Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- .../DeltaV/Entities/Structures/Doors/Windoors/windoor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml index 16ec1875a49..865b0985823 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml @@ -170,4 +170,4 @@ components: - type: ContainerFill containers: - board: [ DoorElectronicsPharmacist ] \ No newline at end of file + board: [ DoorElectronicsPharmacist ] From 54f3dff41838ecd878b500c5988e4890ae82e6c7 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:46:11 +0200 Subject: [PATCH 56/86] Update Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- .../DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index f4a64878b63..fdc8d05c574 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -42,7 +42,7 @@ parent: BaseSignDirectional id: SignDirectionalPharmacy name: pharmaceutic lab sign - description: A direction sign, pointing out which way the pharmceutic lab is. + description: A direction sign, pointing out which way the Pharmacy is. components: - type: Sprite sprite: DeltaV/Structures/Wallmounts/signs.rsi From 2d45abfd052cfba16dde873834171efaea0cb165 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:46:36 +0200 Subject: [PATCH 57/86] Update Resources/Prototypes/DeltaV/Guidebook/medical.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Guidebook/medical.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Guidebook/medical.yml b/Resources/Prototypes/DeltaV/Guidebook/medical.yml index edac621be0a..4cd04f53723 100644 --- a/Resources/Prototypes/DeltaV/Guidebook/medical.yml +++ b/Resources/Prototypes/DeltaV/Guidebook/medical.yml @@ -1,4 +1,4 @@ - type: guideEntry id: Pharmacist name: guide-entry-pharmacist - text: "/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml" \ No newline at end of file + text: "/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml" From 5a0e80939a58ccaf7a9a5f6bc724111800b04135 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:46:54 +0200 Subject: [PATCH 58/86] Update Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index d7ed3d7d4a1..acdee040c22 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -130,4 +130,4 @@ reagent-effect-cordivol-debivolol-mix1 = The Cordivol and Debivolol mix wasn't a reagent-effect-cordivol-debivolol-mix2 = You feel like you're about to die... reagent-effect-cordivol-debivolol-mix3 = I need air... Fresh air... reagent-effect-cordivol-debivolol-mix4 = Can't... Chest... -reagent-effect-cordivol-debivolol-mix5 = My... heart... \ No newline at end of file +reagent-effect-cordivol-debivolol-mix5 = My... heart... From 8ebdce71ed1ecd461141ea836916e279ec6a54cb Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:47:23 +0200 Subject: [PATCH 59/86] Update Resources/Prototypes/DeltaV/Access/medical.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Access/medical.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Access/medical.yml b/Resources/Prototypes/DeltaV/Access/medical.yml index 2ede252fddc..ca7bd6fc5b6 100644 --- a/Resources/Prototypes/DeltaV/Access/medical.yml +++ b/Resources/Prototypes/DeltaV/Access/medical.yml @@ -4,4 +4,5 @@ - type: accessLevel id: Pharmacist - name: id-card-access-level-pharmacist \ No newline at end of file + name: id-card-access-level-pharmacist + \ No newline at end of file From 536b8e7b3194db9bd52cc3b40dc2f8d8bb98f706 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:47:39 +0200 Subject: [PATCH 60/86] Update Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 0d9b50c5e6e..e7d8482d62d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -136,4 +136,4 @@ - type: Sprite sprite: DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi \ No newline at end of file + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/pharmacist.rsi From 13c3ce7a052887611ae915bfe418a4166dfefe0a Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:48:14 +0200 Subject: [PATCH 61/86] Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index fa6089532e2..983dbddb192 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -35,7 +35,7 @@ name: pharmacy prescription parent: Paper id: PaperPrecsription - description: 'A piece of paper to justify the reagents you detain on your person. Issued by the pharmacist.' + description: 'A piece of paper to justify the reagents you carry on your person. Issued by the pharmacist.' components: - type: Sprite sprite: Objects/Misc/bureaucracy.rsi From 3261634036460f69adfc0f50ef5c16526a44220a Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:50:08 +0200 Subject: [PATCH 62/86] Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 37aab4b7a88..875901b2591 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -17,6 +17,7 @@ parent: RubberStampBase id: RubberStampPharmacist suffix: DO NOT MAP + noSpawn: true components: - type: Stamp stampedName: stamp-component-stamped-name-pharmacist From 2dad15ed37fabd14376b55c03e5bab54bc11ba69 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 5 Sep 2024 20:05:49 +0200 Subject: [PATCH 63/86] Resolving conflicts --- .../DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml | 4 ++-- Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 0d9b50c5e6e..539059e6a63 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -129,7 +129,7 @@ - type: entity parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtPharma + id: ClothingUniformJumpskirtPharmacist name: pharmacist jumpskirt description: There's still some odd stains on this jumpskirt. Hm. components: diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 926620a5b5a..a8f392fe840 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -323,7 +323,7 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpsuitPharmaShirt + id: ClothingUniformJumpsuitPharmacistShirt name: pharmacist formal suit description: There's still some odd stains on this suit. Hm. components: @@ -334,7 +334,7 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpsuitPharma + id: ClothingUniformJumpsuitPharmacist name: pharmacist jumpsuit description: There's still some odd stains on this jumpsuit. Hm. components: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index fa6089532e2..befa5f576d4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -34,7 +34,7 @@ - type: entity name: pharmacy prescription parent: Paper - id: PaperPrecsription + id: PaperPrescription description: 'A piece of paper to justify the reagents you detain on your person. Issued by the pharmacist.' components: - type: Sprite From 38b1987805e533717b7fc56670d66dae5aa0ffec Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 5 Sep 2024 20:59:42 +0200 Subject: [PATCH 64/86] Update chem_bag_pharmacist.yml --- .../Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml index e11ba1edc0f..4728112bd93 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Chemistry/chem_bag_pharmacist.yml @@ -1,7 +1,7 @@ - type: entity name: pharmacist bag id: ChemBagPharmacist - parent: BaseStorageItem + parent: ChemBag description: A bag for storing pharmacy products, such as pills, pill canisters, bottles, and syringes. components: - type: Sprite From 10a3c92be03dd61709c968efe0b81affcc328e17 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 5 Sep 2024 21:14:33 +0200 Subject: [PATCH 65/86] resolves conflict --- Resources/Locale/en-US/_CD/reagents/physical-desc.ftl | 1 + 1 file changed, 1 insertion(+) create mode 100644 Resources/Locale/en-US/_CD/reagents/physical-desc.ftl diff --git a/Resources/Locale/en-US/_CD/reagents/physical-desc.ftl b/Resources/Locale/en-US/_CD/reagents/physical-desc.ftl new file mode 100644 index 00000000000..a82c93cd609 --- /dev/null +++ b/Resources/Locale/en-US/_CD/reagents/physical-desc.ftl @@ -0,0 +1 @@ +reagent-physical-desc-bending = light bending From c9af0c6d21270aae8d1921b3539c97507d4d6cf1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 5 Sep 2024 21:18:09 +0200 Subject: [PATCH 66/86] AURGH --- Resources/Locale/en-US/_CD/reagents/{ => meta}/physical-desc.ftl | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Locale/en-US/_CD/reagents/{ => meta}/physical-desc.ftl (100%) diff --git a/Resources/Locale/en-US/_CD/reagents/physical-desc.ftl b/Resources/Locale/en-US/_CD/reagents/meta/physical-desc.ftl similarity index 100% rename from Resources/Locale/en-US/_CD/reagents/physical-desc.ftl rename to Resources/Locale/en-US/_CD/reagents/meta/physical-desc.ftl From bf1a728acb9bcd879eb4c036b1cd414758dfdfe3 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 5 Sep 2024 21:31:56 +0200 Subject: [PATCH 67/86] Moving files --- .../Locale/en-US/_CD/reagents/RPmeds.ftl | 89 +++++++++++++++++++ .../en-US/_CD/reagents/meta/medicine.ftl | 29 ++++++ .../deltav/reagents/meta/pharmachemicals.ftl | 2 +- .../en-US/deltav/reagents/meta/pharmacy.ftl | 34 +------ .../deltav/reagents/meta/physical-desc.ftl | 1 - .../DeltaV/Entities/Objects/Misc/paper.yml | 2 +- 6 files changed, 122 insertions(+), 35 deletions(-) create mode 100644 Resources/Locale/en-US/_CD/reagents/RPmeds.ftl create mode 100644 Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl diff --git a/Resources/Locale/en-US/_CD/reagents/RPmeds.ftl b/Resources/Locale/en-US/_CD/reagents/RPmeds.ftl new file mode 100644 index 00000000000..6d64c0c5596 --- /dev/null +++ b/Resources/Locale/en-US/_CD/reagents/RPmeds.ftl @@ -0,0 +1,89 @@ +### Messages to be used with RP-based medication. + +reagent-effect-antidepressant-mild1 = You feel like things aren't so bad. +reagent-effect-antidepressant-mild2 = The world seems a bit brighter. +reagent-effect-antidepressant-mild3 = You feel a bit better about yourself. +reagent-effect-antidepressant-mild4 = You feel slightly motivated. + +reagent-effect-antidepressant-normal1 = You feel pretty alright. +reagent-effect-antidepressant-normal2 = You find it hard to focus. +reagent-effect-antidepressant-normal3 = You feel purposeful. +reagent-effect-antidepressant-normal4 = You feel motivated. + +reagent-effect-antidepressant-normaloverdose1 = You feel irrationally angry. +reagent-effect-antidepressant-normaloverdose2 = Everyone is out to get you! + +reagent-effect-antidepressant-strong1 = You feel a sense of great joy deep down. +reagent-effect-antidepressant-strong2 = You space out for a moment. +reagent-effect-antidepressant-strong3 = You feel good about yourself. +reagent-effect-antidepressant-strong4 = You feel a sense of great purpose. + +reagent-effect-antidepressant-strongoverdose1 = You're gonna die! YOU'RE GONNA DIE! +reagent-effect-antidepressant-strongoverdose2 = Run! RUN! HIDE! +reagent-effect-antidepressant-strongoverdose3 = They're after you. THEY'LL KILL YOU. +reagent-effect-antidepressant-strongoverdose4 = They're all plotting against you. +reagent-effect-antidepressant-strongoverdose5 = Watch your back, BEHIND YOU! +reagent-effect-antidepressant-strongoverdose6 = You won't last the shift. +reagent-effect-antidepressant-strongoverdose7 = Shut up. SHUT UP. SHUT UP! +reagent-effect-antidepressant-strongoverdose8 = Get away. GET AWAY! IT'S GONNA EXPLODE! +reagent-effect-antidepressant-strongoverdose9 = They're all liars. LIARS! + +reagent-effect-antidepressant-fade = The antidepressant effects start to fade... + +reagent-effect-anxietymed-mild1 = You feel a bit calmer. +reagent-effect-anxietymed-mild2 = You feel a little tired. +reagent-effect-anxietymed-mild3 = You feel slightly relaxed. +reagent-effect-anxietymed-mild4 = You feel like it might just be okay. +reagent-effect-anxietymed-mild5 = The road ahead doesn't seem so bad. + +reagent-effect-anxietymed-normal1 = You feel somewhat relaxed +reagent-effect-anxietymed-normal2 = You feel drowsy for a moment. +reagent-effect-anxietymed-normal3 = You feel calm. +reagent-effect-anxietymed-normal4 = You feel more confident. +reagent-effect-anxietymed-normal5 = Your worries seem to drift away. + +reagent-effect-anxietymed-normaloverdose1 = You feel very sleepy. +reagent-effect-anxietymed-normaloverdose2 = You feel like resting your eyes for just a moment. +reagent-effect-anxietymed-normaloverdose3 = You feel like lying down and napping. +reagent-effect-anxietymed-normaloverdose4 = Your eyes feel heavy. +reagent-effect-anxietymed-normaloverdose5 = You lose your train of thought. +reagent-effect-anxietymed-normaloverdose6 = You forget what you were doing. + +reagent-effect-anxietymed-strong1 = You feel free of worry. +reagent-effect-anxietymed-strong2 = Your mind goes numb for a moment. +reagent-effect-anxietymed-strong3 = It seems like everything is just fine. +reagent-effect-anxietymed-strong4 = You feel like it will certainly be okay. +reagent-effect-anxietymed-strong5 = You feel very relaxed. +reagent-effect-anxietymed-strong6 = You feel quite calm. +reagent-effect-anxietymed-strong7 = You feel like you can take on the world! + +reagent-effect-anxietymed-fade = The calming effects start to fade... + +reagent-effect-medaddiction-1 = You're yearning for another high. +reagent-effect-medaddiction-2 = You really need some more drugs. +reagent-effect-medaddiction-3 = You feel empty. Find another fix. +reagent-effect-medaddiction-4 = Go get some drugs, you can quit later. +reagent-effect-medaddiction-5 = You feel desperate for your next high. +reagent-effect-medaddiction-6 = You can feel your hands shaking. +reagent-effect-medaddiction-7 = You could use another hit right now +reagent-effect-medaddiction-8 = One more fix couldn't hurt, right? + +reagent-effect-painkiller-mild1 = Your body hurts a bit less. +reagent-effect-painkiller-mild2 = You feel a little bit dizzy. +reagent-effect-painkiller-mild3 = You feel a tiny bit numb. +reagent-effect-painkiller-mild4 = Any pain you had has faded slightly. + + +reagent-effect-painkiller-normal1 = Any pain you had has faded significantly. +reagent-effect-painkiller-normal2 = You feel dizzy. +reagent-effect-painkiller-normal3 = Your entire body goes numb briefly. +reagent-effect-painkiller-normal4 = You feel your pain fade somewhat. + +reagent-effect-painkiller-strong1 = You forgot what pain feels like. +reagent-effect-painkiller-strong2 = You can't see straight. +reagent-effect-painkiller-strong3 = You feel a sense of deep nostalgia. +reagent-effect-painkiller-strong4 = Your entire body feels numb. +reagent-effect-painkiller-strong5 = You hardly feel anything at all. +reagent-effect-painkiller-strong6 = Any pain you were feeling is gone. + +reagent-effect-painkiller-fade = The painkiller's effects start to fade... \ No newline at end of file diff --git a/Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl b/Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl new file mode 100644 index 00000000000..475bd03338a --- /dev/null +++ b/Resources/Locale/en-US/_CD/reagents/meta/medicine.ftl @@ -0,0 +1,29 @@ +reagent-name-serenitol = Serenitol +reagent-desc-serenitol = A fairly unreactive chemical that has mild antidepressant properties. Originally used to help patients overcome the loss of a pet or family friend, it is fairly safe to administer. + +reagent-name-neurozenium = Neurozenium +reagent-desc-neurozenium = Once considered child-safe shoe polish, Neurozenium was found to be a fairly effective antidepressant in an impressive zero-to-hero story. Do not take it with alcohol in your system. Consult a doctor before combining with other medications. + +reagent-name-blissifylovene = Blissifylovene +reagent-desc-blissifylovene = A military-grade antidepressant with a very low dosage. Very powerful, though it is often considered a last resort due to its interactions with other medications and psychosis-inducing overdoses. Addictive in all but the smallest of doses. + +reagent-name-calmafluxine = Calmafluxine +reagent-desc-calmafluxine = A mild, over-the-counter anxiety medication. Commonly prescribed to children as the body naturally flushes out any excess medication, making overdose functionally impossible. + +reagent-name-tranquinase = Tranquinase +reagent-desc-tranquinase = Run-of-the-mill anxiety medication. Derived from an old recipe for space bear tranquilizer, it causes tranquility and motivation. Causes intense grogginess during overdose. Do not take with alcohol. + +reagent-name-equilibrazine = Equilibrazine +reagent-desc-equilibrazine = A Nanotrasen engineered chemical recipe designed to keep workers working with only small doses. It didn't make the cut, but it functions as a potent treatment for anxiety and panic attacks. Can be taken fine with alcohol, but is wildly incompatible with most antidepressants. + +reagent-name-addictine = addictine +reagent-desc-addictine = A chemical produced by the body when metabolizing certain medications. Causes symptoms of withdrawl. Neutralizes bloodstream cleansers like charcoal and ipecac. + +reagent-name-stubantazine = Stubantazine +reagent-desc-stubantazine = A mild painkiller commonly used to treat brief stents of pain, though it lasts a little while for good measure. Overdose or consumption of alcohol may cause vomiting and digestion inefficiency. + +reagent-name-soretizone = Soretizone +reagent-desc-soretizone = A fairly effective painkiller developed to treat chronic pain. It works for cases that Stubantazine won't solve. Overdoses will knock you right out. High doses may cause addiction. Does not conflict with reasonable amounts of alcohol. + +reagent-name-agonolexyne = Agonolexyne +reagent-desc-agonolexyne = An incredibly potent and fast acting opioid invented to speed up the application of painkillers during surgery. Stops you from feeling pain (or really anything at all). Interacts poorly with alcohol. Known to be very addictive. Overdose may relax the lungs to the point of non-function. \ No newline at end of file diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl index cf1358726e4..f79414361a0 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmachemicals.ftl @@ -86,4 +86,4 @@ reagent-name-dodecanol = dodecanol reagent-desc-dodecanol = Fat alcohol. Was previously made from coconut and whatnots. reagent-name-sodiumlauryl = sodiun lauryl -reagent-desc-sodiumlauryl = A complex reagent used in the synthesis of beta blockers. \ No newline at end of file +reagent-desc-sodiumlauryl = A complex reagent used in the synthesis of beta blockers. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl index c7d8b6e9657..fb1ef662a30 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl @@ -1,33 +1,3 @@ -reagent-name-serenitol = Serenitol -reagent-desc-serenitol = A fairly unreactive chemical that has mild antidepressant properties. Originally used to help patients overcome the loss of a pet or family friend, it is fairly safe to administer. - -reagent-name-neurozenium = Neurozenium -reagent-desc-neurozenium = Once considered child-safe shoe polish, Neurozenium was found to be a fairly effective antidepressant in an impressive zero-to-hero story. Do not take it with alcohol in your system. Consult a doctor before combining with other medications. - -reagent-name-blissifylovene = Blissifylovene -reagent-desc-blissifylovene = A military-grade antidepressant with a very low dosage. Very powerful, though it is often considered a last resort due to its interactions with other medications and psychosis-inducing overdoses. Addictive in all but the smallest of doses. - -reagent-name-calmafluxine = Calmafluxine -reagent-desc-calmafluxine = A mild, over-the-counter anxiety medication. Commonly prescribed to children as the body naturally flushes out any excess medication, making overdose functionally impossible. - -reagent-name-tranquinase = Tranquinase -reagent-desc-tranquinase = Run-of-the-mill anxiety medication. Derived from an old recipe for space bear tranquilizer, it causes tranquility and motivation. Causes intense grogginess during overdose. Do not take with alcohol. - -reagent-name-equilibrazine = Equilibrazine -reagent-desc-equilibrazine = A Nanotrasen engineered chemical recipe designed to keep workers working with only small doses. It didn't make the cut, but it functions as a potent treatment for anxiety and panic attacks. Can be taken fine with alcohol, but is wildly incompatible with most antidepressants. - -reagent-name-addictine = addictine -reagent-desc-addictine = A chemical produced by the body when metabolizing certain medications. Causes symptoms of withdrawl. Neutralizes bloodstream cleansers like charcoal and ipecac. - -reagent-name-stubantazine = Stubantazine -reagent-desc-stubantazine = A mild painkiller commonly used to treat brief stents of pain, though it lasts a little while for good measure. Overdose or consumption of alcohol may cause vomiting and digestion inefficiency. - -reagent-name-soretizone = Soretizone -reagent-desc-soretizone = A fairly effective painkiller developed to treat chronic pain. It works for cases that Stubantazine won't solve. Overdoses will knock you right out. High doses may cause addiction. Does not conflict with reasonable amounts of alcohol. - -reagent-name-agonolexyne = Agonolexyne -reagent-desc-agonolexyne = An incredibly potent and fast acting opioid invented to speed up the application of painkillers during surgery. Stops you from feeling pain (or really anything at all). Interacts poorly with alcohol. Known to be very addictive. Overdose may relax the lungs to the point of non-function. - reagent-name-vicodilicaine = Vicodilicaine reagent-desc-vicodilicaine = Used to treat moderate to severe pain to the head. Most of the time is taken by mouth. Recreational use is common due to its hallucinogen properties. Discouraged to pair with other strong painkillers, antidepressants, and anxiety medication, though totally safe with alcohol. @@ -44,7 +14,7 @@ reagent-name-naguuprofen = Naguuprofen reagent-desc-naguuprofen = Used to treat light to mild headaches, and also hangovers. Not to be paired with Asparatine. reagent-name-cordivol = Cordivol -reagent-desc-cordivol = An α1 antagonist, non-selective β-blocker. Used in severe cases of systolic heart failure. No real issues with mixing other drugs, alcohol is safe. +reagent-desc-cordivol = An α1 antagonist, non-selective β-blocker. Used in severe cases of systolic heart failure. No real issues with mixing other drugs except for X-Debivolol, alcohol is safe. reagent-name-debivolol = X-Debivolol -reagent-desc-debivolol = placeholder script. +reagent-desc-debivolol = A selective β-blocker, block both β1 and β2 receptors. Do not mix with Cordivol, safe to use with alcohol or any other drug. diff --git a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl index 15f21614023..c4cce4294b1 100644 --- a/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl @@ -1,3 +1,2 @@ -reagent-physical-desc-bending = light bending reagent-physical-desc-sharp = sharp reagent-physical-desc-solidlauryl = white and solid diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index befa5f576d4..a0e249fc5c0 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -35,7 +35,7 @@ name: pharmacy prescription parent: Paper id: PaperPrescription - description: 'A piece of paper to justify the reagents you detain on your person. Issued by the pharmacist.' + description: 'A piece of paper to justify the reagents you carry on your person. Issued by the pharmacist.' components: - type: Sprite sprite: Objects/Misc/bureaucracy.rsi From 69c7dd3607721003a7083b06c0811c675637baf1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Thu, 5 Sep 2024 22:05:19 +0200 Subject: [PATCH 68/86] WORKS (should) --- .../en-US/deltav/reagents/pharmacymsg.ftl | 91 ------------------ .../Devices/pda.rsi/pda-pharmacist.png | Bin 960 -> 1013 bytes 2 files changed, 91 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index acdee040c22..5bc2f63c392 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -1,98 +1,7 @@ -### Messages to be used with RP-based medication. - -reagent-effect-antidepressant-mild1 = You feel like things aren't so bad. -reagent-effect-antidepressant-mild2 = The world seems a bit brighter. -reagent-effect-antidepressant-mild3 = You feel a bit better about yourself. -reagent-effect-antidepressant-mild4 = You feel slightly motivated. - -reagent-effect-antidepressant-normal1 = You feel pretty alright. -reagent-effect-antidepressant-normal2 = You find it hard to focus. -reagent-effect-antidepressant-normal3 = You feel purposeful. -reagent-effect-antidepressant-normal4 = You feel motivated. - -reagent-effect-antidepressant-normaloverdose1 = You feel irrationally angry. -reagent-effect-antidepressant-normaloverdose2 = Everyone is out to get you! - -reagent-effect-antidepressant-strong1 = You feel a sense of great joy deep down. -reagent-effect-antidepressant-strong2 = You space out for a moment. -reagent-effect-antidepressant-strong3 = You feel good about yourself. -reagent-effect-antidepressant-strong4 = You feel a sense of great purpose. - -reagent-effect-antidepressant-strongoverdose1 = You're gonna die! YOU'RE GONNA DIE! -reagent-effect-antidepressant-strongoverdose2 = Run! RUN! HIDE! -reagent-effect-antidepressant-strongoverdose3 = They're after you. THEY'LL KILL YOU. -reagent-effect-antidepressant-strongoverdose4 = They're all plotting against you. -reagent-effect-antidepressant-strongoverdose5 = Watch your back, BEHIND YOU! -reagent-effect-antidepressant-strongoverdose6 = You won't last the shift. -reagent-effect-antidepressant-strongoverdose7 = Shut up. SHUT UP. SHUT UP! -reagent-effect-antidepressant-strongoverdose8 = Get away. GET AWAY! IT'S GONNA EXPLODE! -reagent-effect-antidepressant-strongoverdose9 = They're all liars. LIARS! - -reagent-effect-antidepressant-fade = The antidepressant effects start to fade... - - -reagent-effect-anxietymed-mild1 = You feel a bit calmer. -reagent-effect-anxietymed-mild2 = You feel a little tired. -reagent-effect-anxietymed-mild3 = You feel slightly relaxed. -reagent-effect-anxietymed-mild4 = You feel like it might just be okay. -reagent-effect-anxietymed-mild5 = The road ahead doesn't seem so bad. - -reagent-effect-anxietymed-normal1 = You feel somewhat relaxed -reagent-effect-anxietymed-normal2 = You feel drowsy for a moment. -reagent-effect-anxietymed-normal3 = You feel calm. -reagent-effect-anxietymed-normal4 = You feel more confident. -reagent-effect-anxietymed-normal5 = Your worries seem to drift away. - -reagent-effect-anxietymed-normaloverdose1 = You feel very sleepy. -reagent-effect-anxietymed-normaloverdose2 = You feel like resting your eyes for just a moment. -reagent-effect-anxietymed-normaloverdose3 = You feel like lying down and napping. -reagent-effect-anxietymed-normaloverdose4 = Your eyes feel heavy. -reagent-effect-anxietymed-normaloverdose5 = You lose your train of thought. -reagent-effect-anxietymed-normaloverdose6 = You forget what you were doing. - -reagent-effect-anxietymed-strong1 = You feel free of worry. -reagent-effect-anxietymed-strong2 = Your mind goes numb for a moment. -reagent-effect-anxietymed-strong3 = It seems like everything is just fine. -reagent-effect-anxietymed-strong4 = You feel like it will certainly be okay. -reagent-effect-anxietymed-strong5 = You feel very relaxed. -reagent-effect-anxietymed-strong6 = You feel quite calm. -reagent-effect-anxietymed-strong7 = You feel like you can take on the world! - -reagent-effect-anxietymed-fade = The calming effects start to fade... - - -reagent-effect-medaddiction-1 = You're yearning for another high. -reagent-effect-medaddiction-2 = You really need some more drugs. -reagent-effect-medaddiction-3 = You feel empty. Find another fix. -reagent-effect-medaddiction-4 = Go get some drugs, you can quit later. -reagent-effect-medaddiction-5 = You feel desperate for your next high. -reagent-effect-medaddiction-6 = You can feel your hands shaking. -reagent-effect-medaddiction-7 = You could use another hit right now -reagent-effect-medaddiction-8 = One more fix couldn't hurt, right? - reagent-effect-painkiller-light1 = You feel a tiny bit better. reagent-effect-painkiller-light2 = The pain is manageable. For now. reagent-effect-painkiller-light3 = It will be okay, the pain is slowly fading. -reagent-effect-painkiller-normal1 = Any pain you had has faded significantly. -reagent-effect-painkiller-normal2 = You feel dizzy. -reagent-effect-painkiller-normal3 = Your entire body goes numb briefly. -reagent-effect-painkiller-normal4 = You feel your pain fade somewhat. - -reagent-effect-painkiller-mild1 = Your body hurts a bit less. -reagent-effect-painkiller-mild2 = You feel a little bit dizzy. -reagent-effect-painkiller-mild3 = You feel a tiny bit numb. -reagent-effect-painkiller-mild4 = Any pain you had has faded slightly. - -reagent-effect-painkiller-strong1 = You forgot what pain feels like. -reagent-effect-painkiller-strong2 = You can't see straight. -reagent-effect-painkiller-strong3 = You feel a sense of deep nostalgia. -reagent-effect-painkiller-strong4 = Your entire body feels numb. -reagent-effect-painkiller-strong5 = You hardly feel anything at all. -reagent-effect-painkiller-strong6 = Any pain you were feeling is gone. - -reagent-effect-painkiller-fade = The painkiller's effects start to fade... - reagent-effect-painkiller-head-mild1 = Your head aches less. reagent-effect-painkiller-head-mild2 = You don't feel woozy anymore. diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-pharmacist.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-pharmacist.png index 9adf6f367e7e6b00bca78fd690a210122e91f50a..1b2828ad8d1b9d27ad2f63dd17b1eb6ff8001641 100644 GIT binary patch delta 977 zcmV;?11|i)2lWS#GJm^E!%!5)e{C(k>7av%LkAUy3ZfvoNd>!9hqi*RC5>q-G%+MC zBCdjqgWw>#_!|5VbQN3`1VIr*9G!hFBJtd|&?5DQoAcwl_dA??0e?KNn{LAdm{!3_ z#G>K3`Gs)fE6oJyU>v`uyY_T)D#gF+>mHw~cY~_e|M%*y)_-Ng)xp;!JgVDHL0G0C zzE-dmZwq(oIc-_^NI2rifWp^GPnY>cakk7Kik(zq68x%XI9tQ%8rE};DLf$DYvzl3 zWghhm zkeU(QkSEW&%76WDo^EDjxZJ%h3c+X3d+&qBUHIAYyzgVr`#FKY6I@zV|ElCP_9^;K zRqH*3&?cN;RkidUTx>ztqpdkwNeamJXEN}12JQ3EaSJVr<*X{_oIXHmLw?Z>>>ohC z+z&1N0vRD_6?5SPU;qFB32;bRa{vGf5&!@T5&_cPet-M`00J#ZL_t(o3GJ6pO9DX@ zz@KFhikZQJP)I_8;YA{&W1k?pc8U)A0lIbxqGKI9tf#(#-#|~%p@UsSc7sGZL`F+3 zSOj7-v&`b|zS&WCJ=KHRd4Fc!`|a%C0r;1{z5)@y1yEIW$m7Lgk*l8m_H2jwZjZBe zZ1ehw>3^$-DpV>JVI5(B7cZB~c2c2oZlyWe-LQw;+&wbAnpRmaf{5BP5QP>`rBW=C z&*!1v?}KTY%r*>z^_fhD__AQxZ(!Lbq>N=2*R%tu)oM(~4s)0j^R?S;h{a-%NF-R8 zgLS)I<`daiu2CNfFeHLq^JyWlTpR)gXti2A?tkegh43VBIZ%K?p&-0D>HJ9`T=hIA z3g8)qIL3uQraD|x1JEpCKm-C92f}f>h!Ge-27%OcxIzK&gK$(sjL-n4g$NY@gFsH& z;gSOISFB@}#Be_ye#4~z^xYo>!ml`uNdep+8(G59I9&;uNCD{C2Z0C-KoiUoLb?K@ z-+%vEtb`Q6{Sy*4gcQL2NQHelqyY3Dm?gwm0JDS;{uMWyO(>O0plKSd?<>8_0*Noc z#rBFl?)3hh>58KG{uK)WcqW>F%1I;wYouQy?US@;(yoTqzD0@mpwR({CX?{}F@VM7 zJiPXLu(uA-Xf()3vG@X1t5wM5a%}c~y-M!LvPCRAc?aO(1z7PPbHK(?n~I*+Ek$q? z-UECmqw6}*7LUh;jThs^X>WWHKx=pAyEXd-!lvewV}E%d00000NkvXXu0mjf>Dbef delta 924 zcmV;N17rO42fzoAGJn5I0$~`(KWb8x;ZQ?F#0?e=22l`=VUUY8s6keXo~H(C$DI<< z8niSB4N*(KhW>+EgVur|D1wN_=6)?9*Yl>JguTam&xh~(ejlFu9=IcUyVHZbwhpci;Yr=JO2RS? zk@b?Pct^Nb&n45sN5Vl%1{A(ldaA}RinBHTP;AAcGvHP|wQLionpn?S1>q6lKp|h& z>+`5D@fpR1nACpR1K30f6G9_JnN{+X7?oO-%v$@#etq+-iAR^W$p)4P>{x!*I>QnSe zLkk>&e+$m98d_=(F1DfX(M(#&U&$leoyox48FVM0=N3AbYgyILIemcmru?EC*gt?_ zx$j^30Von^9F@-KoB#j-32;bRa{vGf5&!@T5&_cPet-M`00H<(L_t(o31eUw1*0J_ z8UjRyfQ6aaePCq)ihAdNQ9aHO-YF2CjzaM0o7<0fslP-hnYpH;4}shk>8>?}M4J zD1(XPqlpRukO6#xycp)7i#a@afT4zv0MQ}v>3{ua1{j7Jiq1do=m?V{nx<+9z@h+@ zXo&?xhX5NZD+3I}3`gg~q5za5LW5Ia%J9-ehXBkJP{M-&5iubcli~flcMPB?0ObOj zga9bJfdDAs@e1(36XmnVui%b=MFG`A094R`@;WX6k_Q1;6p#`EL`4C}N1%d6X?HHe z%zpqmuw{;mA2ED(Xauv-37Goq++1`i3_d{zfQnTMOG^gdM~@gdF6J`u$*_S9iBx7_ z_>q{1VIWN4*|TRbCSDq^13<+ns8ZQdS;-&;3ISkre|qu@Y~WcS`yNmX9l$JxRz&F1 y7<{}n6;w4P4H06@$8glBz-S1JhQP=Q0Tlr47^OO_ Date: Fri, 6 Sep 2024 21:06:10 +0200 Subject: [PATCH 69/86] fixing yaml (?) --- .../Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml | 4 ++-- .../Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml index a61665e0c53..52e9a1bf14c 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml @@ -5,8 +5,8 @@ components: - type: StorageFill contents: - - id: ClothingUniformJumpsuitPharmaShirt - - id: ClothingOuterCoatLabPharma + - id: ClothingUniformJumpsuitPharmacistShirt + - id: ClothingOuterCoatLabPharmacist - id: PharmacistIDCard - id: RubberStampPharmacist - id: BoxSyringe diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml index ab2fbec74f0..ceddfa5a1dd 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Medical/pharmacist.yml @@ -2,17 +2,17 @@ - type: loadout id: PharmacistJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitPharma + jumpsuit: ClothingUniformJumpsuitPharmacist - type: loadout id: PharmacistJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtPharma + jumpsuit: ClothingUniformJumpskirtPharmacist - type: loadout id: PharmacistJumpsuitFormal equipment: - jumpsuit: ClothingUniformJumpsuitPharmaShirt + jumpsuit: ClothingUniformJumpsuitPharmacistShirt # Back - type: loadout From 065b2856a5de4aecb277130143376bd7e20f7e39 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 6 Sep 2024 21:16:16 +0200 Subject: [PATCH 70/86] Update pharmacist.yml --- .../Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml index 52e9a1bf14c..b0e66f7f3d7 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/pharmacist.yml @@ -6,7 +6,7 @@ - type: StorageFill contents: - id: ClothingUniformJumpsuitPharmacistShirt - - id: ClothingOuterCoatLabPharmacist + - id: ClothingOuterCoatLabPharma - id: PharmacistIDCard - id: RubberStampPharmacist - id: BoxSyringe From ec396530307ca5a827f06e20a31671cbd05edec4 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 6 Sep 2024 21:32:03 +0200 Subject: [PATCH 71/86] Update Pharmacist.xml --- Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml index 9cf53c09b09..9f89f9c218a 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml @@ -10,7 +10,7 @@ The Pharmacist is a social role, where social interactions are needed if you wis - + From 854742de64637dab903c51c56a257a047b66cfa1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 6 Sep 2024 21:34:58 +0200 Subject: [PATCH 72/86] Update pharmachemicals.yml --- Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index c0f95aa5bc1..d157d173c25 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -291,7 +291,7 @@ physicalDesc: reagent-physical-desc-pungent flavor: bitter color: "#77b58e" - tileReactions: # GHS Hazard Statements H225 + tileReactions: # GHS Hazard Statements H225 - !type:FlammableTileReaction temperatureMultiplier: 2.0 reactiveEffects: From 9d0e5bb49e9e156385ac1f26421e1e8fc20bf3b1 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 6 Sep 2024 21:49:20 +0200 Subject: [PATCH 73/86] Update pharmachemicals.yml --- .../DeltaV/Reagents/pharmachemicals.yml | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index d157d173c25..23787d9b693 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -284,29 +284,7 @@ - !type:FlammableReaction multiplier: 0.8 -- type: reagent - id: Toluene - name: reagent-name-toluene - desc: reagent-desc-toluene - physicalDesc: reagent-physical-desc-pungent - flavor: bitter - color: "#77b58e" - tileReactions: # GHS Hazard Statements H225 - - !type:FlammableTileReaction - temperatureMultiplier: 2.0 - reactiveEffects: - Flammable: - methods: [ Touch ] - effects: - - !type:FlammableReaction - multiplier: 0.8 - metabolisms: - Poison: - effects: - - !type:HealthChange - damage: - types: - Poison: 0.5 +# Toluene - type: reagent id: HydrogenFluoride From 9c86f14d4bfd386dc2f9581161435b0d8eb1aba9 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 6 Sep 2024 21:54:03 +0200 Subject: [PATCH 74/86] Update pharmachemicals.yml --- .../DeltaV/Reagents/pharmachemicals.yml | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index 23787d9b693..d157d173c25 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -284,7 +284,29 @@ - !type:FlammableReaction multiplier: 0.8 -# Toluene +- type: reagent + id: Toluene + name: reagent-name-toluene + desc: reagent-desc-toluene + physicalDesc: reagent-physical-desc-pungent + flavor: bitter + color: "#77b58e" + tileReactions: # GHS Hazard Statements H225 + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.8 + metabolisms: + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.5 - type: reagent id: HydrogenFluoride From 7cdc266efabdbe1f93cdb66f8398d3b8d1fd5192 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 13:06:09 +0200 Subject: [PATCH 75/86] Update pharmachemicals.yml --- Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index d157d173c25..c198ece3934 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -291,15 +291,6 @@ physicalDesc: reagent-physical-desc-pungent flavor: bitter color: "#77b58e" - tileReactions: # GHS Hazard Statements H225 - - !type:FlammableTileReaction - temperatureMultiplier: 2.0 - reactiveEffects: - Flammable: - methods: [ Touch ] - effects: - - !type:FlammableReaction - multiplier: 0.8 metabolisms: Poison: effects: From cf7c3daef9d428c82679c17615337fd2c5df402d Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 13:22:46 +0200 Subject: [PATCH 76/86] Update pharmachemicals.yml --- Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index c198ece3934..d157d173c25 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -291,6 +291,15 @@ physicalDesc: reagent-physical-desc-pungent flavor: bitter color: "#77b58e" + tileReactions: # GHS Hazard Statements H225 + - !type:FlammableTileReaction + temperatureMultiplier: 2.0 + reactiveEffects: + Flammable: + methods: [ Touch ] + effects: + - !type:FlammableReaction + multiplier: 0.8 metabolisms: Poison: effects: From 4486d656b8826cd786843816b2154572fb9cf8d4 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 13:40:51 +0200 Subject: [PATCH 77/86] Update pharmachemicals.yml --- Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml index d157d173c25..4fa0492d9ed 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml @@ -291,7 +291,7 @@ physicalDesc: reagent-physical-desc-pungent flavor: bitter color: "#77b58e" - tileReactions: # GHS Hazard Statements H225 + tileReactions: - !type:FlammableTileReaction temperatureMultiplier: 2.0 reactiveEffects: From 795967f01320abf7f726bd650c636aae01956a3c Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 14:29:53 +0200 Subject: [PATCH 78/86] Update pharmachemicals.yml --- .../Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index be358eeb7ed..f20e56a0d30 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -43,6 +43,7 @@ - type: reaction id: BenzenesulfonicAcid + minTemp: 370 reactants: Benzene: amount: 1 From 7c89c645cbbc2d58ead83befb47cc876c0379ba5 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 14:47:18 +0200 Subject: [PATCH 79/86] Update pharmachemicals.yml --- .../Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index f20e56a0d30..d165fb73771 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -54,7 +54,7 @@ - type: reaction id: SodiumPhenolate - minTemp: 370 + minTemp: 430 reactants: BenzenesulfonicAcid: amount: 1 From 8f09807e2984ed0bdeba0e896ba448f82a198f49 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 14:59:42 +0200 Subject: [PATCH 80/86] Update pharmachemicals.yml --- .../Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index d165fb73771..e423ca0b2da 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -112,6 +112,7 @@ - type: reaction id: HydrochloricAcid + minTemp: 370 reactants: Water: amount: 1 From 474ea3bb2bca50e9cae88fb91b25e0a809f660ff Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 15:19:38 +0200 Subject: [PATCH 81/86] Update pharmachemicals.yml --- .../Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml index e423ca0b2da..ff7a2fcf5ec 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/pharmachemicals.yml @@ -317,6 +317,7 @@ - type: reaction id: SulfurTrioxide + minTemp: 370 reactants: Sulfur: amount: 1 From 0e22c86afaff592eaec2f40b00bcb2dfe76c608f Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Sat, 7 Sep 2024 17:45:29 +0200 Subject: [PATCH 82/86] updates prescription paper --- .../DeltaV/Entities/Objects/Misc/paper.yml | 2 +- .../Paper/paper_heading_pharmacy.svg | 1346 ----------------- .../paper_heading_pharmacy.svg.200dpi.png | Bin 37648 -> 0 bytes .../Paper/paper_heading_prescription.svg | 10 + .../paper_heading_prescription.svg.200dpi.png | Bin 0 -> 4939 bytes ...r_heading_prescription.svg.200dpi.png.yml} | 0 6 files changed, 11 insertions(+), 1347 deletions(-) delete mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg delete mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_prescription.svg create mode 100644 Resources/Textures/DeltaV/Interface/Paper/paper_heading_prescription.svg.200dpi.png rename Resources/Textures/DeltaV/Interface/Paper/{paper_heading_pharmacy.svg.200dpi.png.yml => paper_heading_prescription.svg.200dpi.png.yml} (100%) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml index a0e249fc5c0..1c7b822add4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml @@ -50,7 +50,7 @@ map: ["enum.PaperVisualLayers.Stamp"] visible: false - type: PaperVisuals - headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_minipharmacy.svg.200dpi.png" + headerImagePath: "/Textures/DeltaV/Interface/Paper/paper_heading_prescription.svg.200dpi.png" headerMargin: 0.0, 0.0, 10.0, 16.0 backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png" backgroundModulate: "#ead9cc" diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg deleted file mode 100644 index 35870b6e4a5..00000000000 --- a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg +++ /dev/null @@ -1,1346 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_pharmacy.svg.200dpi.png deleted file mode 100644 index e33cf183835800d22ba39d01724560b1913fae0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 37648 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 + + + + + + + + + \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Interface/Paper/paper_heading_prescription.svg.200dpi.png b/Resources/Textures/DeltaV/Interface/Paper/paper_heading_prescription.svg.200dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..1f002e03ebb86e12af4f74970ae8a114e93f84c1 GIT binary patch literal 4939 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 nU+3Y!nF0TAclZdZE8r-w{3vSrW8k$(L-Fvwp Date: Fri, 22 Nov 2024 09:58:57 +0100 Subject: [PATCH 83/86] Trying to fix conflicts --- .../en-US/deltav/paper/stamp-component.ftl | 2 +- .../deltav/prototypes/access/accesses.ftl | 1 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 76 +- .../Devices/Electronics/door_access.yml | 8 + .../DeltaV/Entities/Objects/Devices/pda.yml | 75 +- .../Entities/Objects/Misc/rubber_stamp.yml | 46 +- .../Structures/Doors/Airlocks/access.yml | 100 ++- .../Structures/Wallmounts/Signs/signs.yml | 10 + .../Prototypes/DeltaV/Reagents/pharmacy.yml | 759 ------------------ .../Prototypes/_CD/Reagents/medicine.yml | 646 +++++++++++++++ .../DeltaV/Markers/jobs.rsi/meta.json | 3 + .../DeltaV/Objects/Misc/stamps.rsi/meta.json | 2 +- .../Structures/Wallmounts/signs.rsi/meta.json | 7 + .../Objects/Misc/bureaucracy.rsi/meta.json | 19 +- 14 files changed, 901 insertions(+), 853 deletions(-) create mode 100644 Resources/Prototypes/_CD/Reagents/medicine.yml diff --git a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl index 959cb2c493b..a4c05971209 100644 --- a/Resources/Locale/en-US/deltav/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/deltav/paper/stamp-component.ftl @@ -1,4 +1,4 @@ stamp-component-stamped-name-notary = NOTARY stamp-component-stamped-name-chiefjustice = Chief Justice -stamp-component-stamped-name-psychologist = Psychologist +stamp-component-stamped-name-prosec = Prosecutor stamp-component-stamped-name-pharmacist = Pharmacist diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl index 8b09dc4d69b..e69f03f8d47 100644 --- a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl @@ -5,4 +5,5 @@ id-card-access-level-prosecutor = Prosecutor id-card-access-level-clerk = Clerk id-card-access-level-justice = Justice id-card-access-level-corpsman = Corpsman +id-card-access-level-robotics = Robotics id-card-access-level-pharmacist = Pharmacist \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 38ef7eb42ca..90648699d20 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -8,7 +8,7 @@ sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi - + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoPFormal @@ -209,6 +209,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformalsuit.rsi +# Corpsman alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitBrigmedicTurtle + name: corpsman's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the dedication to reach the position of Corpsman. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic_alt.rsi + # Detective uniform - type: entity @@ -222,7 +235,18 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi -# Detective uniform +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitDetTurtle + name: detective's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Detective. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective_alt.rsi + +# Senior Officer uniform - type: entity parent: ClothingUniformFoldableBase @@ -259,6 +283,30 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_grey.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitWardenTurtle + name: warden's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the patience to reach the position of Warden. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/armourer_alt.rsi + +# HoS alt uniforms + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpsuitHoSTurtle + name: head of security's turtleneck + description: A comfortable and tight-fitting turtleneck for those with the tenacity to reach the position of Head of Security. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_alt.rsi + # Central Command Uniform - ported from Velta - type: entity @@ -349,6 +397,30 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformBlackTurtleneck + name: black turtleneck + description: A simple black turtleneck. Perfect for any wannabe spy. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/black_turtleneck.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/black_turtleneck.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCybersunAttorney + name: cybersun attorney suit + description: This durable Suit Jacket and Turtleneck Combo doubles as an Accounting suit, and includes an extra button. Take that, Nerd-otrasen! + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpsuit/cybersunattorney.rsi + +# Pharmacist suits + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitPharmacistShirt diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml index 927a7308b7e..040e0851763 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml @@ -126,6 +126,14 @@ - type: AccessReader access: [["Clerk"]] +- type: entity + parent: DoorElectronics + id: DoorElectronicsRobotics + suffix: Robotics, Locked + components: + - type: AccessReader + access: [["Research"]] # Uses research access until the job is added + - type: entity parent: DoorElectronics id: DoorElectronicsPharmacist diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index ffb0863ad78..db7eb524933 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -78,6 +78,27 @@ - type: entity parent: BasePDA + id: BaseJusticePDA + abstract: true + components: + - type: Pda + penSlot: + startingItem: LuxuryPen + priority: -1 + whitelist: + tags: + - Write + - type: CartridgeLoader + diskSpace: 7 + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - SecWatchCartridge + +- type: entity + parent: BaseJusticePDA id: ChiefJusticePDA name: chief justice PDA description: Whosoever bears this PDA is the law. @@ -97,26 +118,14 @@ - type: Pda id: ChiefJusticeIDCard state: pda-chiefjustice - penSlot: - startingItem: LuxuryPen - priority: -1 - whitelist: - tags: - - Write - type: PdaBorderColor borderColor: "#470823" - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi state: pda-chiefjustice - - type: CartridgeLoader - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - type: entity - parent: BasePDA + parent: BaseJusticePDA id: ClerkPDA name: clerk PDA description: It has the stamp to prove it's been officially notarized! @@ -136,26 +145,14 @@ - type: Pda id: ClerkIDCard state: pda-clerk - penSlot: - startingItem: LuxuryPen - priority: -1 - whitelist: - tags: - - Write - type: PdaBorderColor borderColor: "#611528" - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi state: pda-clerk - - type: CartridgeLoader - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - + - type: entity - parent: BasePDA + parent: BaseJusticePDA id: ProsecutorPDA name: prosecutor PDA description: Sharp. Looks like it could prosecute you all on its own. @@ -175,23 +172,11 @@ - type: Pda id: ProsecutorIDCard state: pda-prosecutor - penSlot: - startingItem: LuxuryPen - priority: -1 - whitelist: - tags: - - Write - type: PdaBorderColor borderColor: "#6f6192" - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi state: pda-prosecutor - - type: CartridgeLoader # DeltaV - Crime Assist - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - type: entity parent: SyndiPDA @@ -244,15 +229,13 @@ # Passenger +# event visitors get externals emergency access, not a good thing for powergaming tiders - type: entity - parent: PassengerPDA - id: VisitorPDA - name: visitor PDA - description: If you hold onto this, it can be a fun souvenier when you get to... wherever you're going! + parent: VisitorPDA + id: VisitorPDALoadout components: - type: Pda - id: VisitorIDCard - state: pda-visitor # - aPDA Sprite Rework + id: VisitorIDCardLoadout - type: entity parent: PassengerPDA @@ -496,4 +479,4 @@ components: - type: Pda id: FoolIDCard - state: pda-fool # - aPDA Sprite Rework + state: pda-fool # - aPDA Sprite Rework \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index 875901b2591..c97b5b3d90b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -1,16 +1,19 @@ - type: entity - name: psychologist's rubber stamp + name: notary stamp parent: RubberStampBase - id: RubberStampPsychologist + id: RubberStampNotary suffix: DO NOT MAP + description: An old-fashioned seal for marking important documents, made of polished bronze. components: - type: Stamp - stampedName: stamp-component-stamped-name-psychologist - stampedColor: "#00ccff" - stampState: "paper_stamp-psychologist" + stampedName: stamp-component-stamped-name-notary + stampedColor: "#a81f3d" + stampState: "paper_stamp-notary" - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-psychologist + state: stamp-notary + - type: StealTarget + stealGroup: RubberStampNotary - type: entity name: pharmacist's rubber stamp @@ -26,35 +29,32 @@ - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi state: stamp-pharmacist - + - type: entity - name: notary stamp + name: chief justice stamp parent: RubberStampBase - id: RubberStampNotary + id: RubberStampChiefJustice suffix: DO NOT MAP - description: An old-fashioned seal for marking important documents, made of polished bronze. components: - type: Stamp - stampedName: stamp-component-stamped-name-notary - stampedColor: "#a81f3d" + stampedName: stamp-component-stamped-name-chiefjustice + stampedColor: "#6b2833" stampState: "paper_stamp-notary" - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-notary - - type: StealTarget - stealGroup: RubberStampNotary - + state: stamp-cj + - type: entity - name: chief justice stamp + name: prosecutor's rubber stamp parent: RubberStampBase - id: RubberStampChiefJustice + id: RubberStampProsec suffix: DO NOT MAP + description: A rubber stamp for stamping important documents. A more legal way to annoy Security. components: - type: Stamp - stampedName: stamp-component-stamped-name-chiefjustice - stampedColor: "#6b2833" - stampState: "paper_stamp-notary" + stampedName: stamp-component-stamped-name-prosec + stampedColor: "#562D3D" + stampState: "paper_stamp-prosec" - type: Sprite sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-cj - + state: stamp-prosec diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index a3b8c94e6da..f72fbefa079 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -154,6 +154,15 @@ - type: GridFill path: /Maps/Shuttles/DeltaV/sub_escape_pod.yml +- type: entity + parent: AirlockRobotics + id: AirlockRoboticsLocked + suffix: Robotics, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsRobotics ] + #Add airlocks from upstream roles - type: entity parent: AirlockServiceLocked @@ -239,22 +248,22 @@ board: [ DoorElectronicsPsychologist ] - type: entity - parent: AirlockMedical - id: AirlockPharmacistLocked - suffix: Pharmacist, Locked + parent: AirlockFreezer + id: AirlockFreezerServiceLocked + suffix: Service, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsPharmacist ] + board: [ DoorElectronicsService ] - type: entity - parent: AirlockFreezer - id: AirlockFreezerServiceLocked - suffix: Service, Locked + parent: AirlockMedical + id: AirlockPharmacistLocked + suffix: Pharmacist, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsService ] + board: [ DoorElectronicsPharmacist ] # Glass Airlocks - type: entity @@ -369,6 +378,15 @@ containers: board: [ DoorElectronicsPsychologist ] +- type: entity + parent: AirlockRoboticsGlass + id: AirlockRoboticsGlassLocked + suffix: Robotics, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsRobotics ] + - type: entity parent: AirlockMedicalGlass id: AirlockPharmacistGlassLocked @@ -481,19 +499,69 @@ board: [ DoorElectronicsPsychologist ] - type: entity - parent: AirlockMaintMedLocked - id: AirlockMaintPharmacistLocked - suffix: Pharmacist, Locked + parent: AirlockMaintSecLocked + id: AirlockMaintSecurityLawyerLocked + suffix: Security/Lawyer, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsPharmacist ] + board: [ DoorElectronicsSecurityLawyer ] - type: entity - parent: AirlockMaintSecLocked - id: AirlockMaintSecurityLawyerLocked - suffix: Security/Lawyer, Locked + parent: AirlockMaintRnDLocked + id: AirlockMaintRoboticsLocked + suffix: Robotics, Locked components: - type: ContainerFill containers: - board: [ DoorElectronicsSecurityLawyer ] + board: [ DoorElectronicsRobotics ] + +# Command-locked External airlocks. These don't exist upstream for some reason. +- type: entity + parent: AirlockExternal + id: AirlockExternalCommandLocked + suffix: External, Command, Locked + components: + - type: WiresPanelSecurity + securityLevel: medSecurity + - type: ContainerFill + containers: + board: [ DoorElectronicsCommand ] + +- type: entity + parent: AirlockExternalGlass + id: AirlockExternalGlassCommandLocked + suffix: External, Glass, Command, Locked + components: + - type: WiresPanelSecurity + securityLevel: medSecurity + - type: ContainerFill + containers: + board: [ DoorElectronicsCommand ] + +- type: entity + parent: AirlockExternal + id: AirlockExternalSecurityLocked + suffix: External, Security, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsSecurity ] + +- type: entity + parent: AirlockExternalGlass + id: AirlockExternalGlassSecurityLocked + suffix: External, Glass, Security, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsSecurity ] + +- type: entity + parent: AirlockMaintMedLocked + id: AirlockMaintPharmacistLocked + suffix: Pharmacist, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsPharmacist ] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml index fdc8d05c574..02c075bcaab 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml @@ -38,6 +38,16 @@ sprite: DeltaV/Structures/Wallmounts/signs.rsi state: direction_court +- type: entity + parent: BaseSignDirectional + id: SignDirectionaAI + name: AI sign + description: A direction sign, pointing out which way the AI core is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_aicore + - type: entity parent: BaseSignDirectional id: SignDirectionalPharmacy diff --git a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml index 53da79b2df9..490d6ceea06 100644 --- a/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml +++ b/Resources/Prototypes/DeltaV/Reagents/pharmacy.yml @@ -1,762 +1,3 @@ -- type: reagent - id: Serenitol - name: reagent-name-serenitol - group: Pharmacy - desc: reagent-desc-serenitol - physicalDesc: reagent-physical-desc-tart - flavor: medicine - color: "#ebbce9" - metabolisms: - Medicine: - metabolismRate : 0.03 - effects: - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-antidepressant-mild1" - - "reagent-effect-antidepressant-mild2" - - "reagent-effect-antidepressant-mild3" - - "reagent-effect-antidepressant-mild4" - probability: 0.035 - - !type:ChemVomit - probability: 0.1 - conditions: - - !type:ReagentThreshold # fairly safe overdose, safe to take with alcohol - min: 22.5 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 22.5 - damage: - types: - Poison: 0.01 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.4 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Neurozenium - name: reagent-name-neurozenium - group: Pharmacy - desc: reagent-desc-neurozenium - physicalDesc: reagent-physical-desc-crystalline - flavor: metallic - color: "#382f6b" - metabolisms: - Medicine: - metabolismRate : 0.02 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-antidepressant-normal1" - - "reagent-effect-antidepressant-normal2" - - "reagent-effect-antidepressant-normal3" - - "reagent-effect-antidepressant-normal4" - probability: 0.045 - conditions: - - !type:ReagentThreshold - max: 15.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 15.1 - damage: - types: - Poison: 0.02 - - !type:PopupMessage - type: Local - visualType: MediumCaution - messages: - - "reagent-effect-antidepressant-normaloverdose1" # overdose makes you angry - - "reagent-effect-antidepressant-normaloverdose2" - probability: 0.15 - conditions: - - !type:ReagentThreshold - min: 15.1 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Neurozenium - amount: 0.15 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Serenitol # Purges Serenitol if dosage is too high. - min: 10 - reagent: Serenitol - amount: -7.5 - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.4 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Blissifylovene - name: reagent-name-blissifylovene - group: Pharmacy - desc: reagent-desc-blissifylovene - physicalDesc: reagent-physical-desc-bending - flavor: bitter - color: "#f2ff00" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-antidepressant-strong1" - - "reagent-effect-antidepressant-strong2" - - "reagent-effect-antidepressant-strong3" - - "reagent-effect-antidepressant-strong4" - probability: 0.055 - conditions: - - !type:ReagentThreshold - max: 5.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 5.1 - damage: - types: - Poison: 0.02 # minor poison from OD - - !type:PopupMessage - type: Local - visualType: LargeCaution - messages: - - "reagent-effect-antidepressant-strongoverdose1" # overdose makes you psychotic - - "reagent-effect-antidepressant-strongoverdose2" - - "reagent-effect-antidepressant-strongoverdose3" - - "reagent-effect-antidepressant-strongoverdose4" - - "reagent-effect-antidepressant-strongoverdose5" - - "reagent-effect-antidepressant-strongoverdose6" - - "reagent-effect-antidepressant-strongoverdose7" - - "reagent-effect-antidepressant-strongoverdose8" - - "reagent-effect-antidepressant-strongoverdose9" - probability: 0.15 - conditions: - - !type:ReagentThreshold - min: 5.1 - - !type:Emote - emote: Scream # makes you screna sometimes - showInChat: true - probability: 0.05 - conditions: - - !type:ReagentThreshold - min: 5.1 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - min: 5.1 - key: SeeingRainbows # hallucinations set in after 40 seconds, meaning ~0.40u overdose untreated. - component: SeeingRainbows - type: Add - time: 1.1 - refresh: false - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Blissifylovene - amount: 0.15 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Serenitol # Purges Serenitol if dosage is too high. - min: 10 - reagent: Serenitol - amount: -7.5 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Neurozenium # Purges Neurozenium if dosage is too high - min: 10 - reagent: Neurozenium - amount: -7.5 - - !type:AdjustReagent - probability: 0.5 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 10 # maximum addiction severity for this reagent - - !type:ReagentThreshold - reagent: Blissifylovene - min: 1.5 - reagent: Addictine - amount: 0.1 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - reagent: Neurozenium # Conflicts with any remaining Neurozenium - min: 0.1 - damage: - types: - Poison: 0.5 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: Tranquinase # conflicts with many other meds - min: 2.0 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.4 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: Soretizone # conflicts with many other meds - min: 3.0 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.3 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: Agonolexyne # conflicts with many other meds - min: 0.25 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.3 - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.2 - conditions: - - !type:ReagentThreshold - max: 0.1 - - -- type: reagent - id: Calmafluxine - name: reagent-name-calmafluxine - group: Pharmacy - desc: reagent-desc-calmafluxine - physicalDesc: reagent-physical-desc-syrupy - flavor: bitter - color: "#634e3a" - metabolisms: - Medicine: - metabolismRate : 0.03 - effects: - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-anxietymed-mild1" - - "reagent-effect-anxietymed-mild2" - - "reagent-effect-anxietymed-mild3" - - "reagent-effect-anxietymed-mild4" - - "reagent-effect-anxietymed-mild5" - probability: 0.035 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - min: 30 - reagent: Calmafluxine - amount: -1.2 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.35 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Tranquinase - name: reagent-name-tranquinase - group: Pharmacy - desc: reagent-desc-tranquinase - physicalDesc: reagent-physical-desc-odorless - flavor: sweet - color: "#2e3b52" - metabolisms: - Medicine: - metabolismRate : 0.02 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-anxietymed-normal1" - - "reagent-effect-anxietymed-normal2" - - "reagent-effect-anxietymed-normal3" - - "reagent-effect-anxietymed-normal4" - - "reagent-effect-anxietymed-normal5" - probability: 0.04 - conditions: - - !type:ReagentThreshold - max: 16.5 - - !type:PopupMessage - type: Local - visualType: LargeCaution - messages: - - "reagent-effect-anxietymed-normaloverdose1" # overdose makes you tired and forgetful - - "reagent-effect-anxietymed-normaloverdose2" - - "reagent-effect-anxietymed-normaloverdose3" - - "reagent-effect-anxietymed-normaloverdose4" - - "reagent-effect-anxietymed-normaloverdose5" - - "reagent-effect-anxietymed-normaloverdose6" - probability: 0.06 - conditions: - - !type:ReagentThreshold - min: 16.5 - - !type:Emote - conditions: - - !type:ReagentThreshold - min: 16.5 - emote: Yawn - showInChat: true - probability: 0.02 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Tranquinase - amount: 0.1 - - !type:MovespeedModifier - walkSpeedModifier: 0.8 - sprintSpeedModifier: 0.8 - conditions: - - !type:ReagentThreshold - min: 16.5 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - min: 20.0 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - probability: 0.1 - - !type:HealthChange # poisons you if you take way too much - conditions: - - !type:ReagentThreshold - min: 30 - damage: - types: - Poison: 1 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.32 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Equilibrazine - name: reagent-name-equilibrazine - group: Pharmacy - desc: reagent-desc-equilibrazine - physicalDesc: reagent-physical-desc-translucent - flavor: metallic - color: "#291816" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-anxietymed-strong1" - - "reagent-effect-anxietymed-strong2" - - "reagent-effect-anxietymed-strong3" - - "reagent-effect-anxietymed-strong4" - - "reagent-effect-anxietymed-strong5" - - "reagent-effect-anxietymed-strong6" - - "reagent-effect-anxietymed-strong7" - probability: 0.04 - conditions: - - !type:ReagentThreshold - max: 6.7 - - !type:HealthChange # poisons you on OD - conditions: - - !type:ReagentThreshold - min: 6.7 - damage: - types: - Poison: 0.07 - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - min: 6.7 - reagent: Histamine # causes allergy-like reaction on OD - amount: 0.25 - - !type:MovespeedModifier - walkSpeedModifier: 0.55 - sprintSpeedModifier: 0.55 - conditions: - - !type:ReagentThreshold - reagent: Serenitol # wildly incompatable with antidepressants - min: 5 - - !type:Paralyze - conditions: - - !type:ReagentThreshold - reagent: Neurozenium # wildly incompatable with antidepressants - min: 5 - - !type:Paralyze - conditions: - - !type:ReagentThreshold - reagent: Blissifylovene # wildly incompatable with antidepressants - min: 3 - - !type:AdjustReagent - reagent: Neurozenium # purges Neurozenium so paralysis isn't too long - amount: -0.5 - - !type:AdjustReagent - reagent: Blissifylovene # purges Blissifylovene so paralysis isn't too long - amount: -0.2 - - !type:AdjustReagent - reagent: Tranquinase # purges Tranquinase - amount: -1.5 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. - probability: 0.2 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Addictine - name: reagent-name-addictine - group: Toxins - desc: reagent-desc-addictine - flavor: savory - color: "#d9d9d9" - physicalDesc: reagent-physical-desc-refreshing - metabolisms: - Poison: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: LargeCaution - messages: - - "reagent-effect-medaddiction-1" - - "reagent-effect-medaddiction-2" - - "reagent-effect-medaddiction-3" - - "reagent-effect-medaddiction-4" - - "reagent-effect-medaddiction-5" - - "reagent-effect-medaddiction-6" - - "reagent-effect-medaddiction-7" - - "reagent-effect-medaddiction-8" - probability: 0.08 - conditions: - - !type:ReagentThreshold # the following three chemicals are addictive, and thus will counteract cravings. - reagent: Blissifylovene - max: 0.01 - - !type:ReagentThreshold - reagent: Soretizone - max: 0.01 - - !type:ReagentThreshold - reagent: Agonolexyne - max: 0.01 - - !type:ReagentThreshold # Delta-V - Following four are also addictive - reagent: SpaceDrugs - max: 0.01 - - !type:ReagentThreshold - reagent: THC - max: 0.01 - - !type:ReagentThreshold - reagent: Impedrezene - max: 0.01 - - !type:ReagentThreshold - reagent: Desoxyephedrine - max: 0.01 - - !type:AdjustReagent - reagent: Charcoal # purges bloodstream cleaners - amount: -10.0 - - !type:AdjustReagent - reagent: Ipecac # purges bloodstream cleaners - amount: -10.0 - - !type:MovespeedModifier - walkSpeedModifier: 0.9 # Delta-V : Changes walk-speed modifier from 0.95 to 0.9 - sprintSpeedModifier: 0.7 - conditions: - - !type:ReagentThreshold - max: 1.0 # it gets worse before the addiction ends. - - !type:ReagentThreshold # the following three chemicals are addictive, and thus will counteract cravings. - reagent: Blissifylovene - max: 0.01 - - !type:ReagentThreshold - reagent: Soretizone - max: 0.01 - - !type:ReagentThreshold - reagent: Agonolexyne - max: 0.01 - - !type:ReagentThreshold # Delta-V - Following four are also addictive - reagent: SpaceDrugs - max: 0.01 - - !type:ReagentThreshold - reagent: THC - max: 0.01 - - !type:ReagentThreshold - reagent: Impedrezene - max: 0.01 - - !type:ReagentThreshold - reagent: Desoxyephedrine - max: 0.01 - - !type:GenericStatusEffect # Delta-V - Makes you stutter - key: Stutter - component: StutteringAccent - conditions: - - !type:ReagentThreshold - reagent: Blissifylovene - max: 0.01 - - !type:ReagentThreshold - reagent: Soretizone - max: 0.01 - - !type:ReagentThreshold - reagent: Agonolexyne - max: 0.01 - - !type:ReagentThreshold - reagent: SpaceDrugs - max: 0.01 - - !type:ReagentThreshold - reagent: THC - max: 0.01 - - !type:ReagentThreshold - reagent: Impedrezene - max: 0.01 - - !type:ReagentThreshold - reagent: Desoxyephedrine - max: 0.01 - -- type: reagent - id: Stubantazine - name: reagent-name-stubantazine - group: Pharmacy - desc: reagent-desc-stubantazine - physicalDesc: reagent-physical-desc-sour - flavor: sour - color: "#6bb3b5" - metabolisms: - Medicine: - metabolismRate : 0.02 - effects: - - !type:PopupMessage - type: Local - visualType: Medium - messages: - - "reagent-effect-painkiller-mild1" - - "reagent-effect-painkiller-mild2" - - "reagent-effect-painkiller-mild3" - - "reagent-effect-painkiller-mild4" - probability: 0.08 - - !type:ChemVomit - probability: 0.4 - conditions: - - !type:ReagentThreshold # makes you vomit if you OD - min: 14 - - !type:SatiateHunger # causes digestion inefficiency during overdose - factor: -1.2 - conditions: - - !type:ReagentThreshold - min: 14 - - !type:ChemVomit - probability: 0.8 - conditions: - - !type:ReagentThreshold # alcohol causes vomiting - reagent: Ethanol - min: 2 - - !type:SatiateHunger # causes digestion inefficiency if you drink alcohol - factor: -2.0 - conditions: - - !type:ReagentThreshold - reagent: Ethanol - min: 2 - - !type:PopupMessage - type: Local - visualType: Small - messages: - - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out - probability: 0.35 - conditions: - - !type:ReagentThreshold - max: 0.2 - -- type: reagent - id: Soretizone - name: reagent-name-soretizone - group: Pharmacy - desc: reagent-desc-soretizone - physicalDesc: reagent-physical-desc-thick - flavor: tingly - color: "#2e2c2c" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-painkiller-normal1" - - "reagent-effect-painkiller-normal2" - - "reagent-effect-painkiller-normal3" - - "reagent-effect-painkiller-normal4" - probability: 0.085 - - !type:GenericStatusEffect - probability: 0.1 - conditions: - - !type:ReagentThreshold - min: 14.5 # overdose knocks you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:GenericStatusEffect - probability: 0.08 - conditions: - - !type:ReagentThreshold - reagent: Stubantazine - min: 5 # taking with other painkillers will knock you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # lots of alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 20 - reagent: Soretizone - amount: 0.03 - - !type:AdjustReagent - probability: 0.55 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 5 # maximum addiction severity for this reagent - - !type:ReagentThreshold - min: 9 - reagent: Addictine # add - amount: 0.1 - - !type:PopupMessage - type: Local - visualType: Medium # stronger painkiller = more noticable fading - messages: - - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out - probability: 0.4 - conditions: - - !type:ReagentThreshold - max: 0.1 - -- type: reagent - id: Agonolexyne - name: reagent-name-agonolexyne - group: Pharmacy - desc: reagent-desc-agonolexyne - physicalDesc: reagent-physical-desc-overpowering - flavor: nothing - color: "#ffc7c7" - metabolisms: - Medicine: - metabolismRate : 0.01 - effects: - - !type:PopupMessage - type: Local - visualType: Large - messages: - - "reagent-effect-painkiller-strong1" - - "reagent-effect-painkiller-strong2" - - "reagent-effect-painkiller-strong3" - - "reagent-effect-painkiller-strong4" - - "reagent-effect-painkiller-strong5" - - "reagent-effect-painkiller-strong6" - probability: 0.1 - - !type:GenericStatusEffect - probability: 0.1 - conditions: - - !type:ReagentThreshold - reagent: Stubantazine - min: 4 # taking with other painkillers will knock you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:GenericStatusEffect - probability: 0.15 - conditions: - - !type:ReagentThreshold - reagent: Soretizone - min: 2 # taking with other painkillers will knock you out - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add - - !type:AdjustReagent - conditions: - - !type:ReagentThreshold - reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. - min: 1 - reagent: Agonolexyne - amount: 0.04 - - !type:AdjustReagent - probability: 0.8 # Chance of Addiction rising per tick - conditions: - - !type:ReagentThreshold - reagent: Addictine - max: 25 # maximum addiction severity for this reagent - - !type:ReagentThreshold - min: 0.25 - reagent: Addictine - amount: 0.2 - - !type:Drunk # OD causes drunkeness - conditions: - - !type:ReagentThreshold - min: 5 - - !type:HealthChange - conditions: - - !type:ReagentThreshold - min: 5.5 - damage: - types: - Asphyxiation: 1 # your lungs relax so much you can't breathe, suffocating you on OD - - !type:PopupMessage - type: Local - visualType: Large # stronger painkiller = more noticable fading - messages: - - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out - probability: 0.5 - conditions: - - !type:ReagentThreshold - max: 0.1 - - type: reagent id: Vicodilicaine name: reagent-name-vicodilicaine diff --git a/Resources/Prototypes/_CD/Reagents/medicine.yml b/Resources/Prototypes/_CD/Reagents/medicine.yml new file mode 100644 index 00000000000..a99aafb7057 --- /dev/null +++ b/Resources/Prototypes/_CD/Reagents/medicine.yml @@ -0,0 +1,646 @@ +- type: reagent + id: Serenitol + name: reagent-name-serenitol + group: Medicine + desc: reagent-desc-serenitol + physicalDesc: reagent-physical-desc-tart + flavor: medicine + color: "#ebbce9" + metabolisms: + Medicine: + metabolismRate : 0.03 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-antidepressant-mild1" + - "reagent-effect-antidepressant-mild2" + - "reagent-effect-antidepressant-mild3" + - "reagent-effect-antidepressant-mild4" + probability: 0.035 + - !type:ChemVomit + probability: 0.1 + conditions: + - !type:ReagentThreshold # fairly safe overdose, safe to take with alcohol + min: 22.5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 22.5 + damage: + types: + Poison: 0.01 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Neurozenium + name: reagent-name-neurozenium + group: Medicine + desc: reagent-desc-neurozenium + physicalDesc: reagent-physical-desc-crystalline + flavor: metallic + color: "#382f6b" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-antidepressant-normal1" + - "reagent-effect-antidepressant-normal2" + - "reagent-effect-antidepressant-normal3" + - "reagent-effect-antidepressant-normal4" + probability: 0.045 + conditions: + - !type:ReagentThreshold + max: 15.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 15.1 + damage: + types: + Poison: 0.02 + - !type:PopupMessage + type: Local + visualType: MediumCaution + messages: + - "reagent-effect-antidepressant-normaloverdose1" # overdose makes you angry + - "reagent-effect-antidepressant-normaloverdose2" + probability: 0.15 + conditions: + - !type:ReagentThreshold + min: 15.1 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Neurozenium + amount: 0.15 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Serenitol # Purges Serenitol if dosage is too high. + min: 10 + reagent: Serenitol + amount: -7.5 + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Blissifylovene + name: reagent-name-blissifylovene + group: Medicine + desc: reagent-desc-blissifylovene + physicalDesc: reagent-physical-desc-bending + flavor: bitter + color: "#f2ff00" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:SuppressAddiction + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-antidepressant-strong1" + - "reagent-effect-antidepressant-strong2" + - "reagent-effect-antidepressant-strong3" + - "reagent-effect-antidepressant-strong4" + probability: 0.055 + conditions: + - !type:ReagentThreshold + max: 5.1 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 5.1 + damage: + types: + Poison: 0.02 # minor poison from OD + - !type:PopupMessage + type: Local + visualType: LargeCaution + messages: + - "reagent-effect-antidepressant-strongoverdose1" # overdose makes you psychotic + - "reagent-effect-antidepressant-strongoverdose2" + - "reagent-effect-antidepressant-strongoverdose3" + - "reagent-effect-antidepressant-strongoverdose4" + - "reagent-effect-antidepressant-strongoverdose5" + - "reagent-effect-antidepressant-strongoverdose6" + - "reagent-effect-antidepressant-strongoverdose7" + - "reagent-effect-antidepressant-strongoverdose8" + - "reagent-effect-antidepressant-strongoverdose9" + probability: 0.15 + conditions: + - !type:ReagentThreshold + min: 5.1 + - !type:Emote + emote: Scream # makes you screna sometimes + showInChat: true + probability: 0.05 + conditions: + - !type:ReagentThreshold + min: 5.1 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 5.1 + key: SeeingRainbows # hallucinations set in after 40 seconds, meaning ~0.40u overdose untreated. + component: SeeingRainbows + type: Add + time: 1.1 + refresh: false + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Blissifylovene + amount: 0.15 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Serenitol # Purges Serenitol if dosage is too high. + min: 10 + reagent: Serenitol + amount: -7.5 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Neurozenium # Purges Neurozenium if dosage is too high + min: 10 + reagent: Neurozenium + amount: -7.5 + - !type:Addicted + probability: 0.5 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + reagent: Blissifylovene + min: 1.5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + reagent: Neurozenium # Conflicts with any remaining Neurozenium + min: 0.1 + damage: + types: + Poison: 0.5 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Tranquinase # conflicts with many other meds + min: 2.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.4 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Soretizone # conflicts with many other meds + min: 3.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.3 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Agonolexyne # conflicts with many other meds + min: 0.25 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.3 + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-antidepressant-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.2 + conditions: + - !type:ReagentThreshold + max: 0.1 + + +- type: reagent + id: Calmafluxine + name: reagent-name-calmafluxine + group: Medicine + desc: reagent-desc-calmafluxine + physicalDesc: reagent-physical-desc-syrupy + flavor: bitter + color: "#634e3a" + metabolisms: + Medicine: + metabolismRate : 0.03 + effects: + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-anxietymed-mild1" + - "reagent-effect-anxietymed-mild2" + - "reagent-effect-anxietymed-mild3" + - "reagent-effect-anxietymed-mild4" + - "reagent-effect-anxietymed-mild5" + probability: 0.035 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + min: 30 + reagent: Calmafluxine + amount: -1.2 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.35 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Tranquinase + name: reagent-name-tranquinase + group: Medicine + desc: reagent-desc-tranquinase + physicalDesc: reagent-physical-desc-odorless + flavor: sweet + color: "#2e3b52" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-anxietymed-normal1" + - "reagent-effect-anxietymed-normal2" + - "reagent-effect-anxietymed-normal3" + - "reagent-effect-anxietymed-normal4" + - "reagent-effect-anxietymed-normal5" + probability: 0.04 + conditions: + - !type:ReagentThreshold + max: 16.5 + - !type:PopupMessage + type: Local + visualType: LargeCaution + messages: + - "reagent-effect-anxietymed-normaloverdose1" # overdose makes you tired and forgetful + - "reagent-effect-anxietymed-normaloverdose2" + - "reagent-effect-anxietymed-normaloverdose3" + - "reagent-effect-anxietymed-normaloverdose4" + - "reagent-effect-anxietymed-normaloverdose5" + - "reagent-effect-anxietymed-normaloverdose6" + probability: 0.06 + conditions: + - !type:ReagentThreshold + min: 16.5 + - !type:Emote + conditions: + - !type:ReagentThreshold + min: 16.5 + emote: Yawn + showInChat: true + probability: 0.02 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Tranquinase + amount: 0.1 + - !type:MovespeedModifier + walkSpeedModifier: 0.8 + sprintSpeedModifier: 0.8 + conditions: + - !type:ReagentThreshold + min: 16.5 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + min: 20.0 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + probability: 0.1 + - !type:HealthChange # poisons you if you take way too much + conditions: + - !type:ReagentThreshold + min: 30 + damage: + types: + Poison: 1 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.32 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Equilibrazine + name: reagent-name-equilibrazine + group: Medicine + desc: reagent-desc-equilibrazine + physicalDesc: reagent-physical-desc-translucent + flavor: metallic + color: "#291816" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-anxietymed-strong1" + - "reagent-effect-anxietymed-strong2" + - "reagent-effect-anxietymed-strong3" + - "reagent-effect-anxietymed-strong4" + - "reagent-effect-anxietymed-strong5" + - "reagent-effect-anxietymed-strong6" + - "reagent-effect-anxietymed-strong7" + probability: 0.04 + conditions: + - !type:ReagentThreshold + max: 6.7 + - !type:HealthChange # poisons you on OD + conditions: + - !type:ReagentThreshold + min: 6.7 + damage: + types: + Poison: 0.07 + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + min: 6.7 + reagent: Histamine # causes allergy-like reaction on OD + amount: 0.25 + - !type:MovespeedModifier + walkSpeedModifier: 0.55 + sprintSpeedModifier: 0.55 + conditions: + - !type:ReagentThreshold + reagent: Serenitol # wildly incompatable with antidepressants + min: 5 + - !type:Paralyze + conditions: + - !type:ReagentThreshold + reagent: Neurozenium # wildly incompatable with antidepressants + min: 5 + - !type:Paralyze + conditions: + - !type:ReagentThreshold + reagent: Blissifylovene # wildly incompatable with antidepressants + min: 3 + - !type:AdjustReagent + reagent: Neurozenium # purges Neurozenium so paralysis isn't too long + amount: -0.5 + - !type:AdjustReagent + reagent: Blissifylovene # purges Blissifylovene so paralysis isn't too long + amount: -0.2 + - !type:AdjustReagent + reagent: Tranquinase # purges Tranquinase + amount: -1.5 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-anxietymed-fade" # A decent chance to notify the player when their meds run out, but could happen silently. + probability: 0.2 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Stubantazine + name: reagent-name-stubantazine + group: Medicine + desc: reagent-desc-stubantazine + physicalDesc: reagent-physical-desc-sour + flavor: sour + color: "#6bb3b5" + metabolisms: + Medicine: + metabolismRate : 0.02 + effects: + - !type:SuppressPain + suppressionLevel: Mild + - !type:PopupMessage + type: Local + visualType: Medium + messages: + - "reagent-effect-painkiller-mild1" + - "reagent-effect-painkiller-mild2" + - "reagent-effect-painkiller-mild3" + - "reagent-effect-painkiller-mild4" + probability: 0.08 + - !type:ChemVomit + probability: 0.4 + conditions: + - !type:ReagentThreshold # makes you vomit if you OD + min: 14 + - !type:SatiateHunger # causes digestion inefficiency during overdose + factor: -1.2 + conditions: + - !type:ReagentThreshold + min: 14 + - !type:ChemVomit + probability: 0.8 + conditions: + - !type:ReagentThreshold # alcohol causes vomiting + reagent: Ethanol + min: 2 + - !type:SatiateHunger # causes digestion inefficiency if you drink alcohol + factor: -2.0 + conditions: + - !type:ReagentThreshold + reagent: Ethanol + min: 2 + - !type:PopupMessage + type: Local + visualType: Small + messages: + - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out + probability: 0.35 + conditions: + - !type:ReagentThreshold + max: 0.2 + +- type: reagent + id: Soretizone + name: reagent-name-soretizone + group: Medicine + desc: reagent-desc-soretizone + physicalDesc: reagent-physical-desc-thick + flavor: tingly + color: "#2e2c2c" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:SuppressPain + suppressionLevel: Normal + - !type:SuppressAddiction + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-normal1" + - "reagent-effect-painkiller-normal2" + - "reagent-effect-painkiller-normal3" + - "reagent-effect-painkiller-normal4" + probability: 0.085 + - !type:GenericStatusEffect + probability: 0.1 + conditions: + - !type:ReagentThreshold + min: 14.5 # overdose knocks you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:GenericStatusEffect + probability: 0.08 + conditions: + - !type:ReagentThreshold + reagent: Stubantazine + min: 5 # taking with other painkillers will knock you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # lots of alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 20 + reagent: Soretizone + amount: 0.03 + - !type:Addicted + probability: 0.7 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + min: 9 + - !type:PopupMessage + type: Local + visualType: Medium # stronger painkiller = more noticable fading + messages: + - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out + probability: 0.4 + conditions: + - !type:ReagentThreshold + max: 0.1 + +- type: reagent + id: Agonolexyne + name: reagent-name-agonolexyne + group: Medicine + desc: reagent-desc-agonolexyne + physicalDesc: reagent-physical-desc-overpowering + flavor: nothing + color: "#ffc7c7" + metabolisms: + Medicine: + metabolismRate : 0.01 + effects: + - !type:SuppressPain + suppressionLevel: Strong + - !type:SuppressAddiction + - !type:PopupMessage + type: Local + visualType: Large + messages: + - "reagent-effect-painkiller-strong1" + - "reagent-effect-painkiller-strong2" + - "reagent-effect-painkiller-strong3" + - "reagent-effect-painkiller-strong4" + - "reagent-effect-painkiller-strong5" + - "reagent-effect-painkiller-strong6" + probability: 0.1 + - !type:GenericStatusEffect + probability: 0.1 + conditions: + - !type:ReagentThreshold + reagent: Stubantazine + min: 4 # taking with other painkillers will knock you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:GenericStatusEffect + probability: 0.15 + conditions: + - !type:ReagentThreshold + reagent: Soretizone + min: 2 # taking with other painkillers will knock you out + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add + - !type:AdjustReagent + conditions: + - !type:ReagentThreshold + reagent: Ethanol # Alcohol makes it really easy to overdose by increasing your body's absorption of the medicine. + min: 1 + reagent: Agonolexyne + amount: 0.04 + - !type:Addicted + probability: 0.8 # Chance of Addiction rising per tick + conditions: + - !type:ReagentThreshold + min: 0.25 + - !type:Drunk # OD causes drunkeness + conditions: + - !type:ReagentThreshold + min: 5 + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 5.5 + damage: + types: + Asphyxiation: 1 # your lungs relax so much you can't breathe, suffocating you on OD + - !type:PopupMessage + type: Local + visualType: Large # stronger painkiller = more noticable fading + messages: + - "reagent-effect-painkiller-fade" # A decent chance to notify the player when their meds run out + probability: 0.5 + conditions: + - !type:ReagentThreshold + max: 0.1 diff --git a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json index 9d567d088dc..20693f2bc3a 100644 --- a/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Markers/jobs.rsi/meta.json @@ -46,6 +46,9 @@ { "name": "mobster" }, + { + "name": "roboticist" + }, { "name": "pharmacist" } diff --git a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json index 4795cbd7df4..22e793e7d75 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/stamps.rsi/meta.json @@ -14,7 +14,7 @@ "name": "stamp-notary" }, { - "name": "stamp-psychologist" + "name": "stamp-prosec" }, { "name": "stamp-pharmacist" diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json index 81d07824ca1..d3a71385c5a 100644 --- a/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi/meta.json @@ -23,6 +23,13 @@ "name": "direction_justice", "directions": 4 }, + { + "name": "direction_aicore", + "directions": 4 + }, + { + "name": "chapel" + }, { "name": "direction_pharmacy", "directions": 4 diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 9d318e20ed4..e655d4cedf6 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. psychologist paper stamp resprited by Guess-My-Name. paper_stamp-signature by Mnemotechnician.", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. paper_stamp-greytide by ubaser. paper_stamp-psychologist by clinux. syndicate_card by Aserovich | paper_stamp-signature by Mnemotechnician. paper_stamp-prosec is a recoloured version of paper_stamp-lawyer", "size": { "x": 32, "y": 32 @@ -229,16 +229,25 @@ "name": "paper_stamp-mantis" }, { - "name": "paper_stamp-pharmacist" + "name": "paper_stamp-notary" }, { - "name": "paper_stamp-psychologist" + "name": "paper_stamp-signature" }, { - "name": "paper_stamp-notary" + "name": "paper_stamp-greytide" }, { - "name": "paper_stamp-signature" + "name": "syndicate_card" + }, + { + "name": "paper_stamp-pharmacist" + }, + { + "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-prosec" } ] } From 1ee393d5e6adbe6b4f5943722c7164e326fbbbed Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 22 Nov 2024 10:18:46 +0100 Subject: [PATCH 84/86] Update rubber_stamp.yml --- .../Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml index c97b5b3d90b..e8b0d7815e9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml @@ -20,7 +20,6 @@ parent: RubberStampBase id: RubberStampPharmacist suffix: DO NOT MAP - noSpawn: true components: - type: Stamp stampedName: stamp-component-stamped-name-pharmacist From 583778002f8bb3232b86e8d4511018fb19e04040 Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 22 Nov 2024 11:05:14 +0100 Subject: [PATCH 85/86] Resolving conversations --- Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl | 4 ++-- .../Prototypes/DeltaV/Entities/Objects/Devices/pda.yml | 6 +----- Resources/Prototypes/Roles/Jobs/departments.yml | 2 +- .../ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl index 5bc2f63c392..9206ed43cf2 100644 --- a/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl +++ b/Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl @@ -17,7 +17,7 @@ reagent-effect-asparatine-overdose = Your tummy aches. reagent-effect-asparatine-overdose2 = It feels like you're getting stabbed in the guts. reagent-effect-asparatine-overdose3 = It is digging inside you. -reagent-effect-asparatine-naguuprofen-mix1 = The Asparatine and Naguuprofen weren't a good idea... +reagent-effect-asparatine-naguuprofen-mix1 = Your stomach cramps you! reagent-effect-betablocker1 = You feel light-headed. reagent-effect-betablocker2 = You stop shaking so much. @@ -35,7 +35,7 @@ reagent-effect-betablocker-overdose1 = Your heart beats too fast! reagent-effect-betablocker-overdose2 = You feel like you're about to pass out! reagent-effect-betablocker-overdose3 = You can't breathe properly! -reagent-effect-cordivol-debivolol-mix1 = The Cordivol and Debivolol mix wasn't a good idea... +reagent-effect-cordivol-debivolol-mix1 = Your chest aches... reagent-effect-cordivol-debivolol-mix2 = You feel like you're about to die... reagent-effect-cordivol-debivolol-mix3 = I need air... Fresh air... reagent-effect-cordivol-debivolol-mix4 = Can't... Chest... diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index db7eb524933..97d5a21008b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -42,7 +42,7 @@ parent: BasePDA id: PharmacistPDA name: pharmacist PDA - description: Blue, Orange, and odd stains... Has a built-in health analyzer. + description: Blue, Orange, and odd stains... Oddly smells like those bottles under the sink. components: - type: Sprite sprite: DeltaV/Objects/Devices/pda.rsi @@ -71,10 +71,6 @@ - type: Icon sprite: DeltaV/Objects/Devices/pda.rsi state: pda-pharmacist - - type: HealthAnalyzer - scanDelay: 1 - scanningEndSound: - path: "/Audio/Items/Medical/healthscanner.ogg" - type: entity parent: BasePDA diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 6f3c35e3c4a..79492046f39 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -106,7 +106,7 @@ - Psychologist - Paramedic - MedicalBorg # Delta V - Medical Borg, see Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medicalborg.yml - - Pharmacist # Delta V - Pharmacist, see Ressources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml + - Pharmacist # Delta V - Pharmacist, station-specific, see Ressources/Prototypes/DeltaV/Roles/Jobs/Medical/pharmacist.yml - type: department id: Security diff --git a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml index 9f89f9c218a..82662cd6110 100644 --- a/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml +++ b/Resources/ServerInfo/Guidebook/DeltaV/Medical/Pharmacist.xml @@ -1,8 +1,8 @@ # Pharmacist -The "crème de la crème" in terms of knowledge in chemistry, the Pharmacist is the best at its domain! Whether they studied at Interdyne Pharmaceutics or the Andromeda Initiative Laboratories, their valuable knowledge is to be respected. +The "crème de la crème" in terms of knowledge in chemistry, the Pharmacist is the best at its domain! Their valuable knowledge is to be respected. They sacrifice the general purpose of Chemistry to the indomitable world of pharmaceutics, working more closely with the crew, the psychologist, medical doctors who actually do check-ups, and atmospheric technicians, ... -The Pharmacist is a social role, where social interactions are needed if you wish to excel at handing out prescriptions. +Social interactions are needed if you wish to excel and become a professional at handing out prescriptions. ## Equipment: From a9700abe12dc0611d97f8f57e40d8692c699d0c7 Mon Sep 17 00:00:00 2001 From: BriBrooo <45323530+Bribrooo@users.noreply.github.com> Date: Sun, 8 Dec 2024 01:41:04 +0100 Subject: [PATCH 86/86] Update door_access.yml Signed-off-by: BriBrooo <45323530+Bribrooo@users.noreply.github.com> --- .../Entities/Objects/Devices/Electronics/door_access.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml index 0beeafcd03d..14ce515f806 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Electronics/door_access.yml @@ -133,6 +133,7 @@ components: - type: AccessReader access: [["Research"]] # Uses research access until the job is added + access: [["Robotics"]] - type: entity parent: DoorElectronics @@ -141,4 +142,4 @@ components: - type: AccessReader access: [["Pharmacist"]] - access: [["Robotics"]] +