Aronai Sieyes 096400b312 Merge pull request #4470 from VOREStation/upstream-merge-5698 ...

[MIRROR] Prometheans can process blood without exploding.

2018-11-01 00:22:04 -04:00

..

admin

Merge pull request #5705 from VOREStation/aro-bwoink

2018-10-30 18:38:59 -04:00

alarm

…

artifice

…

assembly

…

awaymissions

Critical maploader fix

2018-10-13 01:36:26 -04:00

blob

…

blob2

Makes Blobs more useful.

2018-09-16 22:12:17 -07:00

busy_space

…

busy_space_vr

…

client

Merge pull request #4450 from VOREStation/upstream-merge-5692

2018-10-23 12:33:29 -04:00

clothing

Merge pull request #5686 from lbnesquik/Kates-Waistcoast

2018-10-23 15:00:56 -04:00

customitems

…

detectivework

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

economy

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

entopics_vr

…

error_handler

…

events

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

examine

…

ext_scripts

…

flufftext

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

food

Fixes duplication of corpses by holding and then cooking (#5693)

2018-10-22 20:54:02 -04:00

gamemaster

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

games

…

genetics

…

ghosttrap

…

holodeck

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

holomap

…

hydroponics

Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature

2018-10-30 18:37:45 -04:00

icon generation

…

integrated_electronics

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

library

…

lighting

…

lore_codex

…

maps

Critical maploader fix

2018-10-13 01:36:26 -04:00

materials

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

media

…

metric

…

mining

Nerfs Cash from Mining Vendor

2018-10-20 14:50:43 -04:00

mob

Fix mistyped macro and indent

2018-10-25 17:35:42 -04:00

multiz

Makes RCDs Clean Again

2018-10-16 14:17:44 -04:00

nano

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

nifsoft

Merge pull request #4293 from VOREStation/aro-nifgibdrop

2018-10-01 09:29:29 -04:00

organs

Brings this over from Citadel. Ignore the CITADEL CHANGE comments.

2018-10-25 17:16:05 -04:00

overmap

…

paperwork

Merge pull request #5671 from lbnesquik/Kates-Fax-Fix

2018-10-15 15:51:30 -04:00

persistence

…

planet

Merge pull request #5587 from Anewbe/wind

2018-09-22 12:10:33 -07:00

power

Removes recharging high capacity

2018-10-12 21:19:31 -04:00

projectiles

Magazines improvements

2018-10-15 15:52:56 -04:00

random_map

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

reagents

Merge pull request #4470 from VOREStation/upstream-merge-5698

2018-11-01 00:22:04 -04:00

recycling

Graves (#5622)

2018-10-13 17:58:48 -04:00

research

Merge pull request #5648 from king5327/polarissciconfix

2018-10-13 17:14:48 -04:00

resleeving

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

rogueminer_vr

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

scripting

…

security levels

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

shieldgen

…

shuttles

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

spells

…

surgery

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

tables

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

telesci

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

tension

…

tooltip

…

turbolift

…

vehicles

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

ventcrawl

…

virus2

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

vore

Switched off unit test 11 because the build had to go out now and there was no time to fix it properly.

2018-10-27 16:07:06 -04:00

xenoarcheaology

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

xenobio

…

xenobio2

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

xgm

…