Miauw 67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid ...

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm

2014-01-07 18:18:59 +01:00

..

__DEFINES

Adds a deck of cards. Works like real cards, without all the shuffling.

2013-12-15 23:43:08 -05:00

__HELPERS

Merge pull request #2104 from Giacom/gulag_therevenge

2013-12-21 15:05:57 -08:00

_globalvars

Adds a deck of cards. Works like real cards, without all the shuffling.

2013-12-15 23:43:08 -05:00

_onclick

Adds framework for multiple UI styles for humans, with a no-UI mode being the first example. Also makes all mobs' UIs scalable.

2013-12-29 12:04:37 +01:00

ATMOSPHERICS

Digital valves can now be made and unwrenched. Fixes pipe fitting names.

2013-12-18 17:31:26 +01:00

controllers

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

2014-01-07 18:18:59 +01:00

datums

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

2014-01-07 18:18:59 +01:00

defines

Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables

2014-01-06 14:35:03 -08:00

FEA

…

game

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

2014-01-07 18:18:59 +01:00

js

…

LINDA

The speed variable of Linda now is a lot prettier

2013-12-21 22:42:35 -03:00

modules

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

2014-01-07 18:18:59 +01:00

unused

feature: renames the monkeyizing var to "notransform" since that's how it was being used in the code, as a flag to tell code to ignore transformation (initially because they were already turning into a monkey).

2013-12-19 11:50:33 -05:00

WorkInProgress

…

_compile_options.dm

Added a failsafe, default_laws is now a config option.

2013-12-23 13:10:04 +01:00

hub.dm

…

world.dm

Adds a deck of cards. Works like real cards, without all the shuffling.

2013-12-15 23:43:08 -05:00