Leshana 197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01 ...

# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm

2017-06-01 17:27:00 -04:00

..

backpack_vr.dm

Fix Tempest's Saddlebags, redo how Saddlebags Work

2017-02-23 19:20:51 -05:00

backpack.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

bags.dm

Trashbag can hold more

2017-05-13 10:20:45 -05:00

belt.dm

Finishes fixing ammo inconsistencies

2017-05-27 04:39:49 -04:00

bible.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

boxes.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01

2017-06-01 17:27:00 -04:00

briefcase.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

fancy.dm

Adds hypo for CMO and adds vials in chem for them to use

2017-01-24 01:47:57 -05:00

firstaid.dm

Kinda reworks Hyposprays/Autoinjectors

2017-04-30 17:13:00 +01:00

internal.dm

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

2017-02-14 20:29:57 -05:00

laundry_basket.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

lockbox.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

misc.dm

Changelog, adds the dicecup to the loadout

2017-04-17 12:44:34 -05:00

secure.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -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

Naming convention of ammo is now consistent

2017-05-26 19:32:23 -04:00

wallets.dm

Wallets can now hold permits.

2017-04-09 12:59:47 -05:00