Hawk_v3
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
Unknown
10f290106c
Ports pan-slavic from Baystation
2019-09-18 15:57:30 -04:00
Hawk_v3
a333c03a3c
Merge remote-tracking branch 'upstream/release'
2019-09-14 17:10:36 +01:00
Novacat
ab256b75b3
Merge pull request #5846 from Novacat/nova-basicfixes
...
Shelter Capsule Improvements
2019-09-14 00:38:45 -04:00
Unknown
5e2abf9fd4
This is becoming a shelter capsule PR
2019-09-12 22:50:03 -04:00
Unknown
a94aaac8fb
More tweaks
2019-09-09 23:37:41 -04:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
Anewbe
083a0634a0
Merge pull request #6429 from Heroman3003/idfix
...
Fixes editing colony director IDs editing global 'station access' list
2019-08-29 18:27:58 -04:00
Novacat
a006728e5d
Merge pull request #5708 from Novacat/nova-basicfixes
...
Minor Fixes
2019-08-29 15:07:28 -04:00
Unknown
14eb525030
Adjusts Vorestation pills and pillbottles
2019-08-28 04:06:19 -04:00
Novacat
ffb66290db
Merge pull request #5726 from VOREStation/upstream-merge-6418
...
[MIRROR] Shards Do Damage to Holder
2019-08-28 01:54:38 -04:00
Atermonera
2162dbfa0b
Merge pull request #6418 from MisterLayne/glass_shard_self_harm
...
Shards Do Damage to Holder
2019-08-28 01:25:47 -04:00
Atermonera
bf558eacfd
Merge pull request #6417 from MisterLayne/conductivity_fix
...
Non-conductive Things Do Not Conduct
2019-08-28 01:24:24 -04:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Novacat
775d175b11
Merge pull request #5682 from VOREStation/upstream-merge-6358
...
[MIRROR] Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 18:02:59 -04:00
Atermonera
8f067fe785
Chemistry Expansion
2019-08-21 17:43:01 -04:00
Mechoid
ae48659a68
Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 17:23:07 -04:00
Heroman
4b0cc1810e
Fixes a typo
2019-08-18 05:34:13 +10:00
Heroman
e0138738f4
Limits new equipment properly
2019-08-17 12:35:44 +10:00
Heroman
3e9456125a
Restricts friendly manhack grenades to offstation use
2019-08-15 20:12:59 +10:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc
Adds NOCONDUCT to Some Items
2019-08-08 16:07:50 -04:00
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
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Atermonera
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01: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
Hawk_v3
5ec6b3294e
Merge remote-tracking branch 'upstream/master'
2019-06-18 01:26:30 +01:00
Novacat
13739440c2
Grey scale pills and colored pillbottles
2019-06-16 21:28:56 -04:00
Hawk_v3
129ac045e7
Merge remote-tracking branch 'upstream/master'
2019-06-12 18:47:10 +01:00
Neerti
21244ade2f
Merge pull request #6204 from Ketrai/worms
...
Adds worms
2019-06-11 17:35:11 -04:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Atermonera
ef4c7b6601
Merge pull request #6172 from mistyLuminescence/contacts
...
Makeover Kit
2019-05-28 13:10:09 -04:00
Hawk_v3
c2d90f5c3f
Merge remote-tracking branch 'upstream/master'
2019-05-23 22:46:42 +01: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
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01: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
