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

..

atmospherics.dm

Adds engineering + science crates (#3072)

2017-03-21 18:38:47 -05:00

contraband_vr.dm

Fixes contraband maybe for real this time (#588)

2016-09-25 18:43:26 -04:00

contraband.dm

Finishes fixing ammo inconsistencies

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

costumes.dm

Aprons now have pockets

2017-04-02 00:28:20 -05:00

engineering.dm

Adds a bunch of things to cargo

2017-03-31 00:23:27 -05:00

hospitality.dm

Adjusts and attempts to normalize cargo costs

2016-06-27 19:32:46 +01:00

hydroponics_vr.dm

Added 3 new crates to cargo:

2017-04-20 20:48:27 -03:00

hydroponics.dm

Aprons now have pockets

2017-04-02 00:28:20 -05:00

materials.dm

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

medical.dm

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

2017-04-01 12:45:45 -05:00

misc_vr.dm

adds particle guns to science and cargo

2017-03-09 18:10:26 +00:00

misc.dm

Hood tweaks

2017-01-18 17:02:01 -06:00

munitions.dm

Finishes fixing ammo inconsistencies

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

recreation_vr.dm

Cargo love: Reviews Corrections

2017-04-21 11:55:27 -03:00

recreation.dm

Adjusts and attempts to normalize cargo costs

2016-06-27 19:32:46 +01:00

robotics.dm

Adds a bunch of things to cargo

2017-03-31 00:23:27 -05:00

science_vr.dm

Fix lesser predator crate

2017-05-30 15:13:50 -04:00

science.dm

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

2017-04-01 19:19:42 -04:00

security.dm

Adds 23 new skirt versions of existing suit sprites.

2017-04-29 12:01:40 +01:00

supply.dm

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

supplypacks.dm

Polaris Sync October 9th (#633)

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

voidsuits.dm

1.6.3 Ports of Bay's suit clothing

2016-11-24 19:19:26 -08:00