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

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/guns/projectile/launchers.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	code/modules/research/designs/weapon_designs.dm
	icons/obj/gun.dmi

2015-01-15 21:56:23 -08:00

..

devices

Fixes some runtimes from audible_message proc. Fixes silent PDAs calling audible message when receiving a message.

2015-01-14 18:00:17 +01: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 nosenseofrightandwrongiguess

2015-01-15 21:56:23 -08:00

apc_frame.dm

…

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

…

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

…