Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 ...

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm

2018-04-06 15:40:06 -04:00

..

effects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

items

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

random

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

structures

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30

2018-03-31 09:20:59 -04:00

banners.dm

Surface Map Work (#4557)

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

buckling.dm

Sundry Runtime Fixes - March (#5047)

2018-03-13 00:13:19 -05:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

POLARIS: Sometimes items have this set to null because they are bad.

2018-03-25 17:09:47 -04: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

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

structures.dm

…

stumble_into_vr.dm

…

weapons.dm

…