Tigercat2000 5d48cc22b7 Merge remote-tracking branch 'upstream/master' into bay_equipping ...

Conflicts:
	code/modules/client/preference/preferences.dm

2016-06-19 16:28:57 -07:00

..

effects

Merge branch 'master' into ui_plane

2016-06-19 12:38:00 -04:00

items

Merge branch 'master' into ui_plane

2016-06-19 12:38:00 -04:00

random

Pass II

2015-07-09 19:51:40 -04:00

structures

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

2016-06-19 16:28:57 -07: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

Some math, mob helper/ one-liner optimizations

2016-05-06 04:38:59 -04:00

items.dm

Fixes holsters and potentially other accessories with action buttons

2016-06-01 20:30:57 -04:00

objs.dm

Ports holomap blueprints from tg/vg.

2016-05-05 22:05:39 -07: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

…