sirbayer d502cc86ea Merge branch 'master' of https://github.com/tgstation/-tg-station into srsbsns-deadlyboolets ...

Conflicts:
	code/modules/projectiles/guns/magic/wand.dm

2013-12-30 16:39:12 -08: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

Fixed #1830 Monkeys now have a resist button on their HUD.

2013-12-22 16:36:26 +01:00

ATMOSPHERICS

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

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

controllers

* Removes a debug message.

2013-12-23 14:31:19 +00:00

datums

Merge pull request #2031 from Alek2ander/master

2013-12-30 12:50:09 -08:00

defines

…

FEA

…

game

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

2013-12-30 16:39:12 -08: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 srsbsns-deadlyboolets

2013-12-30 16:39:12 -08: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

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

_compile_options.dm

…

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