Joan Lung f64e687250 Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix

2016-06-05 18:45:32 -04:00

..

admin

Adds mass zombie cure, for the boring people

2016-06-05 13:05:21 +01:00

assembly

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

atmospherics

Hopefully fixes conflicts.

2016-06-02 22:37:18 -03:00

awaymissions

Allows mob spawners to have stuff in their hands

2016-06-02 22:01:08 -05:00

cargo

Adjusts RCD family export prices to be realistic (#18186)

2016-06-03 14:45:04 -05:00

chatter

improve chatter regex to prevent infinite loop

2016-05-15 20:12:17 +12:00

client

Fixes merge conflicts

2016-05-27 15:36:56 -07:00

clothing

Adds all-seeing-eye to necropolis chests. (#18160)

2016-06-04 02:52:04 -05:00

countdown

Push

2016-06-02 18:28:46 +01:00

crafting

Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)

2016-05-29 08:29:21 -05:00

detectivework

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

emoji

…

events

Vines fix (#18134)

2016-06-02 14:07:16 -05:00

flufftext

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

food_and_drinks

Merge pull request #18150 from PKPenguin321/salty

2016-06-06 01:18:23 +12:00

games

…

holiday

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

holodeck

Adds two new holodeck levels

2016-06-02 16:34:41 +01:00

html_interface

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

hydroponics

Merge pull request #18154 from PKPenguin321/plant-analyzer-repath

2016-06-03 16:41:02 +10:00

jobs

repaths plant analyzers

2016-06-01 22:44:03 -07:00

library

Addition Ratvar conversion effects and related changes

2016-06-03 23:19:13 -04:00

lighting

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mining

Merge pull request #18175 from Iamgoofball/patch-57

2016-06-05 14:43:30 +02:00

mob

Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix

2016-06-05 18:45:32 -04:00

ninja

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

paperwork

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

power

is this a turf

2016-06-04 21:56:10 -04:00

procedural_mapping

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

projectiles

Merge pull request #18235 from coiax/when-it-happens-we-will-know

2016-06-06 01:33:12 +12:00

reagents

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

recycling

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

research

why

2016-06-04 02:39:38 -07:00

ruins

Merge pull request #18226 from MMMiracles/evenMORERUINS

2016-06-06 01:24:43 +12:00

security_levels

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

shuttle

Merge branch 'master' of https://github.com/tgstation/tgstation into swordofRATVAR

2016-06-05 09:03:22 -04:00

space_transition

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

spells

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

stock_market

Addition Ratvar conversion effects and related changes

2016-06-03 23:19:13 -04:00

surgery

Adds the Clockwork Obelisk, Mania Motor, and Vitality Matrix

2016-06-05 18:45:32 -04:00

telesci

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

tgui

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

tooltip

update operative tooltip style(matches syndicate uplink theme)

2016-03-27 19:04:18 -04:00

uplink

Fixes for Merge Tokens (#18168)

2016-06-03 14:46:42 -05:00

vehicles

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

zombie

Infectious zombies are now a full subspecies

2016-05-31 00:15:10 +01:00