Code

Adds the Pharmacist#1576

Code

Open

Bribrooo wants to merge 112 commits intoDeltaV-Station:masterDeltaV-Station/Delta-v:masterfrom Bribrooo:pharmacologyBribrooo/Delta-V-HA:pharmacologyCopy head branch name to clipboard

+2,441-7

Commits

Commits on Aug 2, 2024

• Adds Vicodilicaine

  Show description for ae90205
  Bribrooo

  committed
  ae90205

  Copy full SHA for ae90205

• Moves the _CD folder to DeltaV folder

  Show description for 7f4766e
  Bribrooo

  committed
  7f4766e

  Copy full SHA for 7f4766e

• Zepprocane & More!

  Show description for 9d9414c
  Bribrooo

  committed
  9d9414c

  Copy full SHA for 9d9414c

Commits on Aug 3, 2024

• Pharmacist clothing + Asparatin

  Show description for 3223c55
  

  Bribrooo

  and

  VMSolidus

  committed
  3223c55

  Copy full SHA for 3223c55

• Adds the Pharmacist Job

  Show description for 5719771
  Bribrooo

  committed
  5719771

  Copy full SHA for 5719771

• FTL touch up

  Bribrooo

  committed
  5316ca3

  Copy full SHA for 5316ca3

Commits on Aug 4, 2024

• Modified the prescription paper

  Bribrooo

  committed
  a34101b

  Copy full SHA for a34101b

Commits on Aug 5, 2024

• modified the coat and suit

  Show description for 1dd82d1
  Bribrooo

  committed
  1dd82d1

  Copy full SHA for 1dd82d1

• modified the job marker, pda, stamp and door

  Show description for ca98c17
  Bribrooo

  committed
  ca98c17

  Copy full SHA for ca98c17

• added discrete pharmacist chem bag

  Show description for ab10df4
  Bribrooo

  committed
  ab10df4

  Copy full SHA for ab10df4

• Added the chembag to basic loadout

  Bribrooo

  committed
  8384290

  Copy full SHA for 8384290

• updates rp chem group

  Bribrooo

  committed
  d6778f3

  Copy full SHA for d6778f3

Commits on Aug 6, 2024

• Adds Asparatine and the whole process behind it (12 new reagents)

  Show description for c733f45
  Bribrooo

  committed
  c733f45

  Copy full SHA for c733f45

• Fixed FATL bugs

  Bribrooo

  committed
  ae8574d

  Copy full SHA for ae8574d

• Fixed even more FATL bugs

  Bribrooo

  committed
  1f4cc1e

  Copy full SHA for 1f4cc1e

• Fixed bugs again

  Bribrooo

  committed
  8b72fa4

  Copy full SHA for 8b72fa4

• Fixed a bug...

  Bribrooo

  committed
  e43db5c

  Copy full SHA for e43db5c

• Finally fixes bugs and whatnot

  Bribrooo

  committed
  1ab0cf2

  Copy full SHA for 1ab0cf2

• Merge branch 'DeltaV-Station:master' into pharmacology

  Bribrooo

  authored
  38b3597

  Copy full SHA for 38b3597

• Adds Naguuprofen (and 6 new reagents)

  Show description for 21e0653
  Bribrooo

  committed
  21e0653

  Copy full SHA for 21e0653

• Added Guidebook Entry

  Bribrooo

  committed
  b93cdcb

  Copy full SHA for b93cdcb

Commits on Aug 7, 2024

• Adds a jumpsuit and jumpskirt alternative

  Bribrooo

  committed
  d6f3e54

  Copy full SHA for d6f3e54

• Update identification_cards.yml

  Bribrooo

  committed
  77e65d9

  Copy full SHA for 77e65d9

Commits on Aug 8, 2024

• Update loadout-groups.ftl

  Bribrooo

  committed
  9658672

  Copy full SHA for 9658672

• Update identification_cards.yml

  Bribrooo

  committed
  cb17ed2

  Copy full SHA for cb17ed2

• Merge branch 'master' into pharmacology

  Show description for 8d7b38a
  Bribrooo

  authored
  8d7b38a

  Copy full SHA for 8d7b38a

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  e5fe961

  Copy full SHA for e5fe961

Commits on Aug 9, 2024

• Prepares future β-blockers reagents + Sodium Amalgam spark SFX

  Show description for 1e5f50c
  Bribrooo

  committed
  1e5f50c

  Copy full SHA for 1e5f50c

• Adds Propene glycol and propene oxide

  Show description for e3d091e
  Bribrooo

  committed
  e3d091e

  Copy full SHA for e3d091e

• Adds Cordivol and fixes the guidebook (i think?)

  Show description for 84cd261
  Bribrooo

  committed
  84cd261

  Copy full SHA for 84cd261

• forgot to save last file open...

  Bribrooo

  committed
  769a8f4

  Copy full SHA for 769a8f4

• Adds Debivolol + β-blocker touch ups

  Bribrooo

  committed
  c70a1a6

  Copy full SHA for c70a1a6

• Update pharmacy.yml

  Bribrooo

  committed
  b696fcc

  Copy full SHA for b696fcc

• Update pharmacy.yml

  Bribrooo

  committed
  25784e9

  Copy full SHA for 25784e9

• Merge branch 'master' into pharmacology

  Show description for d5c7a1c
  Bribrooo

  authored
  d5c7a1c

  Copy full SHA for d5c7a1c

• bug fixes

  Bribrooo

  committed
  066195c

  Copy full SHA for 066195c

• Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA into pharmacology

  Bribrooo

  committed
  4722a65

  Copy full SHA for 4722a65

• bug fixes

  Bribrooo

  committed
  96e71f5

  Copy full SHA for 96e71f5

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  60141fd

  Copy full SHA for 60141fd

• bug fixes requiem

  Bribrooo

  committed
  353f929

  Copy full SHA for 353f929

• Update pharmachemicals.yml

  Bribrooo

  committed
  6e9dcec

  Copy full SHA for 6e9dcec

• Update pharmacy.yml

  Bribrooo

  committed
  331d359

  Copy full SHA for 331d359

Commits on Aug 17, 2024

• fixes (?)

  Bribrooo

  committed
  4c8cdbf

  Copy full SHA for 4c8cdbf

• fixes (?) chap. 2 uncertitudes extended

  Bribrooo

  committed
  ab566e9

  Copy full SHA for ab566e9

• I want to eat myself

  Bribrooo

  committed
  a068a81

  Copy full SHA for a068a81

• Merge branch 'master' into pharmacology

  Show description for 20aef0f
  Bribrooo

  authored
  20aef0f

  Copy full SHA for 20aef0f

• loadout fixes

  Bribrooo

  committed
  642b81f

  Copy full SHA for 642b81f

• Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA into pharmacology

  Bribrooo

  committed
  324a124

  Copy full SHA for 324a124

• Update role_loadouts.yml

  Bribrooo

  committed
  ac02047

  Copy full SHA for ac02047

• trying to fix and not break my house

  Bribrooo

  committed
  ef74dfc

  Copy full SHA for ef74dfc

• Update pharmacist.yml

  Bribrooo

  committed
  79ff8bc

  Copy full SHA for 79ff8bc

• Update pharmacist.yml

  Bribrooo

  committed
  15e07fa

  Copy full SHA for 15e07fa

• Update pharmacist.yml

  Bribrooo

  committed
  bd4e644

  Copy full SHA for bd4e644

• Update pharmacist.yml

  Bribrooo

  committed
  5ff6c38

  Copy full SHA for 5ff6c38

• Update identification_cards.yml

  Bribrooo

  committed
  af6ef35

  Copy full SHA for af6ef35

• tried fix

  Bribrooo

  committed
  2cbeb1e

  Copy full SHA for 2cbeb1e

• Update pharmachemicals.yml

  Bribrooo

  committed
  f427489

  Copy full SHA for f427489

Commits on Aug 19, 2024

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  9f2b0e4

  Copy full SHA for 9f2b0e4

Commits on Sep 5, 2024

• Update Resources/Locale/en-US/deltav/job/job-description.ftl

  Show description for c18e5c2
  

  Bribrooo

  and

  DangerRevolution

  authored
  c18e5c2

  Copy full SHA for c18e5c2

• Update Resources/Locale/en-US/deltav/job/job-names.ftl

  Show description for 90c2383
  

  Bribrooo

  and

  DangerRevolution

  authored
  90c2383

  Copy full SHA for 90c2383

• Update Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl

  Show description for ce76bf8
  

  Bribrooo

  and

  DangerRevolution

  authored
  ce76bf8

  Copy full SHA for ce76bf8

• Update Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl

  Show description for 06578aa
  

  Bribrooo

  and

  DangerRevolution

  authored
  06578aa

  Copy full SHA for 06578aa

• Update Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl

  Show description for fc76676
  

  Bribrooo

  and

  DangerRevolution

  authored
  fc76676

  Copy full SHA for fc76676

• Update Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml

  Show description for 4af8976
  

  Bribrooo

  and

  DangerRevolution

  authored
  4af8976

  Copy full SHA for 4af8976

• Update Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml

  Show description for 54f3dff
  

  Bribrooo

  and

  DangerRevolution

  authored
  54f3dff

  Copy full SHA for 54f3dff

• Update Resources/Prototypes/DeltaV/Guidebook/medical.yml

  Show description for 2d45abf
  

  Bribrooo

  and

  DangerRevolution

  authored
  2d45abf

  Copy full SHA for 2d45abf

• Update Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl

  Show description for 5a0e809
  

  Bribrooo

  and

  DangerRevolution

  authored
  5a0e809

  Copy full SHA for 5a0e809

• Update Resources/Prototypes/DeltaV/Access/medical.yml

  Show description for 8ebdce7
  

  Bribrooo

  and

  DangerRevolution

  authored
  8ebdce7

  Copy full SHA for 8ebdce7

• Update Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml

  Show description for 536b8e7
  

  Bribrooo

  and

  DangerRevolution

  authored
  536b8e7

  Copy full SHA for 536b8e7

• Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml

  Show description for 13c3ce7
  

  Bribrooo

  and

  DangerRevolution

  authored
  13c3ce7

  Copy full SHA for 13c3ce7

• Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml

  Show description for 3261634
  

  Bribrooo

  and

  DangerRevolution

  authored
  3261634

  Copy full SHA for 3261634

• Resolving conflicts

  Bribrooo

  committed
  2dad15e

  Copy full SHA for 2dad15e

• Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA into pharmacology

  Bribrooo

  committed
  341749c

  Copy full SHA for 341749c

• Update chem_bag_pharmacist.yml

  Bribrooo

  committed
  38b1987

  Copy full SHA for 38b1987

• resolves conflict

  Bribrooo

  committed
  10a3c92

  Copy full SHA for 10a3c92

• AURGH

  Bribrooo

  committed
  c9af0c6

  Copy full SHA for c9af0c6

• Moving files

  Bribrooo

  committed
  bf1a728

  Copy full SHA for bf1a728

• Merge branch 'master' into pharmacology

  Show description for f77a088
  Bribrooo

  authored
  f77a088

  Copy full SHA for f77a088

• WORKS (should)

  Bribrooo

  committed
  69c7dd3

  Copy full SHA for 69c7dd3

Commits on Sep 6, 2024

• fixing yaml (?)

  Bribrooo

  committed
  c683246

  Copy full SHA for c683246

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  45c659a

  Copy full SHA for 45c659a

• Update pharmacist.yml

  Bribrooo

  committed
  065b285

  Copy full SHA for 065b285

• Update Pharmacist.xml

  Bribrooo

  committed
  ec39653

  Copy full SHA for ec39653

• Update pharmachemicals.yml

  Bribrooo

  committed
  854742d

  Copy full SHA for 854742d

• Update pharmachemicals.yml

  Bribrooo

  committed
  9d0e5bb

  Copy full SHA for 9d0e5bb

• Update pharmachemicals.yml

  Bribrooo

  committed
  9c86f14

  Copy full SHA for 9c86f14

Commits on Sep 7, 2024

• Update pharmachemicals.yml

  Bribrooo

  committed
  7cdc266

  Copy full SHA for 7cdc266

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  d2a375b

  Copy full SHA for d2a375b

• Update pharmachemicals.yml

  Bribrooo

  committed
  cf7c3da

  Copy full SHA for cf7c3da

• Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA into pharmacology

  Bribrooo

  committed
  787a648

  Copy full SHA for 787a648

• Update pharmachemicals.yml

  Bribrooo

  committed
  4486d65

  Copy full SHA for 4486d65

• Update pharmachemicals.yml

  Bribrooo

  committed
  795967f

  Copy full SHA for 795967f

• Update pharmachemicals.yml

  Bribrooo

  committed
  7c89c64

  Copy full SHA for 7c89c64

• Update pharmachemicals.yml

  Bribrooo

  committed
  8f09807

  Copy full SHA for 8f09807

• Update pharmachemicals.yml

  Bribrooo

  committed
  474ea3b

  Copy full SHA for 474ea3b

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  172dc76

  Copy full SHA for 172dc76

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  e8a58bb

  Copy full SHA for e8a58bb

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  21c97b5

  Copy full SHA for 21c97b5

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  6fc7a1a

  Copy full SHA for 6fc7a1a

• updates prescription paper

  Bribrooo

  committed
  0e22c86

  Copy full SHA for 0e22c86

• Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA into pharmacology

  Bribrooo

  committed
  ab9f8a4

  Copy full SHA for ab9f8a4

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  8f2d640

  Copy full SHA for 8f2d640

Commits on Nov 22, 2024

• Trying to fix conflicts

  Bribrooo

  committed
  5acb7d7

  Copy full SHA for 5acb7d7

• Merge branch 'master' into pharmacology

  Show description for 3ccc357
  Bribrooo

  authored
  3ccc357

  Copy full SHA for 3ccc357

• Update rubber_stamp.yml

  Bribrooo

  committed
  1ee393d

  Copy full SHA for 1ee393d

• Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA into pharmacology

  Bribrooo

  committed
  a1b6ce4

  Copy full SHA for a1b6ce4

• Resolving conversations

  Bribrooo

  committed
  5837780

  Copy full SHA for 5837780

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  d4ffb43

  Copy full SHA for d4ffb43

Commits on Nov 23, 2024

• Merge branch 'master' into pharmacology

  Bribrooo

  authored
  8ee9559

  Copy full SHA for 8ee9559

Commits on Nov 29, 2024

• Merge branch 'master' into pharmacology

  Show description for 42c5d62
  Bribrooo

  authored
  42c5d62

  Copy full SHA for 42c5d62

Commits on Dec 8, 2024

• Merge branch 'master' into pharmacology

  Show description for 12263c1
  Bribrooo

  authored
  12263c1

  Copy full SHA for 12263c1

• Update door_access.yml

  Show description for a9700ab
  Bribrooo

  authored
  a9700ab

  Copy full SHA for a9700ab