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
70,047 Commits 5 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

168 Commits

Author SHA1 Message Date
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
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Novacat
de6f55a86d Update circuits.dm 2020-07-30 15:19:40 -04:00
Atermonera
31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -04:00
izac112
38288b15c6 Voreupdate (small) 2020-07-27 06:34:28 +02:00
Cyantime
5eefadf78b Update netgun design name 2020-07-26 17:06:57 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Rykka
c27b2d2234 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 22:14:04 -04:00
Rykka
886ab72289 Huge Bundle of Fixes, Update Cooking to current Aurora 
Cooking times are now no longer 10-15 minutes per item, the LARGEST items will take around ~4-5 minutes, 6 at the maximum in the case of the superbigbite (one of the most filling food items in the game).
Cooking oil tanks added
Appliances are now constructible instead of being eldritch black magic
Recipes are now reorganized to either fryer/oven/grill based on where they're made (Although recipes_microwave still needs a LOT more sorting)
Critical time bug with cooking fixed, AND you can now upgrade your appliances for even higher efficiencies!
 2020-07-22 21:34:13 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
b221449d05 Update engineering.dm 2020-06-09 16:16:59 +02:00
izac112
983712e4cb Dum dum dum dum, dum. 2020-06-08 22:42:53 +02:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
SplinterGP
63fe5f0529 Costs half a ingot to fabricate 
Co-authored-by: Izac Joof Forsgren <izac10@live.com>
 2020-05-21 12:39:52 -03:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
SplinterGP
c2b89869f7 Adds olds style net gun back as a new one 2020-05-20 19:58:25 -03:00
Izac Joof Forsgren
19175c4c72 Merge branch 'master' into izac-voreupdate 2020-05-13 09:16:09 +02:00
SplinterGP
e3f0f5eb3d More autolathe stuff 2020-05-12 23:39:23 -03:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Novacat
55d1c001d0 Update misc.dm 2020-05-10 09:03:45 -04:00
Aronai Sieyes
215020e345 Add bluespace flare to research designs 2020-05-09 18:09:13 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
SplinterGP
ae56354145 Autolathe fix for removing trouble on unit test, also does disks 2020-05-06 00:45:04 -03:00
Aronai Sieyes
216873f12d Port Bay vitals monitors 2020-05-03 22:18:19 -04:00
SplinterGP
78f4a2fd3f Autolathe patch, fixes teleporter stuff making it buildable 2020-04-30 20:08:06 -03:00