SinTwo 4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state ...

Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi

2016-07-22 23:39:19 -04:00

..

effects

no message

2016-06-16 04:34:48 +01:00

items

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

2016-07-22 23:39:19 -04:00

random

Adds changelog

2016-07-12 20:33:55 +01:00

structures

final cleanup

2016-07-18 16:03:53 -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

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

2016-05-28 20:22:09 +01:00

objs.dm

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

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

structures.dm

Reduces table climbing time by one third

2016-04-18 18:29:03 +01:00

weapons.dm

item_state cleanup

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