Aronai Sieyes
72f5e790db
Upstream-11421
2021-08-24 21:10:20 -07:00
Novacat
827f9ebbbf
Merge pull request #11477 from VOREStation/upstream-merge-8223
...
[MIRROR] Updates wine reagent id to redwine.
2021-08-24 23:57:24 +00:00
Nadyr
531552958b
Merge pull request #2827 from KeRSedChaplain/cultdrinks
...
Adds heresy to the bar (two new cultist themed drinks)
2021-08-22 04:13:32 -04:00
Dan-Neposh
a9f7d85e58
fixes a typo
2021-08-19 22:30:55 -04:00
Dan-Neposh
82312e29c5
adds narsour and cogchamp themselves
2021-08-19 22:07:20 -04:00
Nadyr
23de9205e0
powder that makes you say yes
2021-08-13 23:16:33 -04:00
Chompstation Bot
beef8e7f82
Virology Revamp
2021-08-13 15:38:46 +00:00
Razgriz
768f6e4f6e
Merge pull request #2737 from CHOMPStationBot/upstream-merge-11338
...
[MIRROR] New Floor Tanks
2021-08-08 01:06:27 -07:00
Razgriz
347cd60a7f
powder that makes you say yes
2021-08-07 16:33:22 -07:00
Aronai Sieyes
846f4e42d1
Merge pull request #11355 from GhostActual/fixitfixitfixit
...
Fix for Issue #11354
2021-08-06 22:16:01 +00:00
Chompstation Bot
b2b980c371
New Floor Tanks
2021-08-06 15:38:14 +00:00
Chompstation Bot
02af50470c
7/23/2021 Drink Revamp
2021-07-27 22:06:30 +00:00
Ghost Actual
50c2de86d2
7/22/2021 Food Revamp ( #11210 )
...
* Base Commit
* Forgot the New Chips
* Forgot Chicken Fillet
* Base Commit
* Forgot the New Chips
* Forgot Chicken Fillet
* Conflict Fix
* Oopsie
* Fixes known issues
* Uploads Files for Remote Work
* Small Fix
* Final Commit (hopefully)
* Small Fix
2021-07-26 16:51:23 +00:00
Chompstation Bot
84d54d6c4e
[MIRROR] Chemsprayer Update
2021-07-25 00:27:57 +00:00
Nadyr
6db26de8ce
powder that makes you say yes
2021-07-20 21:23:09 -04:00
Chompstation Bot
15cafbe65b
Optimize a couple things
2021-07-20 21:30:20 +00:00
Nadyr
17bb459bb6
Merge pull request #2597 from CHOMPStationBot/upstream-merge-11154
...
[MIRROR] Supermatter vial
2021-07-19 19:57:14 -04:00
Aronai Sieyes
977f422509
Merge pull request #11154 from VOREStation/Arokha/supervial
...
Supermatter vial
2021-07-19 22:23:52 +00:00
Aronai Sieyes
6cb41c6372
Merge pull request #11147 from VOREStation/Arokha/supermatter
...
Allow grinding supermatter
2021-07-19 21:16:49 +00:00
Novacat
12e53279a4
Merge pull request #11134 from VOREStation/Fixes/11102
...
Fixes #11102
2021-07-18 19:16:20 +00:00
Nadyr
5c7226fa54
Merge branch 'master' into upstream-merge-11110
2021-07-16 19:09:43 -04:00
Nadyr
b4d0e07229
powder that makes you say yes
2021-07-16 18:36:36 -04:00
Chompstation Bot
d0d23ed393
Fixes a bunch of bools missed in #11100
2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Nadyr
1cf6d326aa
powder that makes you say yes
2021-07-15 18:59:32 -04:00
Chompstation Bot
9acb3a208e
Removes unnecessary, unused, and redundant helpers.
2021-07-14 17:57:22 +00:00
Nadyr
913a84eb5c
Merge branch 'master' into upstream-merge-10976
2021-07-10 01:22:38 -04:00
Nadyr
7cd8d9c093
powder that makes you say yes
2021-07-10 01:18:41 -04:00
Nadyr
e48d0aa61c
Merge pull request #2463 from CHOMPStationBot/upstream-merge-10971
...
[MIRROR] 4 random runtime fixes
2021-07-10 00:00:30 -04:00
Nadyr
685a01907f
powder that makes you say yes
2021-07-09 23:46:36 -04:00
Chompstation Bot
e8c29d4d74
Fixes blood being not injectable in any container of /food subtype
2021-07-08 06:48:44 +00:00
Chompstation Bot
b965d1546c
4 random runtime fixes
2021-07-08 04:54:06 +00:00
Chompstation Bot
287a5deee3
Use material defines more
2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf
Converts visible_message notice spans to look more like emotes
2021-07-05 20:30:12 +00:00
Razgriz
1a3c753f4a
Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802
...
[MIRROR] Port several foods and food sprites
2021-07-03 14:49:34 -07:00
Aronai Sieyes
67e370b0cf
Merge pull request #10800 from VOREStation/Icons/chemistry
...
Swap chemmaster, port beaker sprites
2021-07-03 20:31:14 +00:00
Aronai Sieyes
64db1a458b
Merge pull request #10802 from VOREStation/Icons/food
...
Port several foods and food sprites
2021-07-03 20:31:07 +00:00
Verkister
571796baca
Fixes lewdchem emote stuff
2021-07-02 15:26:50 +03:00
Nadyr
f741c9af94
powder that makes you say yes
2021-07-01 20:26:14 -04:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Nadyr
8aceda111e
Merge pull request #2295 from CHOMPStation2/Razgriz1032-patch-5
...
Change Osteodaxon total volume required from 5 to 1
2021-06-29 19:46:18 -04:00
Novacat
2f6381ce13
Merge pull request #10776 from VOREStation/upstream-merge-8159
...
[MIRROR] Typo Fixy
2021-06-28 10:40:59 +00:00
Razgriz
e675401f4a
Change Osteodaxon total volume required from 5 to 1
...
Change Osteodaxon total volume required to heal from 5 to 1
2021-06-26 15:15:24 -07:00
Razgriz
f692192d2c
Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727
...
[MIRROR] Medicine Tweaks
2021-06-26 13:24:46 -07:00
Nadyr
154a665dbf
Merge branch 'CHOMPStation2:master' into upstream-merge-10737
2021-06-25 20:59:55 -04:00
Razgriz
422c5e958f
Update medicine.dm
2021-06-25 00:28:41 -07:00
Chompstation Bot
144af78224
TGUI fixes post update
2021-06-24 02:18:07 +00:00
Chompstation Bot
5cbb0e48e0
Medicine Tweaks
2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
Razgriz
d8929f3f8a
Update reagent_tank.dm
2021-06-17 23:02:54 -07:00
