Aronai Sieyes 42f6ffef04 Merge pull request #3913 from VOREStation/upstream-merge-5365 ...

[MIRROR] Alien Cable Coil Fix

2018-06-23 22:01:36 -04:00

..

admin

Move planets to SSplanets

2018-06-15 19:05:38 -04:00

alarm

…

assembly

Fixes #5083

2018-05-27 21:40:45 -04:00

awaymissions

Map changes for explorers

2018-05-09 11:36:26 -05:00

blob

…

blob2

…

busy_space

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

busy_space_vr

ONI ship names, updated work roles

2018-04-14 23:38:27 -04:00

client

Enforce minimum age limit across all characters

2018-06-12 20:14:03 -04:00

clothing

Merge pull request #5349 from Woodratt/WR6112018_clothingfix

2018-06-14 10:54:14 -04:00

customitems

…

detectivework

…

economy

Fix various syntactic problems

2018-05-16 21:43:18 -07:00

entopics_vr

…

error_handler

…

events

Fix merge conflict, update virgo planet things

2018-06-16 10:43:45 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

…

holomap

VS: The VS excludes for SSAO

2018-05-14 11:54:10 -04:00

hydroponics

Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst

2018-06-06 18:50:34 -04:00

icon generation

…

integrated_electronics

Recharger refactor

2018-06-16 17:15:59 -04:00

library

…

lighting

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

lore_codex

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

maps

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

materials

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018

2018-05-27 19:26:12 -04:00

media

…

metric

…

mining

Merge pull request #5333 from Anewbe/mining_turf_tweak

2018-06-09 15:42:55 -04:00

mob

Fix AI-drone runtimes. Get angry at commits. (#5366)

2018-06-21 03:19:27 -04:00

multiz

Sky is not a 'skiy' (#5344)

2018-06-11 14:11:16 -04:00

nano

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

nifsoft

Fix promthean NIF shoving

2018-05-23 22:47:29 -04:00

organs

Merge branch 'master' into upstream-merge-5335

2018-06-16 17:43:55 -04:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

persistence

…

planet

Weather is shorter, hail is less deadly.

2018-06-16 14:02:09 -04:00

power

Alien Cable Coil Fix (#5365)

2018-06-21 03:26:14 -04:00

projectiles

Merge pull request #3894 from VOREStation/upstream-merge-5356

2018-06-17 19:24:16 -04:00

random_map

…

reagents

More biomass for the noms purposes

2018-06-16 14:45:18 -04:00

recycling

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

research

More Phase Guns

2018-06-17 13:35:54 -04:00

resleeving

Fix resleeving UI, make compatible

2018-06-16 14:39:55 -04:00

rogueminer_vr

…

scripting

…

security levels

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

shieldgen

Recharger refactor

2018-06-16 17:15:59 -04:00

shuttles

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

spells

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

surgery

Merge pull request #5314 from VOREStation/pol-encasedfracture

2018-05-31 22:06:59 -04:00

tables

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

telesci

Mostly comment out advanced GPSes

2018-05-17 15:38:07 -04:00

tension

…

tooltip

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Merge pull request #3863 from Verkister/transflavor

2018-06-15 09:02:56 -04:00

xenoarcheaology

Merge pull request #5331 from Mechoid/SmallAnomalistFixes

2018-06-06 18:50:45 -04:00

xenobio

…

xenobio2

…

xgm

…