PsiOmega ce30b00287 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm

2015-03-13 09:23:26 +01:00

..

alien.dm

Updated body_parts_covered

2014-07-26 17:06:08 -07:00

armor.dm

Adds four mercenary vests to the merc base, tweaks

2015-03-09 03:15:45 -04:00

bio.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

jobs.dm

Adds inhand sprites for the captain's tunic and jacket

2014-11-21 08:14:57 -05:00

labcoat.dm

Fixed typo that broke everything

2014-11-16 03:31:22 -05:00

miscellaneous.dm

Gun cleanup and rewrite

2015-02-11 15:46:09 -05:00

storage.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

utility.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

wiz_robe.dm

Updated body_parts_covered

2014-07-26 17:06:08 -07:00