Commit Graph

31 Commits

Author SHA1 Message Date
Artur
0e4d4811db Rebuild 2020-02-13 17:53:21 +02:00
Artur
c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
Artur
ccf6f6720b Recompile 2020-02-12 16:23:45 +02:00
Artur
21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
Artur
ce46f8fdd7 Fixes the buttons not graying out 2020-02-12 16:13:24 +02:00
Artur
a9a167b9d3 Suffering and co 2020-02-11 20:18:32 +02:00
Artur
8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
kevinz000
c29e0e1a1d Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
2020-02-10 04:16:14 -07:00
Ghommie
9a2107bf1a This one too. 2020-02-09 00:48:14 +01:00
Artur
b615be1248 Should hopefully work.. 2020-02-07 18:20:09 +01:00
Artur
f0b22a119d Interface routing and modifying uplink component 2020-02-05 20:03:36 +01:00
Seris02
d0100345fd done hopefully 2020-02-05 17:00:38 +08:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Artur
72f4df82b6 Recompile for tgui next 2020-02-04 13:11:55 +01:00
Artur
614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00
Artur
4bd916d08a Adds the initial crafting UI stuff. 2020-02-04 10:28:53 +01:00
Putnam
8fa826ba1f Updated relief valve UI to tgui-next 2020-02-03 02:59:18 -08:00
Artur
db36a90e35 Fixes. 2020-01-30 19:23:38 +01:00
Artur
6529a34dbc Reviever suggestions
HTML doesnt need compiling.
2020-01-25 15:18:18 +01:00
Artur
ff8289c177 Fixes 2020-01-24 18:48:50 +01:00
Artur
901d3e7a15 Mulebot button fix port 2020-01-23 11:31:41 +02:00
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
Artur
782125b339 Backend? 2020-01-20 13:42:10 +02:00
Artur
1f718df41a Reverts crafting changes 2020-01-16 14:26:36 +02:00
Artur
329b37cd67 Removes uplink 2020-01-16 12:32:46 +02:00
Artur
6e4829e971 Really works properly now 2020-01-16 11:33:05 +02:00
Artur
bede695ebd Undoes minter changes 2020-01-15 09:49:57 +02:00
Artur
5c9b59aa74 Ready for testmerge 2020-01-15 09:44:29 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Artur
6e3206a2e4 Why the fuck did the rest of the stuff dissapear 2020-01-15 09:37:23 +02:00
Artur
25ce2f545b iNITIAL 2020-01-15 09:33:17 +02:00