Cheridan 1368794705 Merge pull request #10112 from Ikarrus/whyamiinspace ...

Reactive Teleport Armor can teleport the user to space tiles again

2015-06-29 22:11:03 -05:00

..

admin

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

2015-06-29 13:42:23 +03:00

assembly

Merge from upstream.

2015-06-25 20:30:19 +02:00

awaymissions

code improvement and overlays for fancy storage, dropper, syringe and lighter

2015-06-10 18:58:19 +10:00

client

Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner

2015-06-28 02:55:53 +03:00

clothing

Merge pull request #10211 from Ikarrus/burntweaks

2015-06-29 21:38:20 -05:00

crafting

Merge from upstream.

2015-06-25 20:30:19 +02:00

detectivework

Merge from upstream.

2015-06-25 20:30:19 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge pull request #10238 from Incoming5643/catgirls2015

2015-06-29 21:44:39 -05:00

flufftext

Merge from upstream.

2015-06-25 20:30:19 +02:00

food&drinks

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

2015-06-28 15:22:21 +02:00

games

HTML interface module + playing cards (ported from Baystation12 with modifications) using the new module

2015-06-08 22:13:25 +02:00

holiday

Fixes #9257

2015-05-05 18:50:30 +02:00

html_interface

Fix for playing cards on systems with IE8

2015-06-27 05:51:59 +02:00

hydroponics

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

2015-06-28 08:30:00 -06:00

library

Squashed Commits

2015-06-27 00:09:16 -06:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Moves clothes from out of equipment lockers and into wardrobe closets

2015-06-27 17:22:02 -06:00

mob

Merge pull request #10112 from Ikarrus/whyamiinspace

2015-06-29 22:11:03 -05:00

nano

Merge from upstream.

2015-06-25 20:30:19 +02:00

ninja

Merge from upstream.

2015-06-25 20:30:19 +02:00

paperwork

Resolved Conflicts:

2015-06-27 00:17:02 -06:00

power

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

2015-06-28 15:22:21 +02:00

procedural mapping

Merge from upstream.

2015-06-25 20:30:19 +02:00

projectiles

Merge from upstream.

2015-06-25 20:30:19 +02:00

reagents

Merge pull request #10125 from Iamgoofball/patch-85

2015-06-29 17:36:11 +02:00

recycling

Squashed Commits

2015-06-27 00:09:16 -06:00

research

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

2015-06-28 15:22:21 +02:00

scripting

Merge from upstream.

2015-06-25 20:30:19 +02:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

Merge from upstream.

2015-06-25 20:30:19 +02:00

surgery

Merge pull request #10105 from xxalpha/chief

2015-06-26 19:03:13 +02:00

telesci

Fixes telesci console icon

2015-06-26 17:03:29 +03:00