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

..

drilling

if you don't rename all of something, bad things happen m'kay kids

2017-02-04 15:46:03 +00:00

abandonedcrates_vr.dm

Adds anti-tamper to crates and adds anti-tamper 1 to abandoned ones.

2016-05-12 14:14:01 -04:00

abandonedcrates.dm

QoL on abandoned crate puzzle

2017-02-10 00:14:10 +00:00

alloys.dm

AI Core Update

2016-07-05 17:33:34 -04:00

coins.dm

Polaris Sync October 9th (#633)

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

machine_input_output_plates.dm

…

machine_processing.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

machine_stacking.dm

Removes machinedir on in machine_processing.dm and machine_stacking.dm

2015-07-07 18:43:59 -04:00

machine_unloading.dm

…

mine_items.dm

Polaris Sync October 9th (#633)

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

mine_turfs.dm

Fix mining turfs permenently unlit.

2017-04-16 14:46:09 -04:00

mineral_effect.dm

Finalized wall refactor.

2015-04-26 12:58:57 +09:30

mint.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

money_bag.dm

Polaris Sync October 9th (#633)

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

ore_datum.dm

Borosilicate glass alloying should no longer produce slag

2016-07-05 20:20:01 -05:00

ore.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

satchel_ore_boxdm.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00