Arokha Sieyes 6e8667e948 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync ...

# Conflicts:
#	code/game/objects/items/weapons/tanks/tank_types.dm
#	code/modules/events/canister_leak.dm
#	code/modules/gamemaster/actions/canister_leak.dm

2017-03-13 01:29:01 -04:00

..

devices

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-polsync

2017-03-11 18:47:17 -05:00

robot

Polaris sync

2016-08-06 20:34:44 -07:00

stacks

Whups

2017-03-06 03:15:07 -05:00

weapons

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync

2017-03-13 01:29:01 -04:00

apc_frame.dm

…

blueprints.dm

Made blueprints able to expand station areas into spae

2017-03-04 23:14:12 -05:00

bodybag.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

contraband_vr.dm

50 sheet stacks fix

2016-12-27 08:42:59 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

latexballoon.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

trash.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00