Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23 ...

# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-02-23 21:55:42 -05:00

..

atmospherics.dm

Adds engineering + science crates (#3072)

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

contraband_vr.dm

Proper Naming for VIRGO PR #3000

2018-02-08 17:43:23 -06:00

contraband.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

costumes.dm

Loadout adjustments.

2017-12-02 08:59:46 -05:00

engineering_vr.dm

VOREStation Tweaks to the Tesla engine

2018-01-21 16:19:13 -05:00

engineering.dm

Adds New Advanced Shields, Tweaks

2017-10-26 20:55:13 -04:00

hospitality.dm

The largest PR I've probably actually done. Adds the following:

2018-02-15 03:33:23 -06:00

hydroponics_vr.dm

Fixes more indentation errors

2017-08-28 22:56:57 +02:00

hydroponics.dm

Hatchets - > Machete subtype.

2018-01-12 21:21:18 -08:00

materials.dm

Adds various cabin-related things. (#4888)

2018-02-21 15:45:01 -06:00

medical_vr.dm

Adds Taur Biosuits to Medical Biosuit Crate

2017-09-16 13:13:03 -04:00

medical.dm

Adds more med gear to R&D and Cargo (#4691)

2018-02-04 22:18:36 -06:00

misc_vr.dm

STEALTH NERFSZZZZ - Removes rigs

2018-01-27 21:28:21 -05:00

misc.dm

Adds holoplants, and to cargo

2018-02-20 22:17:50 -05:00

munitions_vr.dm

Adds frontier phaser to cargo

2018-02-06 21:58:08 -05:00

munitions.dm

Makes the energy carbine crate consistent.

2018-02-04 14:20:03 +01:00

recreation_vr.dm

AwooCosplayCrate

2018-02-08 12:57:18 -06:00

recreation.dm

…

robotics.dm

Adds a load of new FBPs. (#3850)

2017-09-20 22:02:18 -05:00

science_vr.dm

disables pc grab growl while travis sucks legs over unrelated map bugs

2018-01-29 09:02:48 +02:00

science.dm

Polaris sync

2017-08-06 19:07:17 -04:00

security_vr.dm

disables pc grab growl while travis sucks legs over unrelated map bugs

2018-01-29 09:02:48 +02:00

security.dm

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

2018-02-23 21:55:42 -05:00

supply.dm

Update supply.dm

2017-09-02 20:04:18 -04:00

supplypacks.dm

Polaris Sync October 9th (#633)

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

voidsuits_vr.dm

Adds Taur Voidsuits to Relevant Supply Packs

2017-09-16 13:06:10 -04:00

voidsuits.dm

Adjusts streamlined (Vey-Med) med voidsuits

2017-11-07 21:58:13 +00:00