Kelenius b7a628d53d Merge branch 'dev' into ofBotsAndMobs ...

Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm

2015-04-26 17:18:20 +03:00

..

atmoalter

Adds Destroys.

2015-04-24 17:11:14 +02:00

bots

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

camera

Adds Destroys.

2015-04-24 17:11:14 +02:00

computer

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

computer3

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

doors

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

embedded_controller

Adds Destroys.

2015-04-24 17:11:14 +02:00

kitchen

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

pipe

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

telecomms

Adds Destroys.

2015-04-24 17:11:14 +02:00

adv_med.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

ai_slipper.dm

Pass at removing empty process() on game/machinery

2015-03-14 21:38:23 +01:00

alarm.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

atmo_control.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

autolathe_datums.dm

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

autolathe.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

Beacon.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

bees_items.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

biogenerator.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

bioprinter.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

bluespacerelay.dm

Fixes blue, removes commented out code, gives file a meaningful name.

2015-04-07 13:54:22 +01:00

buttons.dm

Pass at removing empty process() on game/machinery

2015-03-14 21:38:23 +01:00

CableLayer.dm

Add code to CableLayer

2015-04-22 08:42:49 +03:00

cell_charger.dm

…

cloning.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

commsbantenna.dm

Big emergency message changes

2015-04-06 20:17:18 +01:00

constructable_frame.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

cryo.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

cryopod.dm

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

deployable.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

door_control.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-16 12:39:32 +01:00

doppler_array.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

flasher.dm

Merge with dev.

2015-03-24 14:41:07 +10:30

floodlight.dm

…

floorlayer.dm

Remove .contents in loop.

2015-04-23 11:59:34 +03:00

hologram.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

holosign.dm

Pass at removing empty process() on game/machinery

2015-03-14 21:38:23 +01:00

igniter.dm

Pass at removing empty process() on game/machinery

2015-03-14 21:38:23 +01:00

iv_drip.dm

…

jukebox.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

lightswitch.dm

…

machinery.dm

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

magnet.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

mass_driver.dm

Pass at removing empty process() on game/machinery

2015-03-14 21:38:23 +01:00

navbeacon.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

newscaster.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

nuclear_bomb.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

OpTable.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

overview.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

portable_tag_turret.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

portable_turret.dm

Merge branch 'dev' into ofBotsAndMobs

2015-04-26 17:18:20 +03:00

recharger.dm

…

rechargestation.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

records_scanner.dm

…

requests_console.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

robot_fabricator.dm

Pass at removing empty process() on game/machinery

2015-03-14 21:38:23 +01:00

seed_extractor.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

Sleeper.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

spaceheater.dm

…

status_display_ai.dm

…

status_display.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

suit_storage_unit.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

supply_display.dm

…

syndicatebeacon.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

teleporter.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

transformer.dm

Robot code clean up and fixes.

2015-03-10 13:37:20 +01:00

turret_control.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

turrets.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

vending.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

walllockers.dm

…

washing_machine.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

wishgranter.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30