JJRcop 0e45022798 Resolved more conflicts with drying rack before being pulled ...

Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi

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

..

devices

Resolved more conflicts with drying rack before being pulled

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

robot

Adds logging to emagged borgs using their stun arm.

2014-01-04 04:00:16 -06:00

stacks

Resolved more conflicts with drying rack before being pulled

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

weapons

Resolved more conflicts with drying rack before being pulled

2014-01-21 13:01:53 -05: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

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 #2440 from Petethegoat/suicideformat

2014-01-20 11:11:23 -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