Steelpoint 34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam ...

Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi

2015-01-09 11:02:50 +08:00

..

devices

Merge pull request #6731 from tkdrg/ntrc_strikes_back

2015-01-06 07:22:45 +00: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 EmergencyResponseTeam

2015-01-09 11:02:50 +08:00

apc_frame.dm

…

blueprints.dm

SubSystem rewrite

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

bodybag.dm

…

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

…

latexballoon.dm

Ok now explosions shall work properly

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

shooting_range.dm

…

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

…