Novacat
1e7cbec2e3
Missing href token adds
2022-12-15 20:43:47 +00:00
Verkister
d6bc544acb
Adds positive trait for food toxin immunity.
...
Adds trait that provides immunity for ingested toxins. Only affects the toxin subtype and doesn't protect from possible harm caused by other drugs, meds, allergens etc.
2022-12-10 19:30:14 +02:00
Nadyr
ff6b90710b
moved reaction to modular chomp
2022-11-22 16:50:21 -05:00
Heroman3003
e8b308879e
Merge pull request #14111 from Screemonster/totallysick
...
removes meme reaction, adds sickness to regen
2022-11-21 04:36:24 +00:00
Nadyr
e9ce051107
powder that makes you say yes
2022-11-13 16:48:19 -05:00
Casey
d9db1635d2
Species Alcohol Mod Cleanup
2022-11-13 20:46:48 +00:00
Casey
0ec934b863
Merge pull request #13900 from Cameron653/syringe_overlay
...
Fixes an oversight with syringes.
2022-10-16 21:04:00 +00:00
Casey
b6e433e53f
Merge pull request #13808 from Cameron653/drug_adjustment
...
fixes psilocybin
2022-10-02 17:52:47 +00:00
Darlantan
97f330698a
Move new files to new(ish) modularity folder
2022-09-25 17:54:03 -04:00
Darlantan
3556c1bfb8
string procs that make Nadyr crazy
2022-09-25 17:54:03 -04:00
Darlantan
3dc0f284db
switching branches
2022-09-25 17:54:03 -04:00
Darlantan
f4fbb2cb90
WIP commit because I need to fix mirror conflicts right now
2022-09-25 17:54:03 -04:00
Darlantan
5897a5608e
Auto stash before checking out "Upstream/upstream-merge-12021"
2022-09-25 17:54:03 -04:00
Darlantan
06bd861d57
First "let's back up my work somewhere other than my HDD" commit
2022-09-25 17:54:03 -04:00
Razgriz
64a7d9a36d
Merge pull request #5010 from CHOMPStation2/upstream-merge-12971
...
[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)
2022-09-22 22:17:43 -07:00
Razgriz
fa6ecc5cee
Merge pull request #5004 from CHOMPStation2/upstream-merge-13467
...
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
2022-09-22 22:10:59 -07:00
Razgriz
a6f9014496
powder that makes you say yes
2022-09-22 21:50:36 -07:00
Razgriz
4edb8ba609
powder that makes you say yes
2022-09-22 21:49:19 -07:00
Razgriz
430080e185
powder that makes you say yes
2022-09-22 21:48:38 -07:00
Razgriz
ba8fbdb69c
powder that makes you say yes
2022-09-22 20:48:39 -07:00
VirgoBot
4acf5e2e67
[MIRROR] conk rete (ABLE TO BE MERGED)
2022-09-23 01:03:49 +00:00
Casey
de491df7b7
Radiation Rework
2022-09-23 00:56:28 +00:00
Nadyr
925ddb8f0e
powder that makes you say yes
2022-09-04 18:09:38 -04:00
Casey
cfe8e710d2
Fixes a bunch runtimes
2022-09-04 21:47:57 +00:00
Nadyr
ffaa190835
Merge pull request #4788 from CHOMPStation2/upstream-merge-13583
...
[MIRROR] [MIRROR] Makes topical OD do damage.
2022-08-28 20:42:45 -04:00
Nadyr
408bf4de39
Merge pull request #4767 from Holdelta/BarUpdate
...
Refactoring existing CHOMPStation drinks into the modular folder, visual update to some drinks, and adding new drinks from other servers.
2022-08-28 19:06:15 -04:00
C.L
eae96d9ed0
Merge pull request #13583 from VOREStation/upstream-merge-8687
...
[MIRROR] Makes topical OD do damage.
2022-08-26 22:35:23 +00:00
Test Turtle
5f314473ba
Refactoring existing CHOMPStation drinks and adding new ones.
2022-08-23 02:12:28 -07:00
Casey
660e9df072
Merge pull request #13490 from Screemonster/pickupthatcan
...
Makes brainzsnax actually snacks
2022-08-14 20:38:24 +00:00
Nadyr
604c37f716
Merge pull request #4663 from CHOMPStation2/upstream-merge-13443
...
[MIRROR] Allows un-obligate bloodsucker to just drink blood normally
2022-08-07 19:37:19 -04:00
xnqm8h
3d7b3e40bf
Fixed some leftover typos preventing the alizene reaction from happening. 🧪
...
Fixed some leftover typos preventing the reaction from happening.
2022-08-07 16:13:07 -04:00
Casey
fc8890bd7c
Allows un-obligate bloodsucker to just drink blood normally
2022-08-07 19:37:24 +00:00
xnqm8h
3dbb49378f
Fixes mutation chains for chomp seeds and some reaction formulas 🪴 💊
...
Fixes missing mutation chains for most of the plant types in seed_datums_ch along with fixing some typos in some chemical reactions. Lastly added a simple description for Bullvalene since it had a placeholder one.
2022-08-05 16:53:02 -04:00
Nadyr
c5a0f8fb24
Merge pull request #4584 from CHOMPStation2/upstream-merge-13371
...
[MIRROR] Fixes in-chat icons being broken in oldchat
2022-07-20 21:12:22 -04:00
Nadyr
1b4cc6b555
Merge pull request #4581 from CHOMPStation2/upstream-merge-13357
...
[MIRROR] [MIRROR] Nerfs allergic reactions (Again)
2022-07-20 20:50:48 -04:00
Casey
48f835f41f
Fixes in-chat icons being broken in oldchat
2022-07-20 17:24:27 +00:00
Casey
31471796a1
Merge pull request #13357 from VOREStation/upstream-merge-8668
...
[MIRROR] Nerfs allergic reactions (Again)
2022-07-20 17:23:10 +00:00
TheGreatKitsune
e294c54eab
Add comments to final file
2022-07-19 22:08:35 -05:00
TheGreatKitsune
9ca0accd77
Uncomment pill bottle styling code
2022-07-05 13:18:24 -05:00
TheGreatKitsune
454560d83f
Fix Nar'Sour's result amount
2022-07-03 21:12:39 -05:00
Razgriz
f46bacf1da
Merge pull request #4454 from CHOMPStation2/upstream-merge-13207
...
[MIRROR] Fixes some reagent dispenser fuckery
2022-07-03 17:03:14 -07:00
Nadyr
5033e705f2
powder that makes you say yes
2022-06-30 17:38:03 -04:00
Casey
2f426a74e8
Merge pull request #13207 from Heroman3003/dispenser-fckery
...
Fixes some reagent dispenser fuckery
2022-06-30 08:22:11 +00:00
Casey
b7a0a7fd5b
Merge pull request #13208 from liache/CargoCoffeeDispenserPatch
...
Cargo-Orderable-Coffee-Dispenser
2022-06-30 08:22:06 +00:00
Nadyr
a2d9c8b58a
Merge branch 'master' into upstream-merge-13122
2022-06-22 22:37:44 -04:00
Casey
b0802ce267
More TGUI Input Conversions
2022-06-19 11:09:42 +00:00
Casey
928a321b5f
TGUI Input Conversions
2022-06-19 03:59:14 +00:00
Casey
a5ed33a2e1
Merge pull request #12944 from Somememeguy/MakeCookingGreatAgain
...
Make Cooking Great Again [Tedium Update, Rebalance some cooking aspects]
2022-05-12 19:26:08 +00:00
Casey
16b58a8b18
Adds chemistry kits
2022-05-08 09:57:10 +00:00
Razgriz
0ce7af1fd9
Merge pull request #4145 from TheGreatKitsune/hypospray_size
...
Adjust hypospray size. (Fixes #4097 )
2022-04-28 13:52:44 -07:00
