From 5acb7d72c366926681601b34cdd40024377e32cb Mon Sep 17 00:00:00 2001 From: BriBrooo Date: Fri, 22 Nov 2024 09:58:57 +0100 Subject: [PATCH] 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" } ] }