Arokha Sieyes c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?

2017-04-02 23:25:59 -04:00

..

effects

Revert "Makes space in the uniforms.dmi file"

2017-03-27 03:34:12 +01:00

items

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

2017-04-02 23:25:59 -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 polaris-sync

2017-04-01 19:19:42 -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

Sorta implements armor soak, very WIP

2017-03-10 20:26:37 -06:00

objs.dm

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

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

structures.dm

Borgs can climb

2017-03-27 23:15:13 -05:00

weapons.dm

item_state cleanup

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