Heroman3003 6d543572dd Merge branch 'master' into solargrubs-return-bring-the-hate-in

2019-04-25 12:25:15 +10:00

..

admin

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

ai

Conflict Resolution

2019-04-24 15:36:07 -04:00

alarm

…

artifice

…

assembly

Conflict Resolution

2019-04-15 18:37:41 -04:00

awaymissions

Hopefully fixes every path

2019-04-16 10:41:04 +02:00

blob

…

blob2

…

busy_space

…

busy_space_vr

…

catalogue

Makes placeholder entries for lore writing

2019-04-23 11:13:42 +10:00

client

Adds a colorable cloak in loadout (#6040)

2019-04-13 17:38:00 -04:00

clothing

Adds KA holster to mining vendor

2019-04-22 06:47:55 +10:00

customitems

…

detectivework

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

economy

Merge pull request #6088 from Heroman3003/infinite-cash-no

2019-04-15 18:47:33 -04:00

entopics_vr

…

error_handler

…

events

Fixes Solargrubs.

2019-04-25 12:21:44 +10:00

examine

…

ext_scripts

…

flufftext

…

food

Merge pull request #6099 from Heroman3003/fcookie-runtime-fix

2019-04-18 13:28:13 -04:00

gamemaster

…

games

Fixes deck of cards bringing up unnecesary prompt when picked up

2019-04-08 10:49:56 +10:00

genetics

…

ghosttrap

…

holodeck

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

holomap

…

hydroponics

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

icon generation

…

identification

…

integrated_electronics

Fixes some signaler bugs

2019-04-15 18:30:15 -04:00

library

…

lighting

…

lore_codex

…

maps

…

materials

Update materials.dm

2019-04-13 22:55:08 -04:00

media

…

metric

Merge pull request #6090 from Mechoid/Hopefully_Fixes_Ghost_Checks

2019-04-18 13:23:24 -04:00

mining

Merge pull request #5113 from Heroman3003/ka-holsters

2019-04-24 01:27:58 -04:00

mob

Merge branch 'master' into solargrubs-return-bring-the-hate-in

2019-04-25 12:25:15 +10:00

multiz

Merge pull request #6105 from Heroman3003/climbybois

2019-04-22 00:28:01 -04:00

nano

Ports Chemistry/NanoUI Fixes Early

2019-04-08 16:15:29 -04:00

nifsoft

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

organs

Starts work on Organs affecting Reagent Processing

2019-04-18 13:09:48 -04:00

overmap

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

paperwork

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

persistence

…

planet

…

power

Adds Config-Controlled Automated Solar Setup (#6107)

2019-04-21 03:34:25 -04:00

projectiles

Makes placeholder entries for lore writing

2019-04-23 11:13:42 +10:00

random_map

Base features for Precursotech and Anomalotech Expansion

2019-04-13 22:44:52 -04:00

reagents

Merge pull request #6115 from Mechoid/SterilizineTheThinkingXenobiologistsWeapon

2019-04-22 01:25:15 -04:00

recycling

Merge pull request #6073 from Heroman3003/conveyor-boogalo

2019-04-14 02:25:14 -04:00

research

Merge pull request #5085 from VOREStation/upstream-merge-6026

2019-04-18 02:19:31 -04:00

resleeving

Makes placeholder entries for lore writing

2019-04-23 11:13:42 +10:00

rogueminer_vr

Merge branch 'master' into mobpathfix

2019-04-16 11:39:01 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

spells

…

surgery

…

tables

…

telesci

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

tension

…

tooltip

…

turbolift

…

vehicles

…

ventcrawl

…

virus2

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

vore

Makes placeholder entries for lore writing

2019-04-23 11:13:42 +10:00

xenoarcheaology

Base features for Precursotech and Anomalotech Expansion

2019-04-13 22:44:52 -04:00

xenobio

…

xenobio2

…

xgm

…