Anewbe d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins ...

# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi

2017-01-17 22:05:38 -06:00

..

effects

Waistcoats are accessories

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

items

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

2017-01-17 22:05:38 -06:00

random

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

structures

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

2017-01-17 22:05:38 -06:00

buckling.dm

Gives cyborgs the ability to unbuckle things.

2016-11-18 14:49:57 -06:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Fixed the attack messages from items being placed into bags

2017-01-16 17:11:42 -06:00

objs.dm

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

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

structures.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

weapons.dm

item_state cleanup

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