mwerezak e80f42cad4 Merge remote-tracking branch 'upstream/dev' into emergency-shuttle ...

Conflicts:
	code/setup.dm

2014-06-25 13:28:18 -04:00

..

atmoalter

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

2014-06-23 20:57:47 +01:00

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 remote-tracking branch 'upstream/dev' into emergency-shuttle

2014-06-24 00:09:17 -04:00

doors

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

2014-06-23 20:57:47 +01:00

embedded_controller

Adds escape pod docking controller type

2014-06-25 12:32:12 -04:00

kitchen

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

2014-06-20 22:02:40 +01:00

pipe

Trinary atmospheric device variants

2014-05-03 22:01:33 +12:00

telecomms

Monkies / Dionaea nymphs should be able to emote again as well as not talk while dead.

2014-04-25 03:15:14 -05:00

adv_med.dm

Infections now spread between organs

2014-06-20 23:22:03 -04:00

ai_slipper.dm

…

alarm.dm

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

2014-06-23 20:57:47 +01:00

atmo_control.dm

Changes all appropriate instances of toxins to phoron

2014-04-10 15:11:26 -07:00

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

Update and clean up of all manuals

2014-04-20 16:09:57 -07:00

buttons.dm

…

cell_charger.dm

Fixed cell chargers being infinite energy sources

2014-05-06 16:43:16 -04:00

cloning.dm

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

2014-06-19 10:05:27 +10:00

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

Removed pointless option on cryopod.

2014-06-24 13:44:52 +09:30

deployable.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00

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

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

2014-04-16 22:13:48 -07:00

iv_drip.dm

…

lightswitch.dm

…

machinery.dm

Fixes shuttle consoles not checking access

2014-06-25 13:20:12 -04:00

magnet.dm

…

mass_driver.dm

…

navbeacon.dm

…

newscaster.dm

…

OpTable.dm

…

overview.dm

…

podmen.dm

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

2014-06-20 22:02:40 +01:00

portable_turret.dm

…

recharger.dm

allows laptops to be recharged in rechargers.

2014-06-22 23:55:26 -07:00

rechargestation.dm

…

records_scanner.dm

…

requests_console.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00

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

Merge pull request #4723 from Jarcolr/diction

2014-04-09 21:48:19 +04:00

Sleeper.dm

…

spaceheater.dm

…

status_display.dm

Minor shuttle fixes and cleanup

2014-06-23 01:55:43 -04:00

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

Changes most viable, used entries of plasma with phoron.

2014-04-10 05:05:04 -07:00

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

…