Kelshark ced5c0c30a Fluff items fix

2018-02-15 18:27:44 -05:00

..

admin

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

alarm

…

assembly

…

awaymissions

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01

2018-02-01 23:55:47 -05:00

blob

…

blob2

Fixes Blob Tasering

2018-01-17 14:19:40 -05:00

busy_space

…

client

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

clothing

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

customitems

Allows modkits to be created for any item. (#4450)

2018-01-19 18:11:28 -08:00

detectivework

…

economy

Food and Drink: Additions and Bugfixes (#4598)

2018-01-21 22:18:33 -08:00

entopics_vr

VS: AR Entopics and Soulcatcher projecting (+Worldbender)

2018-01-20 23:29:24 -05:00

error_handler

…

events

Make the Metor Strike random event be configurable per map.

2018-01-17 11:04:20 -05:00

examine

…

ext_scripts

…

flufftext

…

food

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

holomap

…

hydroponics

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

icon generation

…

integrated_electronics

…

interserver shipping

…

library

…

lighting

Make Darksight Great Again (#4626)

2018-01-25 18:01:33 -06:00

lore_codex

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

maps

Merge pull request #2931 from VOREStation/polaris-sync-2018-02-01

2018-02-02 19:03:04 -05:00

materials

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01

2018-02-01 23:55:47 -05:00

media

…

metric

…

mining

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

mob

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

multiz

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

nano

…

nifsoft

NIFSoft disks change, minor fix and refactor

2018-02-02 03:45:40 -05:00

organs

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

overmap

…

paperwork

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

Phorochemistry

All my changes so far.

2018-02-02 04:57:01 -05:00

planet

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

power

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-02 19:25:51 -05:00

projectiles

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-01-24 19:52:12 -05:00

random_map

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

reagents

Fluff items fix

2018-02-15 18:27:44 -05:00

recycling

…

research

Merge pull request #2860 from VOREStation/polaris-sync-2018-01-27

2018-01-28 14:08:14 -05:00

resleeving

…

rogueminer_vr

…

scripting

…

security levels

…

shieldgen

…

shuttles

POLARIS: Fix two mistakes with the shuttle_arrival procs

2018-01-31 20:56:57 -05:00

spells

…

surgery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

tables

…

telesci

…

tension

…

turbolift

…

vehicles

Smoll fixes to hueg ass update & merge

2018-01-24 21:04:12 -05:00

ventcrawl

…

virus2

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

vore

Fluff items fix

2018-02-15 18:27:44 -05:00

xenoarcheaology

STEALTH NERFSZZZZ - Removes rigs

2018-01-27 21:28:21 -05:00

xenobio

Allows easier prefilling of beakers, bottles, etc (#4583)

2018-01-19 15:38:46 -06:00

xenobio2

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -05:00

xgm

…