Neerti 1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles ...

# Conflicts resolved:
#	code/modules/busy_space/organizations.dm

2017-10-10 01:19:53 -04:00

..

effects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles

2017-10-10 01:19:53 -04:00

items

Makes a bunch of things fit in holsters

2017-10-07 17:24:18 -05:00

random

Fixes legcuffs

2017-09-12 20:47:42 -04:00

structures

Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci

2017-10-06 10:51:05 -05:00

buckling.dm

Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again

2017-09-10 17:12:38 -04:00

empulse.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

explosion_recursive.dm

…

explosion.dm

Fixes another thing

2017-05-07 18:15:54 -05:00

items.dm

Fixes legcuffs

2017-09-12 20:47:42 -04:00

objs.dm

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

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

structures.dm

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-05 23:01:41 -04:00

weapons.dm

item_state cleanup

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