Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

atmoalter

Merge resolution with master.

2014-06-02 12:05:12 +09:30

bots

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

camera

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

computer

Merge pull request #5207 from mwerezak/get_turf_loc-cleanup

2014-06-12 18:13:01 +09:30

doors

Adds docking control to ERT shuttle

2014-06-14 18:35:02 -04:00

embedded_controller

Streamlined docking code

2014-06-14 15:51:26 -04:00

kitchen

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

pipe

…

telecomms

…

adv_med.dm

…

ai_slipper.dm

…

alarm.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

atmo_control.dm

…

autolathe_datums.dm

Further work on autolathe.

2014-06-11 15:39:14 +09:30

autolathe.dm

Further work on autolathe.

2014-06-11 15:39:14 +09:30

Beacon.dm

…

bees_apiary.dm

…

bees_items.dm

…

buttons.dm

…

cell_charger.dm

…

cloning.dm

Merge resolution with master.

2014-06-02 12:05:12 +09:30

constructable_frame.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

cryo.dm

…

cryopod.dm

…

deployable.dm

…

door_control.dm

Adds docking support to shuttles, NanoUI

2014-06-09 23:41:08 -04:00

doppler_array.dm

…

flasher.dm

…

floodlight.dm

…

Freezer.dm

…

hologram.dm

Fixes #5109

2014-06-01 20:07:22 +09:30

holosign.dm

…

igniter.dm

…

iv_drip.dm

…

lightswitch.dm

…

machinery.dm

Added multipliers to autolathe.

2014-06-11 15:06:46 +09:30

magnet.dm

…

mass_driver.dm

…

navbeacon.dm

…

newscaster.dm

…

OpTable.dm

…

overview.dm

…

podmen.dm

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

portable_turret.dm

…

recharger.dm

…

rechargestation.dm

…

records_scanner.dm

…

requests_console.dm

…

robot_fabricator.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

seed_extractor.dm

…

shieldgen.dm

…

Sleeper.dm

…

spaceheater.dm

…

status_display.dm

…

suit_storage_unit.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

syndicatebeacon.dm

…

teleporter.dm

Teleporter mapping enhancement

2014-06-07 23:59:46 +12:00

transformer.dm

…

turrets.dm

…

vending.dm

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

walllockers.dm

…

washing_machine.dm

Compile fix for a fix for legcuffs.

2014-06-12 02:50:11 +04:00

wishgranter.dm

…