KazeEspada 45dd35d1a7 Merge branch 'master' of https://github.com/tgstation/-tg-station into nukeops ...

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm

Resolved

2014-02-04 01:41:27 -07:00

..

devices

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

2014-01-26 19:22:33 +00:00

robot

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

2014-01-23 04:08:10 +04:00

stacks

Merge pull request #2563 from Razharas/NewTables

2014-02-03 08:46:56 -08:00

weapons

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

2014-02-04 01:41:27 -07:00

apc_frame.dm

Ported cable coils to stacks crudely

2014-01-22 02:11:19 +04:00

blueprints.dm

Corrected my own grammar failings.

2014-01-11 12:51:42 -05:00

bodybag.dm

Standardises bodybag.dm, including text styling. Updates the max name length of a label. Fixes folded bodybags not fitting in boxes. Bodybags now go into hands when folded, if possible.

2013-04-04 00:43:09 +01:00

candle.dm

Standarization for the candle code and now the process() of it will remove the candle from a mob properly when the wax runs out, avoiding a runtime.

2013-07-25 06:19:06 -03:00

crayons.dm

Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.

2014-01-15 21:30:55 +00:00

latexballoon.dm

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

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

shooting_range.dm

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

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

toys.dm

Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds

2014-02-01 18:01:59 -08:00

trash.dm

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

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