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

..

PDA

Obsoletes flags = FPRINT | TABLEPASS*

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

radio

merging upstream master into local repo

2014-01-11 17:14:48 +01:00

aicard.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

camera_bug.dm

Camera bug sprites from Rob

2013-11-23 17:10:43 +00:00

chameleonproj.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

flash.dm

Removed the icon color blend operations from human's update_icons().

2014-01-16 14:33:50 +00:00

flashlight.dm

Fixing conflicts

2014-01-15 09:37:17 -05:00

laserpointer.dm

fixing my fixes

2014-01-10 14:10:30 -06:00

lightreplacer.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

multitool.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

paicard.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

powersink.dm

Logs everywhere

2014-01-19 21:16:30 +04:00

scanners.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

taperecorder.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

traitordevices.dm

Obsoletes flags = FPRINT | TABLEPASS*

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

transfer_valve.dm

for extra prettiness, the (x,y,z) coordinates on the game logs of transfer valves no longer have spaces between them.

2013-12-08 16:10:58 -03:00

uplinks.dm

Merge pull request #2244 from VistaPOWA/syndieborgs

2014-01-12 05:30:22 -08:00

violin.dm

Moved backend and UI functionality into the datum/song class and made in generalizable for special-case functionalities for player checks, etc

2013-03-20 04:52:17 -04:00