Fox-McCloud 6ec234430e Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
#	code/modules/mob/living/carbon/carbon_defines.dm

2017-11-18 18:49:47 -05:00

..

accessory.dm

Merge remote-tracking branch 'upstream/master' into lungsss

2017-08-16 19:20:19 -04:00

armband.dm

EVERYTHING IS PERFECTLY FINE

2017-10-11 23:50:24 -04:00

holster.dm

Updates Intents

2017-06-10 09:43:36 +01:00

storage.dm

Converts /modules/ to using WEIGHT_CLASS_x

2017-05-28 01:25:09 +01:00