cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,276 Commits 5 Branches 0 Tags
b85e9fc4d936d456be9dc8b2e9dd34cec07ee2c6
Commit Graph

123 Commits

Author SHA1 Message Date
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
247bcbcc24 Adds a bunch more boards to technical storage and AI law storage, makes appliance boards makeable in autolathe 2021-03-06 23:21:40 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
9d8f2623de More thingus 2020-09-14 14:09:52 +02:00
izac112
b4615a306a reverts to old lathe and fixes one of the build errors related to it 2020-09-14 13:37:03 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02: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
Novacat
c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix 
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
 2020-08-21 17:16:44 -04:00
Verkister
929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Meghan-Rossi
470d76db4b Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers 
*Removes some autolathe entries made redundant by https://github.com/VOREStation/VOREStation/pull/8784
*Makes glass carafes and plastic pitchers batch-printable
 2020-08-21 07:58:44 +01:00
Atermonera
4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
Rykka
e9ed73f6b5 Makes Pint Metaglasses Printable 
TL;DR Only Virgo and downstreams can print metaglasses, but we never added printing for the pint version.
 2020-08-19 16:52:41 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
Atermonera
6c3273bd20 Merge pull request #7444 from Mechoid/FixAutolatheForging 
Removes the ability to forge plasteel from steel.
 2020-08-12 14:21:01 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Novacat
088f634374 Update general.dm 2020-08-05 21:13:30 -04:00
Novacat
40c08685d2 Update general.dm 2020-08-05 19:35:33 -04: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
Mechoid
78b51c58b4 Fish tank 2020-08-01 23:46:08 -04:00
izac112
390441705b unit tests 2020-07-25 15:52:25 +02:00
SplinterGP
7a2de0520d Weapons changes 2020-07-20 22:12:01 -03:00
SplinterGP
2424a9f6d7 More autolathe fixes and icon stuff 2020-06-23 22:01:48 -03:00
SplinterGP
bc5d25c208 autolathe fixes 2020-06-22 22:55:58 -03:00
izac112
6a7192c93f Update tools_1.dm 2020-05-13 10:23:37 +02:00
izac112
268443695b Revert "Probably a revert after this" 
This reverts commit 1d5ba3f493.
 2020-05-13 09:51:27 +02:00
izac112
1d5ba3f493 Probably a revert after this 
Probably getting reverted but worth a shot.
 2020-05-13 09:43:51 +02:00
SplinterGP
75c9b2fcd2 Removes few extra span that shoulnd't be there 2020-05-13 01:47:28 -03:00
SplinterGP
353576067a Typo 2020-05-13 01:29:44 -03:00
SplinterGP
e3f0f5eb3d More autolathe stuff 2020-05-12 23:39:23 -03:00
SplinterGP
c60d52d4ca saved 2020-05-07 23:01:47 -03:00
SplinterGP
163c8665a0 gotta manually add starting recipes from other machines 2020-05-06 01:27:26 -03:00
SplinterGP
ae56354145 Autolathe fix for removing trouble on unit test, also does disks 2020-05-06 00:45:04 -03:00
Killian
24b507ad9c scatter speedloader & box printing 2020-05-05 16:17:28 +01:00
SplinterGP
78f4a2fd3f Autolathe patch, fixes teleporter stuff making it buildable 2020-04-30 20:08:06 -03:00
SplinterGP
ca09ee6305 Autolathe fixes 2020-04-22 02:09:01 -03:00
SplinterGP
8d11d31b39 fixes more ID issues 2020-04-19 00:21:37 -03:00
SplinterGP
107c4bcb81 fixes ID issue 2020-04-19 00:20:38 -03:00
SplinterGP
d577c0ee11 more hotfixes 2020-04-18 19:26:18 -03:00
SplinterGP
4d5f1282b7 adds missing top mounted SMG magazines 2020-04-18 18:50:01 -03:00
SplinterGP
a392107d69 fixes wrong pathes into designs 2020-04-18 18:45:46 -03:00
SplinterGP
70987889c0 adds missing designs for autolathe 2020-04-18 18:42:59 -03:00
SplinterGP
7d633c306b removes debug 2020-04-16 00:30:12 -03:00
SplinterGP
8228c60f4d Adds new autolathe interface for testing before sending to polaris/virgo 2020-04-16 00:16:52 -03:00
SplinterGP
07e4d28fb7 Balances and finishes scattershot stuff 2020-03-24 20:45:39 -03:00
Repede
03af76bd29 Merge branch 'master' into releaseupdate 2020-03-02 19:40:13 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00