Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds the Pharmacist #1576

Open
wants to merge 112 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
ae90205
Adds Vicodilicaine
Bribrooo Aug 2, 2024
7f4766e
Moves the _CD folder to DeltaV folder
Bribrooo Aug 2, 2024
9d9414c
Zepprocane & More!
Bribrooo Aug 2, 2024
3223c55
Pharmacist clothing + Asparatin
Bribrooo Aug 3, 2024
5719771
Adds the Pharmacist Job
Bribrooo Aug 3, 2024
5316ca3
FTL touch up
Bribrooo Aug 3, 2024
a34101b
Modified the prescription paper
Bribrooo Aug 4, 2024
1dd82d1
modified the coat and suit
Bribrooo Aug 5, 2024
ca98c17
modified the job marker, pda, stamp and door
Bribrooo Aug 5, 2024
ab10df4
added discrete pharmacist chem bag
Bribrooo Aug 5, 2024
8384290
Added the chembag to basic loadout
Bribrooo Aug 5, 2024
d6778f3
updates rp chem group
Bribrooo Aug 5, 2024
c733f45
Adds Asparatine and the whole process behind it (12 new reagents)
Bribrooo Aug 6, 2024
ae8574d
Fixed FATL bugs
Bribrooo Aug 6, 2024
1f4cc1e
Fixed even more FATL bugs
Bribrooo Aug 6, 2024
8b72fa4
Fixed bugs again
Bribrooo Aug 6, 2024
e43db5c
Fixed a bug...
Bribrooo Aug 6, 2024
1ab0cf2
Finally fixes bugs and whatnot
Bribrooo Aug 6, 2024
38b3597
Merge branch 'DeltaV-Station:master' into pharmacology
Bribrooo Aug 6, 2024
21e0653
Adds Naguuprofen (and 6 new reagents)
Bribrooo Aug 6, 2024
b93cdcb
Added Guidebook Entry
Bribrooo Aug 6, 2024
d6f3e54
Adds a jumpsuit and jumpskirt alternative
Bribrooo Aug 7, 2024
77e65d9
Update identification_cards.yml
Bribrooo Aug 7, 2024
9658672
Update loadout-groups.ftl
Bribrooo Aug 8, 2024
cb17ed2
Update identification_cards.yml
Bribrooo Aug 8, 2024
8d7b38a
Merge branch 'master' into pharmacology
Bribrooo Aug 8, 2024
e5fe961
Merge branch 'master' into pharmacology
Bribrooo Aug 8, 2024
1e5f50c
Prepares future β-blockers reagents + Sodium Amalgam spark SFX
Bribrooo Aug 9, 2024
e3d091e
Adds Propene glycol and propene oxide
Bribrooo Aug 9, 2024
84cd261
Adds Cordivol and fixes the guidebook (i think?)
Bribrooo Aug 9, 2024
769a8f4
forgot to save last file open...
Bribrooo Aug 9, 2024
c70a1a6
Adds Debivolol + β-blocker touch ups
Bribrooo Aug 9, 2024
b696fcc
Update pharmacy.yml
Bribrooo Aug 9, 2024
25784e9
Update pharmacy.yml
Bribrooo Aug 9, 2024
d5c7a1c
Merge branch 'master' into pharmacology
Bribrooo Aug 9, 2024
066195c
bug fixes
Bribrooo Aug 9, 2024
4722a65
Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA…
Bribrooo Aug 9, 2024
96e71f5
bug fixes
Bribrooo Aug 9, 2024
60141fd
Merge branch 'master' into pharmacology
Bribrooo Aug 9, 2024
353f929
bug fixes requiem
Bribrooo Aug 9, 2024
6e9dcec
Update pharmachemicals.yml
Bribrooo Aug 9, 2024
331d359
Update pharmacy.yml
Bribrooo Aug 9, 2024
4c8cdbf
fixes (?)
Bribrooo Aug 17, 2024
ab566e9
fixes (?) chap. 2 uncertitudes extended
Bribrooo Aug 17, 2024
a068a81
I want to eat myself
Bribrooo Aug 17, 2024
20aef0f
Merge branch 'master' into pharmacology
Bribrooo Aug 17, 2024
642b81f
loadout fixes
Bribrooo Aug 17, 2024
324a124
Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA…
Bribrooo Aug 17, 2024
ac02047
Update role_loadouts.yml
Bribrooo Aug 17, 2024
ef74dfc
trying to fix and not break my house
Bribrooo Aug 17, 2024
79ff8bc
Update pharmacist.yml
Bribrooo Aug 17, 2024
15e07fa
Update pharmacist.yml
Bribrooo Aug 17, 2024
bd4e644
Update pharmacist.yml
Bribrooo Aug 17, 2024
5ff6c38
Update pharmacist.yml
Bribrooo Aug 17, 2024
af6ef35
Update identification_cards.yml
Bribrooo Aug 17, 2024
2cbeb1e
tried fix
Bribrooo Aug 17, 2024
f427489
Update pharmachemicals.yml
Bribrooo Aug 17, 2024
9f2b0e4
Merge branch 'master' into pharmacology
Bribrooo Aug 19, 2024
c18e5c2
Update Resources/Locale/en-US/deltav/job/job-description.ftl
Bribrooo Sep 5, 2024
90c2383
Update Resources/Locale/en-US/deltav/job/job-names.ftl
Bribrooo Sep 5, 2024
ce76bf8
Update Resources/Locale/en-US/deltav/reagents/meta/pharmacy.ftl
Bribrooo Sep 5, 2024
06578aa
Update Resources/Locale/en-US/deltav/reagents/meta/physical-desc.ftl
Bribrooo Sep 5, 2024
fc76676
Update Resources/Locale/en-US/deltav/reagents/sodiumamalgam.ftl
Bribrooo Sep 5, 2024
4af8976
Update Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors…
Bribrooo Sep 5, 2024
54f3dff
Update Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Sig…
Bribrooo Sep 5, 2024
2d45abf
Update Resources/Prototypes/DeltaV/Guidebook/medical.yml
Bribrooo Sep 5, 2024
5a0e809
Update Resources/Locale/en-US/deltav/reagents/pharmacymsg.ftl
Bribrooo Sep 5, 2024
8ebdce7
Update Resources/Prototypes/DeltaV/Access/medical.yml
Bribrooo Sep 5, 2024
536b8e7
Update Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpski…
Bribrooo Sep 5, 2024
13c3ce7
Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/paper.yml
Bribrooo Sep 5, 2024
3261634
Update Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp…
Bribrooo Sep 5, 2024
2dad15e
Resolving conflicts
Bribrooo Sep 5, 2024
341749c
Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA…
Bribrooo Sep 5, 2024
38b1987
Update chem_bag_pharmacist.yml
Bribrooo Sep 5, 2024
10a3c92
resolves conflict
Bribrooo Sep 5, 2024
c9af0c6
AURGH
Bribrooo Sep 5, 2024
bf1a728
Moving files
Bribrooo Sep 5, 2024
f77a088
Merge branch 'master' into pharmacology
Bribrooo Sep 5, 2024
69c7dd3
WORKS (should)
Bribrooo Sep 5, 2024
c683246
fixing yaml (?)
Bribrooo Sep 6, 2024
45c659a
Merge branch 'master' into pharmacology
Bribrooo Sep 6, 2024
065b285
Update pharmacist.yml
Bribrooo Sep 6, 2024
ec39653
Update Pharmacist.xml
Bribrooo Sep 6, 2024
854742d
Update pharmachemicals.yml
Bribrooo Sep 6, 2024
9d0e5bb
Update pharmachemicals.yml
Bribrooo Sep 6, 2024
9c86f14
Update pharmachemicals.yml
Bribrooo Sep 6, 2024
7cdc266
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
d2a375b
Merge branch 'master' into pharmacology
Bribrooo Sep 7, 2024
cf7c3da
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
787a648
Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA…
Bribrooo Sep 7, 2024
4486d65
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
795967f
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
7c89c64
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
8f09807
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
474ea3b
Update pharmachemicals.yml
Bribrooo Sep 7, 2024
172dc76
Merge branch 'master' into pharmacology
Bribrooo Sep 7, 2024
e8a58bb
Merge branch 'master' into pharmacology
Bribrooo Sep 7, 2024
21c97b5
Merge branch 'master' into pharmacology
Bribrooo Sep 7, 2024
6fc7a1a
Merge branch 'master' into pharmacology
Bribrooo Sep 7, 2024
0e22c86
updates prescription paper
Bribrooo Sep 7, 2024
ab9f8a4
Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA…
Bribrooo Sep 7, 2024
8f2d640
Merge branch 'master' into pharmacology
Bribrooo Sep 7, 2024
5acb7d7
Trying to fix conflicts
Bribrooo Nov 22, 2024
3ccc357
Merge branch 'master' into pharmacology
Bribrooo Nov 22, 2024
1ee393d
Update rubber_stamp.yml
Bribrooo Nov 22, 2024
a1b6ce4
Merge branch 'pharmacology' of https://github.com/Bribrooo/Delta-V-HA…
Bribrooo Nov 22, 2024
5837780
Resolving conversations
Bribrooo Nov 22, 2024
d4ffb43
Merge branch 'master' into pharmacology
Bribrooo Nov 22, 2024
8ee9559
Merge branch 'master' into pharmacology
Bribrooo Nov 23, 2024
42c5d62
Merge branch 'master' into pharmacology
Bribrooo Nov 29, 2024
12263c1
Merge branch 'master' into pharmacology
Bribrooo Dec 8, 2024
a9700ab
Update door_access.yml
Bribrooo Dec 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update pharmachemicals.yml
Bribrooo committed Aug 17, 2024
commit f42748983a1623f2af5c845d301bdb1e7abb495d
10 changes: 5 additions & 5 deletions Resources/Prototypes/DeltaV/Reagents/pharmachemicals.yml
Original file line number Diff line number Diff line change
@@ -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