Anewbe 2c9c3e208e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
#	code/modules/organs/blood.dm
#	code/modules/organs/internal/lungs.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_external.dm

2017-03-22 17:29:01 -05:00

..

backpack.dm

Replaces Station Administrator

2016-10-06 22:38:02 -04:00

bags.dm

Centralizes weight class definitions

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

belt.dm

Fixes custom loadout and slot system.

2017-02-02 15:37:27 -05:00

bible.dm

Fixes booze bible

2016-09-30 06:28:45 -04:00

boxes.dm

Light boxes should be able to hold 24 bulbs/tubes now

2017-01-19 16:05:31 -06:00

briefcase.dm

Handbags

2016-09-24 00:20:48 -04:00

fancy.dm

Merge pull request #2525 from Neerti/9/21/2016_w_class_defines

2016-09-22 16:46:05 -05:00

firstaid.dm

Medical tweaks

2017-01-23 23:43:44 -06:00

internal.dm

Fixes dragging clothing with storage onto an occupied hand

2017-02-09 14:49:13 -05:00

laundry_basket.dm

Centralizes weight class definitions

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

lockbox.dm

Centralizes weight class definitions

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

misc.dm

Centralizes weight class definitions

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

secure.dm

Centralizes weight class definitions

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

storage.dm

Fixes dragging clothing with storage onto an occupied hand

2017-02-09 14:49:13 -05:00

toolbox.dm

Fixes up and implements the experimental welding tool

2016-11-20 18:59:06 +00:00

uplink_kits.dm

Returns the Vox, who now breath Phoron

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

wallets.dm

Handbags

2016-09-24 00:20:48 -04:00