Aronai Sieyes f88524ca61 Merge pull request #3824 from VOREStation/upstream-merge-5319 ...

[MIRROR] Adds two new sets of robolimbs

2018-06-04 17:27:32 -04:00

..

admin

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

2018-05-28 15:55:55 -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

…

client

Pathfinder Update (#3777)

2018-05-31 16:57:40 -04:00

clothing

Pathfinder Update (#3777)

2018-05-31 16:57:40 -04:00

customitems

…

detectivework

…

economy

Fix various syntactic problems

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

entopics_vr

…

error_handler

…

events

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

2018-05-25 13:23:47 -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 #5309 from Heroman3003/melon-fix

2018-05-29 14:35:57 -04:00

icon generation

…

integrated_electronics

Fixes IC button label reference in chat messages

2018-05-06 01:40:30 -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

Rewrite mine turf overlay adding

2018-05-29 14:35:45 -04:00

mob

Merge pull request #5301 from Anewbe/more_merc_mob_things

2018-06-03 03:58:47 -04:00

multiz

…

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 pull request #5319 from SubberTheFabulous/LoveBranded

2018-06-02 16:22:56 -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

Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)""

2018-06-01 20:35:28 -04:00

power

SYNC: Map changes for lighting

2018-05-30 00:56:12 -04:00

projectiles

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -04:00

random_map

…

reagents

SYNC: Alter promethean changes

2018-05-25 15:05:39 -04:00

recycling

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

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

research

Merge pull request #5318 from Heroman3003/xenoarch-multitool-fix

2018-05-31 21:34:44 -04:00

resleeving

removed SC self backup and added a null

2018-05-15 11:52:38 +03: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

…

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

…

telesci

Mostly comment out advanced GPSes

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

tension

…

tooltip

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

…

vore

Merge pull request #3737 from Verkister/patch-25

2018-05-24 17:36:59 -04:00

xenoarcheaology

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

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

xenobio

…

xenobio2

…

xgm

…