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

..

effects

Merge pull request #2988 from Anewbe/boots

2017-03-05 14:13:47 -06:00

items

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

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

random

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

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

structures

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

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

buckling.dm

Gives cyborgs the ability to unbuckle things.

2016-11-18 14:49:57 -06:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Fixed the attack messages from items being placed into bags

2017-01-16 17:11:42 -06:00

objs.dm

…

structures.dm

Polaris Sync October 9th (#633)

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

weapons.dm

item_state cleanup

2016-07-11 22:31:32 -04:00