viv_eret 2ee08879d0 Merge branch 'master' of https://github.com/viv-eret/VOREStation

2016-07-24 16:24:28 -07:00

..

admin

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

alarm

…

assembly

…

awaymissions

…

blob

…

client

Adds horsehalf saddlebag in loadout.

2016-07-24 16:24:08 -07:00

clothing

Update void_vr.dm

2016-07-08 13:33:39 -04:00

customitems

…

detectivework

…

economy

…

events

Merge pull request #358 from VOREStation/sync

2016-06-14 19:29:43 -04:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

Introduces max record length for record, converts uses of max book length to max paper length barring books

2016-06-27 16:26:31 +01:00

genetics

…

ghosttrap

…

holodeck

Fixes part 1

2016-06-20 23:32:18 -04:00

hydroponics

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

icon generation

…

library

…

lighting

…

maps

…

materials

…

mining

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

mob

uhhhh

2016-07-20 18:43:57 -07:00

multiz

…

nano

…

organs

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

overmap

…

paperwork

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

power

…

projectiles

Merge pull request #1983 from Anewbe/ninja_cloak+dart

2016-06-27 01:25:47 -04:00

random_map

…

reagents

Compatibility tweaks for new Polaris sync

2016-07-03 17:21:03 -04:00

recycling

…

research

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

2016-06-13 13:12:40 -04:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Merge branch 'master' of https://github.com/PolarisSS13/Polaris

2016-07-03 16:21:21 -04:00

supermatter

…

surgery

Adds do_surgery() behaviour for various items

2016-06-17 19:06:56 +01:00

tables

…

vehicles

…

virus2

…

vore

Redoing the stuff that freezes Travis up.

2016-07-18 22:28:59 -07:00

xenobio2

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

2016-06-13 13:12:40 -04:00

xgm

…