Tigercat2000 66416ae5ec Merge remote-tracking branch 'upstream/master' into CRAZY_HUDS_AMIRITE ...

Conflicts:
	code/game/gamemodes/vampire/hud.dm

2016-04-21 20:31:58 -07:00

..

effects

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

items

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

random

…

structures

Merge pull request #4263 from Tastyfish/smooth-shuttles

2016-04-21 22:58:49 -04:00

buckling.dm

-tg- screen alerts

2016-04-16 14:27:03 -07:00

empulse.dm

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

explosion.dm

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

items.dm

-tg- screen alerts

2016-04-16 14:27:03 -07:00

objs.dm

fixes

2016-04-18 22:53:31 -04:00

structures.dm

Updates maploader code to be in line with tg's, startup improvements

2016-04-10 02:57:58 -04:00

weapons.dm

…