mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm

2015-02-13 01:57:19 -05:00

..

ears

Response to #7686

2015-01-06 21:48:56 +01:00

glasses

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev

2014-10-20 04:52:45 +04:00

gloves

Changed prefix on gloves modified for alien use from "Mangled" to "Modified". Removed stungloves.dm on request of Zuhayr.

2015-01-30 18:22:58 -05:00

head

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

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

masks

Removes FPRINT and TABLEPASS flags

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

shoes

Fixes merge conflict, uses force

2014-12-27 22:51:27 +01:00

spacesuits

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

2015-02-13 01:57:19 -05:00

suits

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

under

Gun cleanup and rewrite

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

clothing.dm

Added moar sanity.

2015-02-08 12:45:50 +03:00