Casey
dc618675c1
Shotguns and Bolt-Action Rifles
2022-03-21 09:54:13 +00:00
Razgriz
d80abb7ec2
powder that makes you say yes
2022-03-18 18:46:26 -07:00
Casey
c0231159bc
Adding Mining AOE PKA Upgrade to the Protolathe
2022-03-15 00:00:33 +00:00
Casey
765f4cd2b3
More Upgrade Modules for Borgs
2022-03-12 20:44:57 +00:00
Razgriz
c09ad1baa9
powder that makes you say yes and hate the map changes
2022-03-04 15:23:33 -07:00
Casey
80f5298a18
Ammo Boxes
2022-03-03 21:23:43 +00:00
Cyrelius
baba26d565
Merge branch 'CHOMPStation2:master' into master
2022-02-08 23:29:16 -08:00
Cyrelius
7a30bfb9d5
Update mechfab_designs_ch.dm
...
Missed a line break. un-missed.
2022-02-08 23:28:06 -08:00
Cyrelius
aa6821e8a1
Update mechfab_designs_ch.dm
...
Fix minor spelling mistake.
2022-02-08 23:27:14 -08:00
Cyrelius
79182736ed
Update circuits_ch.dm
...
Add Phazon circuits to the circuit imprinter.
2022-02-08 23:26:10 -08:00
Nadyr
77f4e9fb63
Merge pull request #3627 from CHOMPStation2/upstream-merge-12144
...
[MIRROR] exosuit cargo expansion equipment
2022-02-06 21:51:00 -05:00
Casey
1eabc49fc5
Merge pull request #12144 from Hatterhat/special-compartment
...
exosuit cargo expansion equipment
2022-02-06 23:23:09 +00:00
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
