Miauw 3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP ...

Conflicts:
	code/modules/mob/mob.dm

2014-02-15 17:30:21 +01:00

..

devices

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

2014-02-15 17:30:21 +01:00

robot

u_equip is now called unEquip PANIC

2014-02-13 20:58:33 +01:00

stacks

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

2014-02-15 17:30:21 +01:00

weapons

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

2014-02-15 17:30:21 +01: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

finishes up nodrop as far as i can be arsed to

2014-02-15 16:22:25 +01: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

now it's finished entirely \o/

2014-02-15 16:56:12 +01:00

trash.dm

Cleans up the trash.dm

2014-02-13 10:35:02 -05:00