Aronai Sieyes 872eff5004 Merge pull request #4395 from VOREStation/upstream-merge-5670 ...

[MIRROR] Fix a couple of ticket bugs

2018-10-16 12:18:46 -04:00

..

admin

Clean up two-way merge

2018-10-16 12:08:31 -04:00

alarm

…

artifice

Merge pull request #5426 from Anewbe/deadringer_fixes

2018-07-22 00:26:47 -04:00

assembly

Merge pull request #5502 from Anewbe/glob_is_hungry_for_souls

2018-08-22 11:32:13 -07:00

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 #5657 from lbnesquik/Kates-Cap-Fix

2018-10-13 17:13:32 -04:00

clothing

Merge pull request #4240 from Mewchild/MC-Medals

2018-10-01 19:22:20 -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

Fixup other vorestation things

2018-10-16 12:05:32 -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

Might fix the server startup error_handler runtime

2018-08-30 22:59:15 -05:00

hydroponics

Merge pull request #5655 from lbnesquik/Kates-Wax-Fix

2018-10-13 17:16:14 -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

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

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

Merge pull request #4394 from VOREStation/upstream-merge-5652

2018-10-16 12:18:35 -04:00

mob

Merge pull request #4396 from VOREStation/upstream-merge-5674

2018-10-15 17:32:14 -04:00

multiz

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

2018-09-27 18:01:09 -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

forgot to mark edit

2018-10-10 22:17:20 +01:00

overmap

NanoUI now processes again

2018-08-25 21:13:16 -07:00

paperwork

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

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

persistence

…

planet

Merge pull request #5587 from Anewbe/wind

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

power

Merge pull request #5639 from Heroman3003/smes-fix

2018-10-06 16:04:40 -04:00

projectiles

Shotgun cycling animation framework

2018-10-03 14:30: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

Fixup other vorestation things

2018-10-16 12:05:32 -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

Shield Drone no longer auto-fails with Energy Relays.

2018-08-30 12:44:04 -07:00

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

Merge pull request #4299 from ArgobargSoup/master

2018-10-11 21:42:54 -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

…