GunHog 63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition ...

Conflicts:
	code/game/machinery/bots/ed209bot.dm

2014-10-22 17:49:52 -05:00

..

devices

ED-209 balance changes and bot tweaks

2014-10-22 10:26:16 -05:00

robot

deleted bad lines

2014-10-19 04:57:14 +01:00

stacks

Merge pull request #5277 from paprka/newshotguns

2014-10-21 09:51:35 -07:00

weapons

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity

2014-10-22 13:26:35 -07:00

apc_frame.dm

…

blueprints.dm

Adds construction permits

2014-10-11 17:39:27 -05:00

bodybag.dm

Adding bluespace bodybags. Adding changelog.

2014-10-21 17:27:40 +02:00

candle.dm

…

crayons.dm

Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown.

2014-09-28 14:02:08 +04:00

documents.dm

…

latexballoon.dm

…

shooting_range.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

toys.dm

Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti

2014-10-09 16:31:13 +02:00

trash.dm

…