Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

autolathe

Autolathe card creation

2017-04-06 18:00:18 -04:00

helper_datums

…

locations

…

observation

…

repositories

…

supplypacks

Cargo love: Reviews Corrections

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

underwear

…

uplink

Adds ion pistol to uplink, allows holstering

2017-04-20 20:04:21 -05:00

vending

…

wires

Make jukebox controllable by its wires

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

ai_law_sets.dm

…

ai_laws.dm

…

browser.dm

…

category.dm

…

computerfiles.dm

…

datacore.dm

Brain type is shown on all records

2017-04-22 18:18:31 -07:00

EPv2.dm

…

hierarchy.dm

…

mind.dm

…

mixed.dm

…

modules.dm

…

organs.dm

…

progressbar.dm

…

recipe.dm

…

sun.dm

…

weakref.dm

…