Casey
38f2a0b96a
Merge pull request #11562 from PastelPrinceDan/belts
...
Medical and utility belts of holding
2021-09-24 03:47:47 +00:00
Nadyr
a2fdccce5e
powder that makes you say yes
2021-08-26 21:05:44 -04:00
Nadyr
d1efe83113
Merge branch 'master' into upstream-merge-11508
2021-08-26 21:00:44 -04:00
Nadyr
e2838d7cfe
Merge pull request #2902 from CHOMPStationBot/upstream-merge-11494
...
[MIRROR] [MIRROR] Illegal Tech -> Transgressive Tech
2021-08-26 20:43:11 -04:00
Chompstation Bot
4cd79beb29
Fix annoying runtime with exosuit fab
2021-08-27 00:11:54 +00:00
Aronai Sieyes
49696b2029
Merge pull request #11494 from VOREStation/upstream-merge-8243
...
[MIRROR] Illegal Tech -> Transgressive Tech
2021-08-26 16:54:17 +00:00
Chompstation Bot
af0d7a0f6b
Make stack amount var private
2021-08-26 15:39:04 +00:00
Nadyr
f19dc1b2eb
Merge pull request #2874 from cadyn/upstream-merge-11421
...
Merge Upstream Pull Request 11421
2021-08-25 22:38:53 -04:00
Nadyr
ae475104b5
powder that makes you say yes
2021-08-25 21:29:23 -04:00
Aronai Sieyes
72f5e790db
Upstream-11421
2021-08-24 21:10:20 -07:00
Aronai Sieyes
e19a87e44a
Upstream-11408
2021-08-24 21:09:43 -07:00
Rykka
80b7f0a089
Fix Dupe Research Design
...
Ore Bag of Holding was fixed upstream, as it was a duplicate define, so this fixes the compile error of dupe research design and uses the upstream ore bag of holding.
Small bonus, the upstream is 1500 gold cheaper, 500 diamond cheaper, and only costs 2 BLUESPACE and 2 TECH materials. <3
2021-08-15 15:15:24 -07:00
Novacat
b291d87e18
Merge pull request #11387 from Heroman3003/dupefix
...
Fixes infinite material duplication in R&D
2021-08-11 02:51:43 +00:00
Chompstation Bot
8818729b17
Add recycling machinery
2021-07-24 17:04:28 +00:00
Chompstation Bot
15cafbe65b
Optimize a couple things
2021-07-20 21:30:20 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Aronai Sieyes
8af1c627f7
Merge pull request #11101 from Hatterhat/patch-2
...
makes the standard bag of holding printable again
2021-07-16 01:08:23 +00:00
Nadyr
fcac8b3cd1
powder that makes you say yes
2021-07-09 23:05:19 -04:00
Nadyr
b8445e3b49
powder that makes you say yes
2021-07-09 23:04:18 -04:00
Nadyr
573006ca86
powder that makes you say yes
2021-07-09 23:01:43 -04:00
Nadyr
a768e3a8f9
powder that makes you say yes
2021-07-09 22:53:31 -04:00
Chompstation Bot
287a5deee3
Use material defines more
2021-07-07 19:02:05 +00:00
Chompstation Bot
b99adcaca4
Add pouches!
2021-07-06 01:00:11 +00:00
Nadyr
6660a70e82
Merge pull request #2387 from CHOMPStationBot/upstream-merge-10782
...
[MIRROR] Port Eris Trashbag of Holding
2021-07-03 21:17:31 -04:00
Aronai Sieyes
ce2cbc8ae2
Merge pull request #10782 from VOREStation/Arokha/trashholding
...
Port Eris Trashbag of Holding
2021-07-04 00:38:17 +00:00
Chompstation Bot
42cbf0e1e5
Port Eris mining satchel sprites, satchel of holding
2021-07-03 20:17:02 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Razgriz
4b12522947
powder that makes you say yes
2021-06-24 18:47:01 -07:00
Razgriz
0729e59233
powder that makes you say yes
2021-06-24 17:44:58 -07:00
Chompstation Bot
fb343cec6c
[MIRROR] Linter diagnostics + bans non-var relative pathing
2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904
Port current /tg/ lighting system
2021-06-18 04:23:09 +00:00
Aronai Sieyes
709409c4e7
Merge pull request #10591 from Hatterhat/fortnite
...
i haven't slept but here's a fix pr for 10588
2021-06-10 02:20:02 +00:00
Chompstation Bot
190a2c3bb3
Portable music player, remote jukebox speaker
2021-06-06 05:25:40 +00:00
Chompstation Bot
78acd45edc
Remove extra asterisks from rune audible messages
2021-05-31 17:26:54 +00:00
Chompstation Bot
4476e4104d
Ports Runechat
2021-05-30 22:51:20 +00:00
Nadyr
8eb58d8042
powder that makes you say yes
2021-05-27 22:48:38 -04:00
Nadyr
92e1743b5c
Merge branch 'master' into upstream-merge-10401
2021-05-27 22:40:15 -04:00
Nadyr
e33c671a92
powder that makes you say yes
2021-05-27 22:39:00 -04:00
Nadyr
dc13ab6d4a
powder that makes you say yes
2021-05-27 22:36:58 -04:00
Nadyr
2e073a6f5a
powder that makes you say yes
2021-05-27 22:30:33 -04:00
Nadyr
9f9382f472
powder that makes you say yes
2021-05-27 22:25:52 -04:00
Nadyr
42d551e1aa
powder that makes you say yes
2021-05-27 22:21:02 -04:00
Chompstation Bot
d76e756e5f
[MIRROR] Reverts recipe changes from Industrial Expansion
2021-05-27 17:17:01 +00:00
Chompstation Bot
20e3b0a2d3
[MIRROR] Linter Introduction + Cleanup
2021-05-27 16:31:50 +00:00
Aronai Sieyes
2d4853ca4f
Merge pull request #10310 from Novacat/nova-pathfinder
...
Mecha Balance and Fighter Fixes
2021-05-15 17:17:36 +00:00
Chompstation Bot
ca996648dd
[MIRROR] Oops, I refactored Chemistry!
2021-05-08 23:59:34 -04:00
Razgriz
962992d171
Added safety lock feature to phaseguns, same as frontier phaser
...
Added safety lock feature to phaseguns, same as frontier phaser
2021-03-31 01:35:35 -07:00
Chompstation Bot
b7b8682e7c
[MIRROR] Added think-tanks.
2021-03-18 14:57:26 +00:00
Razgriz
6e171d3182
Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396
...
[MIRROR] [MIRROR] Matter Matters
2021-03-16 22:22:28 -07:00
Nadyr
57b6444745
Merge pull request #1568 from CHOMPStationBot/upstream-merge-9904
...
[MIRROR] Updates the _vr recipies to include copper
2021-03-12 01:10:27 -05:00
