Casey
9dd95647b7
Merge pull request #14723 from KillianKirilenko/kk-robooze
...
Ethanol Processors
2023-03-27 04:02:43 +00:00
Nadyr
506661f8f4
Merge pull request #5919 from CHOMPStation2/upstream-merge-14551
...
[MIRROR] [MIRROR] /tg/ era language pass
2023-03-17 02:40:16 -04:00
Heroman3003
025fac4bf9
[MIRROR] /tg/ era language pass
2023-03-13 05:23:57 +00:00
Heroman3003
c551be9e5e
Merge pull request #14581 from Runa-Dacino/autoinjectorfix
...
fixes small injectors not working from printer
2023-03-10 06:53:33 +00:00
Bib Bob
2ebf2e6306
removed chem bloat
2023-03-07 22:15:21 -06:00
Rykka Stormheart
640a73cb06
Adds Deafened Feedback, enhances looping sounds further
...
Adds deafened ear ring that plays any time you're deafened, and fades back in once you can hear again.
Example of deafened feedback [here](https://streamable.com/8s8vlu ).
Worry not, if you're deafened via mutation or other, you'll simply go deaf, and only hear the fade-in once you regain hearing.
It will also only play **once** when you are deafened. Further deafening effects while you are already deaf will not force you to hear it again.
2023-03-03 04:08:08 -08:00
Heroman3003
dc64d2464b
Merge pull request #14555 from VOREStation/upstream-merge-8979
...
[MIRROR] Menthol doesn't kill you at 7 units
2023-02-25 08:21:21 +00:00
Heroman3003
24e829b6a4
Adds new machine that mass-produces autoinjectors, maps it in
2023-02-18 19:09:36 +00:00
Heroman3003
450842aaec
Merge pull request #14428 from VOREStation/upstream-merge-8915
...
[MIRROR] allows soap and showers to clean toes, and space cleaner to actually clean synthetic toes
2023-02-04 20:58:26 +00:00
Verkister
88f23977a6
Fixes gender chem kits
...
Un-oopsie-poopsied the funny chemnames that runtimed and bricked the whole kits
2023-01-03 18:46:46 +02:00
Razgriz
0de044b1ba
Merge pull request #5433 from CHOMPStation2/upstream-merge-14219
...
[MIRROR] A few fixes
2022-12-26 16:57:54 -07:00
Razgriz
a5d405524e
powder that makes you say yes
2022-12-26 15:23:24 -07:00
Razgriz
2b560c8202
Merge pull request #5435 from CHOMPStation2/upstream-merge-14225
...
[MIRROR] Adds new bar drink, Burnout
2022-12-26 12:21:35 -07:00
Razgriz
e5243197f5
Merge pull request #5422 from CHOMPStation2/upstream-merge-14224
...
[MIRROR] Gives service borgs some cream
2022-12-26 12:14:23 -07:00
tacoguy7765093
9185b2299f
Makes Glucose a craftable reagent and uncomments VOREstation removal from sweatmaxes. ( #5409 )
...
* Gives glucose a crafting recipe and un comments sweatmax glucose.
* slash
* nerf this
* Moving glucose pens to medical tab
2022-12-26 12:13:22 -07:00
Casey
32ce0772e9
Merge pull request #14225 from Heroman3003/ali-burnout
...
Adds new bar drink, Burnout
2022-12-23 16:25:07 +00:00
Casey
8f0cf2a4dc
A few fixes
2022-12-23 16:23:56 +00:00
Novacat
56f0906618
Merge pull request #14224 from Heroman3003/cream
...
Gives service borgs some cream
2022-12-22 02:29:42 +00:00
Desert
602ddec4e7
Updates Gender Chems ( #5355 )
...
* Updates Gender Chems
Removes Elixir formulas but keeps their effects, moving them under the Amorphorovir family of chemicals. Also imposes a double preference check now. Spontaneous TF needs to be enabled and you have to accept the alert letting you know what will happen.
* Fixed some comments.
* Moved stuff to chomp modular folder
2022-12-17 16:58:59 -07:00
Nadyr
5de996bec1
powder that makes you say yes
2022-12-15 22:08:38 -05:00
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
