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

Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi

2015-01-15 02:30:31 -05:00

..

devices

Fixes a missed variable

2015-01-11 20:00:41 -03:00

robot

fixed compile errors

2014-12-24 21:03:22 -08:00

stacks

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

weapons

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

2015-01-15 02:30:31 -05:00

apc_frame.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

blueprints.dm

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

2015-01-05 22:07:08 +01:00

bodybag.dm

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

candle.dm

SubSystem rewrite

2014-12-31 13:25:41 +00:00

crayons.dm

Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet.

2015-01-03 13:44:23 -06:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

latexballoon.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

shooting_range.dm

Repaths practice laser

2015-01-07 04:45:49 -03:00

toys.dm

Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet.

2015-01-03 13:44:23 -06:00

trash.dm

Cleans up the trash.dm

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