Commit Graph

56 Commits

Author SHA1 Message Date
Darlantan
964400c2f9 buffs supermatter grinding 2023-04-04 02:03:18 -04: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
Heroman3003
24e829b6a4 Adds new machine that mass-produces autoinjectors, maps it in 2023-02-18 19:09:36 +00:00
Razgriz
a5d405524e powder that makes you say yes 2022-12-26 15:23:24 -07:00
Casey
8f0cf2a4dc A few fixes 2022-12-23 16:23:56 +00: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
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
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
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
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
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
cea57f35ad Merge pull request #12799 from lm40/master
Fixes bar dispenser lemon juice
2022-04-20 09:03:09 +00:00
Razgriz
f90e935687 Merge pull request #3722 from CHOMPStation2/upstream-merge-12292
[MIRROR] 8316 fix
2022-03-01 00:29:44 -07:00
Nadyr
96769bf048 powder that makes you say yes 2022-02-19 17:56:28 -05:00
Casey
02acd7cba0 8316 fix 2022-02-19 22:33:29 +00:00
Casey
e669aaeb62 Doom Barrels 2022-02-18 18:55:35 +00:00
Razgriz
cfe0107753 powder that makes you say yes 2021-12-10 01:03:48 -07:00
Casey
c2441330b6 Adds general-purpose cooking oil, replaces usages of corn oil 2021-12-10 00:20:40 +00:00
Nadyr
2d9a1821af Merge pull request #2999 from CHOMPStationBot/upstream-merge-11529
[MIRROR] Wall Dispenser Fix
2021-09-24 17:06:26 -04:00
Nadyr
7c53802bac powder that makes you say yes 2021-09-24 16:56:39 -04:00
Casey
2fc97f0761 Merge pull request #11558 from VOREStation/upstream-merge-8274
[MIRROR] Gives the baristas sugar in their dispenser
2021-09-24 03:45:17 +00:00
Chompstation Bot
26070be845 Wall Dispenser Fix 2021-09-24 03:23:42 +00:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07: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
347cd60a7f powder that makes you say yes 2021-08-07 16:33:22 -07: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
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
6cb41c6372 Merge pull request #11147 from VOREStation/Arokha/supermatter
Allow grinding supermatter
2021-07-19 21:16:49 +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
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00: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
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
154a665dbf Merge branch 'CHOMPStation2:master' into upstream-merge-10737 2021-06-25 20:59:55 -04:00
Chompstation Bot
144af78224 TGUI fixes post update 2021-06-24 02:18:07 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00