cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,425 Commits 5 Branches 0 Tags
b456b5287b3bdd2da43b51a226c1031c69efe957
Commit Graph

143 Commits

Author SHA1 Message Date
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
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
190a2c3bb3 Portable music player, remote jukebox speaker 2021-06-06 05:25:40 +00:00
Nadyr
8eb58d8042 powder that makes you say yes 2021-05-27 22:48:38 -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
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
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
Nadyr
3a7013855f Update medical_vr.dm 2021-03-12 00:45:57 -05:00
Nadyr
cd3aecf006 Update mining_toys.dm 2021-03-11 23:49:45 -05:00
Chompstation Bot
d2e828454f Updates the _vr recipies to include copper 2021-03-10 20:46:03 +00:00
Chompstation Bot
4c8dab8a21 [MIRROR] Adds an advanced version of the mining drill scanner. 2021-03-10 19:17:39 +00:00
Nadyr
d04c4f7b73 Update weapons.dm 2021-03-10 00:51:39 -05:00
Nadyr
c4a5f1a238 Update power_cells.dm 2021-03-10 00:41:59 -05:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Novacat
ebf0391948 Merge pull request #9865 from Heroman3003/sizespace-suit 
Adds HYPER suit
 2021-03-08 16:06:23 +00:00
Test Turtle
5ff44857e0 satchel of holding added 2021-03-06 17:34:10 -08:00
Nadyr
c73797662f Update engineering.dm 2021-02-14 07:16:39 -05:00
Chompstation Bot
6f2b456c79 Add Rapid Pipe Dispenser to R&D 2021-02-11 13:28:31 +00:00
Razgriz
ea80be587b Merge pull request #750 from MisterGrimm/GoodbyeMicromechs 
Commenting out micro mech stuff
 2021-01-08 15:20:57 -07:00
r4d6
e4f101a670 Uncomment Phase Weaponry 
Phase Weaponry can be printed again.
 2020-11-10 12:34:52 -05:00
Sym
1173ddf675 Remove micro mech stuff 
Time to take out the trash.
 2020-10-23 20:17:07 -04:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Cadyn
cffafc866c fix point control 2020-09-08 19:46:59 -07:00
Cadyn
99f8008072 Point defense control no longer named deluxe microwave 2020-09-08 08:03:26 -07:00
Darlantan
09768ea90c Confetti cannon 
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
 2020-09-05 07:15:49 -04:00
Heroman3003
33f85fc4d6 Makes the vorelaw boards makeable 2020-09-01 16:34:24 +10:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Mechoid
ccd5993b38 Exosuit Upkeep (#7473) 
* Exosuit upkeep, lower slowdown of Durand and Gygax components, guns now slow far less.

* Time time time.

* Seeds survive. For now.
 2020-08-17 18:19:51 -04:00
LunarFleet
5e22710209 Take two 2020-08-13 09:54:11 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Mechoid
c20bab52d4 Exosuit Modular Internals, The Squeakening 2020-08-05 19:22:23 -04:00