Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

effects

Waistcoats are accessories

2016-10-19 22:29:22 -05:00

items

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

random

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

2016-10-20 21:24:07 -04:00

structures

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -04:00

buckling.dm

Adjusts the checks to ensure you cannot buckle two people to the same thing

2016-06-02 15:04:40 +01:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Changes the way embedding works

2016-10-11 21:29:49 -05:00

objs.dm

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

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

structures.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

weapons.dm

item_state cleanup

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