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

..

effects

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

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

items

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

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

structures

Merge pull request #9106 from phil235/BundleFix5

2015-05-02 23:59:22 +10:00

buckling.dm

"You hear something" set to italics.

2015-04-24 21:06:16 +03:00

empulse.dm

Effect pooling

2015-03-24 11:44:49 -07:00

explosion.dm

Massive MC and subsystem rewrite

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

items.dm

Merge pull request #9106 from phil235/BundleFix5

2015-05-02 23:59:22 +10:00

objs.dm

moved process() to datum. made /datum/reagents/ process instead of the containers.

2015-04-07 17:13:59 -07:00

structures.dm

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

2014-12-05 22:02:01 +01:00

weapons.dm

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00