Kelshark 5b6c8aeab6 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/clothing/under/miscellaneous_vr.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	config/custom_items.txt

2017-02-12 00:32:26 -05:00

..

effects

Waistcoats are accessories

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

items

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-02-12 00:32:26 -05:00

random

Polaris sync

2017-02-01 15:08:45 -05:00

structures

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-02-03 21:35:22 -05: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

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