Arokha Sieyes 805b473976 Polaris Sync Merge ...

Fixed Polaris merge conflicts
* Space controller merge conflict

2017-03-18 00:58:12 -04:00

..

effects

Merge pull request #2988 from Anewbe/boots

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

items

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

random

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

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

structures

Polaris Sync Merge

2017-03-18 00:58:12 -04:00

buckling.dm

Gives cyborgs the ability to unbuckle things.

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

empulse.dm

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

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

Merge pull request #2015 from Neerti/12/16/2015_newwizard

2016-07-10 03:43:35 +01:00

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