Aronai Sieyes 1e4d8ed383 Revert "Revert "Stethoscope vore shitpost"" ...

This reverts commit 7c522fc0c4.

2018-10-24 22:28:13 +01:00

..

admin

Merge branch 'upMaster' into updates

2018-10-21 03:48:41 +01: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 remote-tracking branch 'upstream/master'

2018-10-24 22:07:16 +01:00

clothing

Revert "Revert "Stethoscope vore shitpost""

2018-10-24 22:28:13 +01:00

customitems

…

detectivework

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

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

DMAPI

…

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

Merge remote-tracking branch 'upstream/master'

2018-10-24 22:07:16 +01: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 branch 'upMaster' into updates

2018-10-21 03:48:41 +01: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

interserver shipping

Initial merge fixes

2018-10-03 20:08:55 +01: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 remote-tracking branch 'upstream/master'

2018-10-24 22:07:16 +01:00

mob

Merge remote-tracking branch 'upstream/master'

2018-10-24 22:07:16 +01:00

multiz

Merge remote-tracking branch 'upstream/master'

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

nano

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

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

nifsoft

Vore Updates and merges

2018-10-03 18:25:39 +01:00

organs

Merge remote-tracking branch 'upstream/master'

2018-10-14 17:09:41 +01:00

overmap

NanoUI now processes again

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

paperwork

Merge remote-tracking branch 'upstream/master'

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

persistence

…

Phorochemistry

Initial merge fixes

2018-10-03 20:08:55 +01:00

planet

Vore Updates and merges

2018-10-03 18:25:39 +01:00

power

Merge remote-tracking branch 'upstream/master'

2018-10-14 17:09:41 +01:00

projectiles

Switch Jackhammer to Eject

2018-10-21 02:56:52 +01: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 branch 'upMaster' into updates

2018-10-21 03:48:41 +01: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

Vore Updates and merges

2018-10-03 18:25:39 +01: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

Vore Updates and merges

2018-10-03 18:25:39 +01: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 branch 'upMaster' into updates

2018-10-21 03:48:41 +01:00

xenoarcheaology

Vore Updates and merges

2018-10-03 18:25:39 +01:00

xenobio

…

xenobio2

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

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

xgm

…