CHOMPStation2

admin

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

2019-04-07 19:40:12 -04:00

ai

Ports Stasis Cages from Baystation (#6017 )

2019-03-30 14:55:52 -04:00

alarm

…

artifice

…

assembly

Merge pull request #4832 from VOREStation/upstream-merge-5985

2019-03-28 21:59:48 -04:00

awaymissions

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

blob

…

blob2

…

busy_space

Explorer Update - Cataloguers

2019-03-30 16:19:24 -04:00

busy_space_vr

Next time, take the easy route

2019-03-30 17:33:54 -04:00

catalogue

Fixes ghosts being counted as contributors for cataloguers. (#6032 )

2019-04-05 15:08:10 -04:00

client

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

2019-04-07 19:40:12 -04:00

clothing

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

2019-04-07 19:40:12 -04:00

customitems

…

detectivework

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

DMAPI

…

economy

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

entopics_vr

…

error_handler

…

events

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

examine

…

ext_scripts

…

flufftext

…

food

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

2019-04-07 19:40:12 -04:00

gamemaster

…

games

…

genetics

…

ghosttrap

…

holodeck

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

holomap

…

hydroponics

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

2019-04-07 19:40:12 -04:00

icon generation

…

identification

…

integrated_electronics

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

interserver shipping

…

library

…

lighting

…

lore_codex

…

maps

Merge pull request #4789 from VOREStation/upstream-merge-5967

2019-03-28 21:08:01 -04:00

materials

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

media

…

metric

…

mining

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

2019-04-07 19:40:12 -04:00

mob

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

multiz

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

2019-04-07 19:40:12 -04:00

nano

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

nifsoft

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

2019-04-07 19:40:12 -04:00

organs

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

2019-04-07 19:40:12 -04:00

overmap

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

paperwork

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

persistence

…

Phorochemistry

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

2019-04-07 19:40:12 -04:00

planet

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

2019-04-07 19:40:12 -04:00

power

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

2019-04-07 19:40:12 -04:00

projectiles

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

random_map

…

reagents

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

recycling

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

research

Replaces AI-controlled Maint Drones with AI-controlled Borg Shells

2019-04-06 05:07:05 -04:00

resleeving

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

rogueminer_vr

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

2019-04-07 19:40:12 -04:00

scripting

…

security levels

Adds New Alert Levels (#6019 )

2019-03-30 18:29:12 -04:00

shieldgen

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

shuttles

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

spells

…

surgery

Belt-Worn RIGs (#6002 )

2019-03-30 03:20:41 -04:00

tables

…

telesci

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

tension

…

tooltip

…

turbolift

Fixes hud-zshadow bug

2019-04-07 07:52:19 +10:00

vehicles

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

2019-04-07 19:40:12 -04:00

ventcrawl

…

virus2

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

vore

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

2019-04-07 19:40:12 -04:00

xenoarcheaology

Merge branch 'map' into RadiantMaster

2019-04-14 18:27:05 +01:00

xenobio

…

xenobio2

…

xgm

…