Balrog 461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor ...

Conflicts:
	icons/obj/toy.dmi

2014-01-26 14:02:35 -05:00

..

devices

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05:00

robot

Added the SetEmagged proc, for cyborgs, and replaced code to use it.

2014-01-22 20:00:39 +00:00

stacks

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05:00

weapons

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

2014-01-24 16:33:51 -08:00

apc_frame.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

blueprints.dm

Corrected my own grammar failings.

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

bodybag.dm

…

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 remote-tracking branch 'origin/master' into inb4gambittraitor

2014-01-26 14:02:35 -05:00

trash.dm

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

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