Hawk_v3
ff20e10352
Merge remote-tracking branch 'upstream/master'
2019-07-20 22:51:13 +01:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Anewbe
03ff9fa0fe
Merge pull request #6284 from Atermonera/weather_app_atmos_reading
...
fixes communicator weather app's air reading
2019-07-19 16:19:36 -04:00
Atermonera
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
Hawk_v3
124afe1cbc
Merge remote-tracking branch 'upstream/master'
2019-07-07 18:41:28 +01:00
Spades
5a7bdcebf4
Merge pull request #5378 from Novacat/nova-survival
...
Minor Fixes
2019-07-05 07:04:18 -04:00
Hawk_v3
f7a7183d0e
Merge remote-tracking branch 'upstream/master'
2019-07-04 18:16:01 +01:00
Atermonera
c4c8457a82
Merge pull request #6266 from Mechoid/StopSecurityFromBlowingTheirTops_Flashfix2
...
Flashes actually work as said on the tin.
2019-07-03 23:10:55 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Atermonera
4f601a94b8
Merge pull request #6248 from Heroman3003/gpsing
...
Adds more GPS variety
2019-07-01 20:47:22 -04:00
mistyLuminescence
c406672c26
Adds two new Cargo crates!
2019-06-29 19:46:41 -04:00
Unknown
52c1d3a491
Minor Fixes
...
- Fixes problems with Alraune Breathing
- Cleans up Subspace Radio code
2019-06-26 22:38:54 -04:00
Anewbe
1adc4790be
Merge pull request #6221 from mistyLuminescence/bettersplinting
...
Head/chest/groin splints
2019-06-21 17:06:38 -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
Novacat
03a3944f36
An assortment of Lighting Stuff
2019-06-18 19:57:40 -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
70a2fa937c
Merge remote-tracking branch 'upstream/master'
2019-06-05 00:25:36 +01:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Ketrai
861f3b6086
ohno
2019-05-31 18:45:51 +02:00
Ketrai
ba79dc55d1
trash items
2019-05-31 17:41:23 +02:00
Ketrai
95edaac47c
Adds monkfish
...
ITS HOOG
2019-05-31 17:17:29 +02:00
Neerti
f5f20628fd
Merge pull request #6169 from GeneriedJenelle/patch-1
...
Ports Radial Menus
2019-05-28 14:25:49 -04: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
Mechoid
7a35723d85
Sif Animal Expansion 1
2019-05-21 19:58:19 -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
Atermonera
8e724ad32c
Merge pull request #6133 from Heroman3003/cart-tweek
...
Minor PDA cartridge tweaks
2019-05-01 14:08:33 -04:00
Novacat
9770d675c2
Update radio.dm
2019-04-29 00:10:51 -04:00
Neerti
0d76e09b7c
Shortwave and Relay Tweaks
2019-04-29 00:02:13 -04:00
Unknown
32ae85e423
Fixes oversights with last PRs
2019-04-28 23:28:19 -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
Atermonera
9ea820fd7f
Merge pull request #6058 from Neerti/permastuns_are_bad
...
Removes umbrella permastuns. Adds wind mechanics.
2019-04-26 19:32:29 -04:00
Heroman3003
e3e715454b
Makes placeholder entries for lore writing
2019-04-23 11:13:42 +10:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01: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
Novacat
bad8de00e6
Merge pull request #5095 from VOREStation/upstream-merge-6098
...
[MIRROR] Fixes laser pointers targeting through walls
2019-04-18 13:45:26 -04:00
Atermonera
8e9ba5911a
Merge pull request #6098 from Heroman3003/laserpoint-fix
...
Fixes laser pointers targeting through walls
2019-04-18 13:24:40 -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
