GunHog 3b35e80e4d Merge remote-tracking branch 'remotes/upstream/master' into Botcall_V2 ...

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

2015-05-03 17:59:46 -05:00

..

devices

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

2015-05-03 17:59:46 -05:00

robot

Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids

2015-05-03 06:34:02 +01:00

stacks

Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious

2015-05-02 03:03:29 -07:00

weapons

Merge pull request #9203 from Boggart/RpdUiFix

2015-05-02 23:58:55 +10:00

apc_frame.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

blueprints.dm

Gang v3 has been tested and is now good to go!

2015-04-19 22:26:15 -06:00

body_egg.dm

Massive MC and subsystem rewrite

2015-04-29 02:00:25 -07:00

bodybag.dm

pre-map compile

2015-04-08 15:40:41 +10:00

candle.dm

…

crayons.dm

Merge pull request #9226 from Ikarrus/gang5.2

2015-05-01 13:00:51 -05:00

dehy_carp.dm

Dehydrated carps inherit factions (minus neutral) from their owner.

2015-04-24 15:18:37 -05:00

documents.dm

…

holotape.dm

span classes removed from visible.messages

2015-04-24 20:50:51 +03:00

latexballoon.dm

…

shooting_range.dm

more spans

2015-04-24 20:52:00 +03:00

toys.dm

Merge pull request #9226 from Ikarrus/gang5.2

2015-05-01 13:00:51 -05:00

trash.dm

…