Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

effects

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

items

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

2018-01-22 12:10:19 -05:00

random

Knife path fix for VS trashpiles and a fluff item

2018-01-18 15:48:14 -05:00

structures

Merge branch 'master' into hypo

2018-01-20 01:39:16 -05:00

banners.dm

Surface Map Work (#4557)

2018-01-17 13:46:19 -06:00

buckling.dm

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Moved makepowernets() into SSmachines initialization proc.

2017-12-29 15:32:06 -05:00

items.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

mob_spawner_vr.dm

Trims back wilderness code that was dependent on tether map.

2018-01-17 15:23:22 -05:00

objs.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

structures.dm

…

stumble_into_vr.dm

Can't open blast doors with your face

2017-11-12 16:40:41 -05:00

weapons.dm

Adds Visual Cleavage

2017-12-31 05:53:39 -05:00