Hubblenaut 5eca5d9e37 Merge remote-tracking branch 'upstream/dev' into sprites ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2015-02-16 16:16:30 +01:00

..

devices

Merge remote-tracking branch 'upstream/dev' into sprites

2015-02-16 16:16:30 +01:00

robot

Gun cleanup and rewrite

2015-02-11 15:46:09 -05:00

stacks

Merge pull request #7582 from Zuhayr/richard

2015-02-03 18:10:34 +03:00

weapons

Merge remote-tracking branch 'upstream/dev' into sprites

2015-02-16 16:16:30 +01:00

apc_frame.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

ashtray.dm

Conflict fix

2015-02-03 20:57:16 +03:00

blueprints.dm

fixes #7487

2014-12-22 15:41:07 +00:00

bodybag.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

contraband.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

crayons.dm

Eating crayons

2015-01-25 17:11:06 +01:00

latexballoon.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

shooting_range.dm

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

toys.dm

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-13 01:57:19 -05:00

trash.dm

More name updates and refactoring for research

2014-12-18 03:26:55 +01:00