xxalpha 662af7174f Merge remote-tracking branch 'upstream/master' into fixfixfix ...

Conflicts:
	icons/obj/storage.dmi

2015-05-29 21:45:18 +01:00

..

effects

Added department security spawn points and fixed dep sec spawning.

2015-05-16 22:20:31 +01:00

items

Merge remote-tracking branch 'upstream/master' into fixfixfix

2015-05-29 21:45:18 +01:00

structures

eol fixes (probably) and examine fix in closets

2015-05-28 20:48:47 +10:00

buckling.dm

Prevents an AI from being buckled.

2015-05-05 17:03:53 +02:00

empulse.dm

Effect pooling

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

explosion.dm

Merges power subsystem into machine subsystem.

2015-05-09 23:48:18 -07:00

items.dm

Merge pull request #9559 from xxalpha/cardtrick

2015-05-28 21:41:00 -05:00

objs.dm

Makes all machines use the robot font. Fixes #8575

2015-05-23 18:15:26 +02: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