if there were two guys on the moon
4baf7a58e7
VS edit
2019-07-19 09:29:02 +01:00
if there were two guys on the moon
f4f2d6bf08
defib
2019-07-19 09:24:07 +01:00
if there were two guys on the moon
d6891f3bb2
defib scanners
2019-07-19 09:07:55 +01:00
Novacat
d48861c7e3
Merge pull request #5469 from VOREStation/upstream-merge-6245
...
[MIRROR] The great rock update.
2019-07-14 01:36:40 -04:00
Novacat
d8c3d23e60
Merge pull request #5465 from VOREStation/upstream-merge-6272
...
[MIRROR] Mining Expansion, the Diggening.
2019-07-14 01:36:27 -04:00
Atermonera
22c5967269
The great rock update.
2019-07-13 18:21:45 -04:00
Atermonera
9325f590ca
Mining Expansion, the Diggening.
2019-07-13 03:48:38 -04:00
Atermonera
9c8a3803ff
Merge pull request #6294 from Heroman3003/plastic-unflap
...
Makes airtight plastic flaps less of a free pass
2019-07-12 02:52:51 -04:00
Hawk_v3
4668b23fea
Merge remote-tracking branch 'upstream/master'
2019-07-10 01:50:50 +01:00
Atermonera
1472642b88
Merge pull request #6262 from Mechoid/CivilianExpansion1
...
Civilian Expansion 1: The Plantening
2019-07-07 17:29:32 -04:00
Hawk_v3
124afe1cbc
Merge remote-tracking branch 'upstream/master'
2019-07-07 18:41:28 +01:00
Heroman
706e75449d
Makes trash pile components have random sprites.
2019-07-06 08:06:51 +10: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
Novacat
e679bac06b
Merge pull request #5425 from VOREStation/upstream-merge-6266
...
[MIRROR] Flashes actually work as said on the tin.
2019-07-04 12:41:18 -04: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
Atermonera
1c6ff4f9fd
Merge pull request #6263 from Nalarac/patch-6
...
Nerfs Simple Doors
2019-07-03 23:08:19 -04:00
Anewbe
8f1c86d473
Merge pull request #6259 from Heroman3003/flowerfix
...
Fixes ppflowers having no icon sometiems
2019-07-03 13:09:35 -04:00
Hawk_v3
bc7ea8379a
Merge remote-tracking branch 'upstream/master'
2019-07-02 17:54:29 +01:00
Heroman
2965503cbd
Adds new GPSs
2019-07-02 12:04:17 +10:00
Novacat
cf9986a2f2
Merge pull request #5406 from VOREStation/upstream-merge-6248
...
[MIRROR] Adds more GPS variety
2019-07-01 21:09:34 -04:00
Atermonera
4f601a94b8
Merge pull request #6248 from Heroman3003/gpsing
...
Adds more GPS variety
2019-07-01 20:47:22 -04:00
Atermonera
3d31a77514
Multi-Tile Objects, Multi-Tile Hovershuttle
2019-07-01 20:43:53 -04:00
Heroman
c11a1fc16e
Fixes spawning of action figures in crates.
2019-07-01 06:49:27 +10:00
mistyLuminescence
c406672c26
Adds two new Cargo crates!
2019-06-29 19:46:41 -04:00
if there were two guys on the moon
d5f380984f
Medbeam
2019-06-29 20:04:47 +01:00
Anewbe
d731589ba0
Merge pull request #6238 from Heroman3003/broken-components
...
QoL improvements for broken components
2019-06-29 04:08:30 -04:00
Unknown
52c1d3a491
Minor Fixes
...
- Fixes problems with Alraune Breathing
- Cleans up Subspace Radio code
2019-06-26 22:38:54 -04:00
Spades
664fcbcffe
Merge pull request #5359 from VOREStation/upstream-merge-6206
...
[MIRROR] tinytweaks
2019-06-21 18:13:49 -04:00
mistyLuminescence
711e807d32
tinytweaks
2019-06-21 17:07:51 -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
Woodratt
8c3a430e8d
June Map Adjustments
2019-06-18 13:34:12 -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
a251e5bfc8
Merge pull request #5342 from VOREStation/upstream-merge-6199
...
[MIRROR] Grey scale pills and colored pillbottles
2019-06-16 22:02:21 -04:00
Novacat
13739440c2
Grey scale pills and colored pillbottles
2019-06-16 21:28:56 -04:00
Anewbe
223dc48961
Merge pull request #6218 from Mechoid/RandomSpawnerFix
...
Fixes random item spawners not self-deleting.
2019-06-16 20:57:20 -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
Atermonera
ddb0b7df2b
Merge pull request #6188 from Mechoid/PuzzleFix
...
Fix Puzzledoors not being locked when no lock is found.
2019-06-04 13:12:22 -04:00
Spades
1ddecf112e
Merge pull request #5292 from Ketrai/fishbranch
...
Adds lobsters and cuttlefish
2019-06-03 21:06:22 -04:00
Hawk_v3
7bb9c92c9a
Merge remote-tracking branch 'upstream/master'
2019-06-03 12:31:48 +01:00
Neerti
5a3040a08d
Merge pull request #6183 from Mechoid/FixPrecursotechOversights
...
Fixes some Precursotech oversights.
2019-05-31 22:18:00 -04: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
Novacat
ae20565d46
Merge pull request #5286 from VOREStation/upstream-merge-6154
...
[MIRROR] Sif Trees and Icon Scaling
2019-05-30 13:15:12 -04:00
