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

2016-06-12 17:55:22 -04:00

..

admin

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

assembly

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

atmospherics

Manual repair of some edge cases.

2016-06-11 23:11:54 +01:00

awaymissions

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

cargo

Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know

2016-06-09 15:39:53 +12:00

chatter

…

client

Manual repair of some edge cases.

2016-06-11 23:11:54 +01:00

clothing

Merge pull request #18440 from JStheguy/slave

2016-06-11 13:29:44 -05:00

countdown

Countdowns follow bomb; fixes syndibomb countdown

2016-06-10 12:24:00 +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

Refactors kudzu on_hit processing, fixes bug

2016-06-11 03:23:03 +03:00

flufftext

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

food_and_drinks

Merge pull request #18414 from bgobandit/lizwine

2016-06-11 10:05:17 +12:00

games

…

holiday

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

holodeck

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

html_interface

…

hydroponics

Merge pull request #18481 from phil235/PlantsGunsShit

2016-06-13 00:14:29 +12:00

jobs

Adds explorer gas mask for lavaland miners

2016-06-11 10:38:53 +03: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

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

mob

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

2016-06-12 17:55:22 -04:00

ninja

Layers are now defines (#17949)

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

paperwork

Rename proc, move updateUsrDialog call

2016-06-11 12:54:00 +00:00

power

Manual repair of some edge cases.

2016-06-11 23:11:54 +01:00

procedural_mapping

Renames files under code/ with naughty characters

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

projectiles

Merge pull request #18481 from phil235/PlantsGunsShit

2016-06-13 00:14:29 +12:00

reagents

Merge pull request #18433 from KorPhaeron/standard_borg

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

recycling

Manual repair of some edge cases.

2016-06-11 23:11:54 +01:00

research

Fixes protolathe not accepting any reagents

2016-06-11 11:05:41 +03: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

Manual repair of some edge cases.

2016-06-11 23:11:54 +01:00

space_transition

Renames files under code/ with naughty characters

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

spells

Merge pull request #18473 from RemieRichards/setDir()

2016-06-13 00:03:44 +12:00

stock_market

Addition Ratvar conversion effects and related changes

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

surgery

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

2016-06-12 17:55:22 -04:00

telesci

Merge pull request #18413 from phil235/FixAssortment1

2016-06-11 10:05:35 +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

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

zombie

Using a multitool on telepad with open panel to save data no longer hits the machine.

2016-06-09 20:46:00 +02:00