Commit Graph

1342 Commits

Author SHA1 Message Date
Cyrelius
74cf803b31 Update mechfab_designs_ch.dm
Fix minor mistake.
2022-02-04 23:51:45 -08:00
Cyrelius
f8a96a807f Update mechfab_designs_ch.dm
Adds the Phazon to the Exosuit fabricator's crafting menu with what I think are appropriate costs.
2022-02-03 21:31:15 -08:00
Cyrelius
1d06f2ff55 Update mechfab_designs.dm
Re-enabled the shields that Virgo disabled, though I did make them a bit higher on the tech list, and added verdantium to their cost.
2022-02-03 20:57:01 -08:00
Casey
9930be53e8 Merge pull request #12012 from Hatterhat/rad-apes-real
rad apes real
2022-01-09 01:52:38 +00:00
Casey
e773ca01c9 Merge pull request #11832 from Hatterhat/pad-booster
mechaport gaming
2021-12-10 02:51:14 +00:00
Nadyr
d1a3c9057b Merge pull request #3237 from CHOMPStation2/upstream-merge-11905
[MIRROR] Makes stomach organs printable in bioprinter and prosfab
2021-12-05 12:07:07 -05:00
Nadyr
358dfd3f99 powder that makes you say yes 2021-12-05 11:54:45 -05:00
Nadyr
1406500432 powder that makes you say yes 2021-12-05 11:51:30 -05:00
Chompstation Bot
3caad465fa the part printing buff nobody asked for 2021-10-27 21:05:26 -04:00
Chompstation Bot
536a6cb6e7 [WIP] Atmospheric Retention Fields 2021-10-27 18:39:20 +00:00
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