Mike Long 1fbd8d71f9 Merge remote-tracking branch 'tgstation/master' into jauntfix ...

# Conflicts:
#	code/modules/spells/spell_types/demon.dm

2016-06-08 13:20:04 -04:00

..

admin

Adds mass zombie cure, for the boring people

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

assembly

Experimentor Fixes

2016-06-07 02:10:44 -04:00

atmospherics

Moves some list initializations to New

2016-06-07 18:39:13 +02:00

awaymissions

Allows mob spawners to have stuff in their hands

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

cargo

R&D machinery refactor (#18295)

2016-06-08 17:18:22 +12:00

chatter

…

client

Merge pull request #18300 from JJRcop/localhost_is_always_admin

2016-06-07 22:43:11 +12:00

clothing

Merge pull request #18036 from AnturK/init_meme

2016-06-08 19:20:04 +12: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 branch 'master' of https://github.com/tgstation/-tg-station into BloodRefactor

2016-06-04 17:41:43 +02:00

emoji

…

events

Balances pyro anomaly (#18310)

2016-06-08 19:23:10 +12:00

flufftext

Layers are now defines (#17949)

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

food_and_drinks

Moves some list initializations to New

2016-06-07 18:39:13 +02: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

…

hydroponics

makes plant analyzers fit in belts again (#18324)

2016-06-06 20:01:51 -05:00

jobs

Merge pull request #18323 from KorPhaeron/clown_buff

2016-06-08 10:47:56 +02: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

Moves some list initializations to New

2016-06-07 18:39:13 +02:00

mob

Merge pull request #18036 from AnturK/init_meme

2016-06-08 19:20:04 +12:00

ninja

Layers are now defines (#17949)

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

paperwork

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

2016-06-04 17:41:43 +02: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 #18279 from GunHog/Mining_Borgs_Need_Love_Too

2016-06-07 17:09:39 -04:00

reagents

Adds emag functions to chem dispensers (#18153)

2016-06-08 11:09:25 +12:00

recycling

Moves some list initializations to New

2016-06-07 18:39:13 +02:00

research

Merge pull request #18335 from Fox-McCloud/experimental

2016-06-08 13:14:57 +02:00

ruins

what is testing code?

2016-06-06 14:56:02 -04:00

security_levels

Renames files under code/ with naughty characters

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

shuttle

Merge pull request #18321 from Cruix/nukeops_war_fix

2016-06-07 13:32:49 +12:00

space_transition

Renames files under code/ with naughty characters

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

spells

Merge remote-tracking branch 'tgstation/master' into jauntfix

2016-06-08 13:20:04 -04:00

stock_market

Addition Ratvar conversion effects and related changes

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

surgery

but with conflictless sprites

2016-06-06 19:59:37 -04:00

telesci

[Ready] Tweaks some R&D levels (#18246)

2016-06-07 20:18:19 +12:00

tgui

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

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

tooltip

…

uplink

Fixes for Merge Tokens (#18168)

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

vehicles

Moves some list initializations to New

2016-06-07 18:39:13 +02:00

zombie

Removes spawn() from some things

2016-06-05 20:08:36 +01:00