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

# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm

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

..

autolathe

Adds a bunch of things to cargo

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

helper_datums

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

locations

Naming inconsistencies fixed

2016-09-13 16:36:43 -04:00

observation

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

repositories

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

supplypacks

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

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

underwear

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

uplink

Merge pull request #2955 from Anewbe/heart_damage

2017-03-28 20:02:24 -05:00

vending

Vending machines now correctly throw products

2016-12-17 03:30:14 -05:00

wires

Make jukebox controllable by its wires

2017-03-20 19:01:33 -04:00

ai_law_sets.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

browser.dm

Allow disabling styling of fake nanoui windows

2016-05-26 18:07:38 +01:00

category.dm

Underwear Datums (#1794)

2016-05-29 17:29:36 +01:00

computerfiles.dm

…

datacore.dm

Replaces Station Administrator

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

EPv2.dm

Adds Telecomms Logging to EPv2

2017-01-07 13:21:03 -05:00

hierarchy.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00

mind.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

mixed.dm

…

modules.dm

…

organs.dm

…

progressbar.dm

Can now toggle the progress bar visibility.

2016-03-30 00:13:41 +01:00

recipe.dm

Removes circuit boards from relevant checks for microwaves, cooking.

2016-05-05 01:24:38 -04:00

sun.dm

…

weakref.dm

Ports the Port of Circuits

2016-09-24 18:06:11 -04:00