Commit Graph

3096 Commits

Author SHA1 Message Date
Anewbe
7977f50b1c Merge pull request #6359 from Nalarac/patch-5
Updates Supermatter Guide Book
2019-08-02 14:06:45 -04:00
Novacat
d5b416f70b Merge pull request #5542 from VOREStation/upstream-merge-6328
[MIRROR] Makes Heavy-Duty Cell Chargers Constructable
2019-07-31 02:10:06 -04:00
Atermonera
35e0eeec78 Makes Heavy-Duty Cell Chargers Constructable 2019-07-30 20:18:33 -04:00
Atermonera
60c415cf64 Adds shutoff valve monitor 2019-07-30 20:04:51 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
mistyLuminescence
c406672c26 Adds two new Cargo crates! 2019-06-29 19:46:41 -04:00
mistyLuminescence
e50b9d0cc0 Serenity (#6208)
* Serenity

* travis

* adminspawn

* I greatly appreciate all detailed and informative feedback provided. Per request, the Serenity is currently adminspawn-only; a new PR will be made in two weeks to add it to Robotics and resolve any issues encountered during the testing period.

* Comments out circuit for two-week testing period
2019-06-21 00:14:05 -04:00
Mechoid
595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215)
* MakeMeleeGreatAgain

* Where is melee defined?!
2019-06-18 05:51:23 -04:00
Novacat
13739440c2 Grey scale pills and colored pillbottles 2019-06-16 21:28:56 -04:00
Neerti
21244ade2f Merge pull request #6204 from Ketrai/worms
Adds worms
2019-06-11 17:35:11 -04:00
Atermonera
ef4c7b6601 Merge pull request #6172 from mistyLuminescence/contacts
Makeover Kit
2019-05-28 13:10:09 -04:00
mistyLuminescence
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Neerti
5ed3916de3 Merge pull request #6166 from Sebbe9123/fixholoprojectors
Lets sec people carry holoprojectors in their belts
2019-05-20 18:43:52 -04:00
Unknown
07b866b2f8 Last Second Tweaks
- Swaps trash pile money breifcase with something more balanced.
- Adds emergency softsuit box to luxury capsules.
2019-05-03 16:32:21 -04:00
Unknown
27565f4da9 Boxed emergency suits 2019-05-03 03:06:00 -04:00
Unknown
68649aeb71 Recommended changes 2019-05-02 17:38:26 -04:00
Unknown
1b1489d8cc Adds medicíne pills/bottles for adminbus 2019-05-02 17:08:39 -04:00
Neerti
16b3b58259 [REVIEW] Ports Modular Computers from Baystation 2019-04-28 22:06:40 -04:00
Novacat
b9a1fa29d6 Merge pull request #5111 from Heroman3003/people-cant-have-nice-things
Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch
2019-04-27 22:49:53 -04:00
Heroman
727ecd39a8 Removes glucose autoinjectors from vendomats 2019-04-21 16:06:49 +10:00
Atermonera
6dc9f9a946 Merge pull request #6102 from Heroman3003/taping-it-all-up
Fixes taperolls not being usable on tiles with directional windows
2019-04-20 20:28:00 -04:00
Atermonera
2869ad6f73 Merge pull request #6106 from chaoko99/Pullbox
ore bags will now automatically pick up ore and dump them into a box if one is being pulled.
2019-04-18 13:19:50 -04:00
Novacat
6a287c7e1f Merge pull request #5085 from VOREStation/upstream-merge-6026
[MIRROR] Precursotech Janus
2019-04-18 02:19:31 -04:00
Mechoid
fc43527ac7 Adds Robobags (#6059)
* Adds Robobags

* Finishes robobags

* FixFix
2019-04-18 01:40:39 -04:00
Atermonera
b7e9934206 Precursotech Janus 2019-04-18 00:33:20 -04:00
Neerti
197bedb2eb Merge pull request #6086 from Heroman3003/welder-fires
Fixes self-refueling welders starting fires when off
2019-04-15 18:31:37 -04:00
Novacat
f391ddad02 Merge pull request #5038 from VOREStation/upstream-merge-6028
[MIRROR] Precursotech Tools
2019-04-14 02:29:25 -04:00
Novacat
47dac87f75 Merge pull request #5037 from VOREStation/upstream-merge-6027
[MIRROR] Anomalotech Charge Sword
2019-04-14 02:22:02 -04:00
Neerti
9c28b82c6c Merge pull request #6028 from Mechoid/Precursotech_Tools
Precursotech Tools
2019-04-14 02:20:07 -04:00
Neerti
94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword
Anomalotech Charge Sword
2019-04-14 01:21:05 -04:00
Neerti
d2cb1f67a3 Merge pull request #6024 from Mechoid/Precursotech_Sleepers
Precurso / Anomalotech Sleepers
2019-04-14 01:16:46 -04:00
Neerti
fc7c6f38b4 Base features for Precursotech and Anomalotech Expansion 2019-04-13 22:44:52 -04:00
Zap-zapper
acc9897320 Size control implant fix 2019-04-13 18:42:53 +07:00
Novacat
466516b066 Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good" 2019-04-08 15:24:27 -04:00
Heroman
b11015107c REVERT of nanoui/chemistry becoming subsystems (temp) 2019-04-05 13:30:32 +10:00
Unknown
7ecddb11de Service Keys Too 2019-04-03 15:11:06 -04:00
Unknown
2a100c5cb1 Command key box 2019-04-03 15:11:06 -04:00
Unknown
9fa575698b Conflict Resolution 2019-03-30 20:13:49 -04:00
Neerti
5967a92f02 Lynx Fixes Runtimes 2019-03-30 18:51:00 -04:00
Neerti
f8c9664178 Explorer Update - Cataloguers 2019-03-30 16:19:24 -04:00
Unknown
5ce5403b17 Apparently it exists and is in the wrong dmi 2019-03-30 00:52:46 -04:00
Unknown
42991bb551 Replaces clutch purse sprite
Sprite is temporary, but makes the item usable.
2019-03-30 00:19:09 -04:00
Unknown
baffac60fc Lynx Fixes Runtimes
There are still a couple of remaining runtimes...
2019-03-28 23:50:37 -04:00
Novacat
4801fe8c8e Merge pull request #4860 from Heroman3003/id-restorer
Added ID restoration terminal
2019-03-28 22:03:17 -04:00
Unknown
3aa0fdfda5 Removes conductive flags from VR stuff 2019-03-28 21:45:38 -04:00
Neerti
30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
Novacat
4c7370fb5d Merge pull request #4811 from VOREStation/upstream-merge-5981
[MIRROR] Handtele no longer relies on teleporter being mapped in in very specific way
2019-03-28 21:28:30 -04:00
Unknown
d3837b76e8 Conflict Resolution 2019-03-28 19:41:16 -04:00
Anewbe
8ed384b38c Rewrites Atmospherics 2019-03-28 19:25:11 -04:00
Heroman
867eac413a Adds unique icon for ID restorer (courtesy of VerySoft) 2019-03-28 15:56:47 +10:00