skull132 a276504130 Merge branch 'master' into development ...

# Conflicts:
#	maps/aurora/aurora-4_mainlevel.dmm

2018-06-17 23:19:10 +03:00

..

effects

Adds Cyberpunk Hairstyles (#4671)

2018-05-06 18:13:27 +03:00

items

Custom Kinetic Accelerators (#4802)

2018-06-17 23:02:42 +03:00

random

Merge branch 'master' into development

2018-06-17 23:19:10 +03:00

structures

Detective cleansing (#4784)

2018-06-17 20:35:38 +03:00

buckling.dm

Ports crawling from polaris (#4118)

2018-01-24 22:37:16 +02:00

empulse.dm

Empulse fix (#4762)

2018-05-19 08:22:15 +03:00

explosion.dm

Iterative Explosions (#3838)

2017-12-30 04:38:12 +02:00

items.dm

Ports weapons cleaving and reaching features from polaris (#3969)

2017-12-23 21:12:06 +02:00

objs.dm

Duller syringes (#4818)

2018-05-29 00:26:16 +02:00

structures.dm

Kill a bunch of unneeded lists (#2851)

2017-06-28 23:10:33 +03:00

weapons.dm

Code Cleanup: (Bump(), Bumped()) -> (Collide(), CollidedWith()) (#4349)

2018-03-08 09:39:53 +02:00