Neerti 3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance ...

# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm

2016-04-20 05:41:36 -04:00

..

devices

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance

2016-04-20 05:41:36 -04:00

robot

Changes types of ghosts and eyes

2016-02-20 15:36:05 +03:00

stacks

Merge pull request #1169 from Kelenius/fixesOnly

2016-03-26 15:42:25 -04:00

weapons

Inventory Tweaks 1

2016-04-16 10:28:14 -04:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Makes stasis bags better.

2016-02-08 17:19:38 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Fixes issues travis found

2016-03-11 11:59:51 +03:00

trash.dm

…