izac112
|
87ce13b27c
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
|
2024-12-04 15:17:00 +01:00 |
|
izac112
|
a2ad915045
|
Device and weapon
|
2024-12-01 00:56:26 +01:00 |
|
izac112
|
058f219cb9
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
|
2024-11-30 23:30:26 +01:00 |
|
Killian
|
9fff34e6ad
|
attachable knuckledusters and force transfer
|
2024-11-07 03:06:56 +00:00 |
|
Guti
|
409aaba802
|
Remove
|
2024-09-09 02:36:53 +02:00 |
|
izac112
|
4088f40cc9
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2023-08-24 18:27:07 +02:00 |
|
Heroman
|
63e9a069be
|
Compatibility fixes
|
2023-07-07 17:17:49 +10:00 |
|
 VarlaisveaandVirgoBot
|
1ae49ef905
|
the little construction pr
|
2023-03-08 23:24:56 -05:00 |
|
izac112
|
891967a990
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2022-06-06 15:26:15 +02:00 |
|
FartMaster69420
|
53826a8a76
|
Initial
Making sleevecards a subtype of pais
|
2022-05-10 19:48:41 -04:00 |
|
izac112
|
235cd04931
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2022-04-09 10:50:28 +02:00 |
|
Heroman
|
f4d1f825f7
|
Nerfs gravitons and morphium, adds lots of boards into autolathe
|
2022-04-09 05:44:36 +10:00 |
|
izac112
|
74ee064587
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2022-03-07 16:16:38 +01:00 |
|
klaasjared
|
dc2bc419c1
|
Secondary Commit
|
2022-02-28 22:17:03 -05:00 |
|
izac112
|
da08b34a6e
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-12-22 15:31:10 +01:00 |
|
PastelPrinceDan
|
1efc116c6a
|
also adds a cost to normal autoinjectors
|
2021-12-16 08:50:32 +00:00 |
|
PastelPrinceDan
|
7b3bafdf38
|
cheaper :)
|
2021-12-16 08:30:01 +00:00 |
|
izac112
|
baf5a6a16f
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-09-24 12:10:50 +02:00 |
|
PastelPrinceDan
|
8e53affbe4
|
woo yeah hypos
|
2021-09-10 23:16:57 +01:00 |
|
izac112
|
bc2cf1c838
|
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-07-13 10:07:19 +02:00 |
|
Aronai Sieyes
|
7f4b0f37b8
|
Add RSF to autolathes
|
2021-07-12 19:36:38 -04:00 |
|
izac112
|
dd8893112f
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-07-08 09:40:23 +02:00 |
|
Aronai Sieyes
|
b71c7e7271
|
Use material defines more
|
2021-07-03 18:18:05 -04:00 |
|
izac112
|
ffc6a2a369
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-06-18 17:01:47 +02:00 |
|
ShadowLarkens
|
1b043d1938
|
Autolathe: Make 'All' show sheets
|
2021-06-12 18:17:48 -07:00 |
|
izac112
|
b9034ce50b
|
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-05-28 06:15:01 +02:00 |
|
 AtermoneraandVirgoBot
|
7cfd8f3435
|
Wall-mounted Geiger Counters
|
2021-05-23 15:40:14 -04:00 |
|
izac112
|
554f907cab
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-04-12 10:09:54 +02:00 |
|
 
|
3fa568de5e
|
Autolathes don't spam debug on first use (#8019)
Co-authored-by: atermonera <matthew.forsland@revature.net>
|
2021-04-10 03:42:31 -04:00 |
|
izac112
|
2dedb1bdde
|
Voreupdate WIP
|
2021-04-09 09:36:25 +02:00 |
|
Aronai Sieyes
|
4690411915
|
Remove unnecessary 'signatures'
|
2021-04-08 12:39:14 -04:00 |
|
izac112
|
9c6581fe6c
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-03-11 17:36:42 +01:00 |
|
Unknown
|
190b805cad
|
this sucks
|
2021-03-09 15:49:07 -05:00 |
|
Heroman
|
8edc4f0fe3
|
Adds a bunch more boards to technical storage + AI law storage + makeable appliances
|
2021-03-07 04:31:34 +10:00 |
|
 MechoidandVirgoBot
|
ea73111f61
|
Industrial Expansion
|
2021-01-27 23:30:50 -05:00 |
|
izac112
|
de62fa4e48
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
|
2021-01-25 16:47:15 +01:00 |
|
 MechoidandVirgoBot
|
02ffbbe79b
|
Gadgets & Gizmos
|
2021-01-15 01:56:01 -05: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 |
|
 NovacatandGitHub
|
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 |
|
 VerkisterandGitHub
|
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 |
|
 AtermoneraandVirgoBot
|
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 |
|
 MechoidandVirgoBot
|
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 |
|