Arokha Sieyes 484fb96202 Merge branch 'master' of https://github.com/PolarisSS13/Polaris ...

# Conflicts:
#	.travis.yml
#	code/game/machinery/adv_med.dm
#	code/modules/mob/mob.dm

2016-07-03 16:21:21 -04:00

..

drilling

Frame Fixes

2016-06-01 14:32:56 -04: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

Removed xenomorphs.

2016-02-20 11:50:18 +10:30

alloys.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2

2015-09-01 03:22:08 +02:00

coins.dm

…

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

…

machine_unloading.dm

…

mine_items.dm

Refactors specialized satchels as children of the regular (leather) satchel

2016-04-29 18:44:28 -05:00

mine_turfs.dm

510 Improved Overlays

2016-06-18 15:50:10 -03:00

mineral_effect.dm

…

mint.dm

Fixes #10314

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

money_bag.dm

…

ore_datum.dm

Renamed silicates to sand.

2015-12-11 15:53:23 +10:30

ore.dm

Tweaks to the previous commits.

2015-12-11 15:55:31 +10:30

satchel_ore_boxdm.dm

Reverts the second mob clean up because of incomplete implementation.

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