Ccomp5950 98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev ...

Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm

2014-03-18 19:44:19 -05:00

..

atmoalter

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06:00

bots

Merge pull request #4337 from Baystation12/dev-freeze

2014-01-31 12:40:15 -08:00

camera

…

computer

Code effeciency project: HUD items rewrite

2014-03-10 21:59:58 -05:00

doors

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

2014-03-18 19:44:19 -05:00

embedded_controller

Various fixes

2014-02-18 00:24:20 +13:00

kitchen

Smartfridges are now hackable. Also fixed a bug where one could not properly access the fridge in chemistry.

2014-03-10 02:14:57 +01:00

pipe

Pipe tweaks

2014-02-20 15:50:12 +13:00

telecomms

Added GhostRadio -- Allowing ghosts to spy on radio from anywhere

2014-01-04 12:25:09 +01:00

adv_med.dm

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06:00

ai_slipper.dm

…

airlock_control.dm

Airlock sensor tweak

2014-03-09 21:30:40 +13:00

alarm.dm

Runtime fix: Alarms keep trying to heat up space.

2014-02-24 01:27:04 -06:00

atmo_control.dm

…

autolathe.dm

Fixes #4221.

2014-01-09 11:37:48 -06:00

Beacon.dm

…

bees_apiary.dm

…

bees_items.dm

…

biogenerator.dm

Reading comprehension fail

2014-03-16 21:43:55 -05:00

buttons.dm

…

cell_charger.dm

…

cloning.dm

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06:00

constructable_frame.dm

Fixed some machinery frames saying they need Manipulators instead of Micro Manipulators.

2014-03-04 19:36:55 +01:00

cryo.dm

NanoUI updates.

2014-01-06 02:49:25 +00:00

cryopod.dm

Merge pull request #4525 from Ccomp5950/pda_nano

2014-03-06 09:09:05 +00:00

deployable.dm

…

door_control.dm

…

doppler_array.dm

…

flasher.dm

…

floodlight.dm

…

Freezer.dm

NanoUI Gas Cooling/Heating System

2014-01-24 00:38:26 +00:00

hologram.dm

…

holosign.dm

…

hydroponics.dm

Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays

2014-03-16 21:16:31 -05:00

igniter.dm

…

iv_drip.dm

Added NO_BLOOD checks to drips, syringes.

2014-01-05 14:13:58 +10:30

lightswitch.dm

Effeciency Project: APC / Machinery power usage.

2014-03-08 03:42:44 -06:00

machinery.dm

APC Area update initial commit.

2014-03-07 23:42:28 -06:00

magnet.dm

…

mass_driver.dm

…

navbeacon.dm

…

newscaster.dm

Personnelly, I feel this pull request was successfull.

2014-01-08 19:26:10 +00:00

OpTable.dm

…

overview.dm

…

podmen.dm

…

portable_turret.dm

…

recharger.dm

…

rechargestation.dm

Code cleanup.

2014-02-04 08:16:06 +03:00

records_scanner.dm

…

requests_console.dm

…

robot_fabricator.dm

…

seed_extractor.dm

…

shieldgen.dm

Fixed inexplicable reversions.

2014-02-19 17:11:09 -07:00

Sleeper.dm

…

spaceheater.dm

…

status_display.dm

…

suit_storage_unit.dm

…

syndicatebeacon.dm

…

teleporter.dm

…

transformer.dm

…

turrets.dm

…

vending.dm

Moving flasks into Booze-O-Mat.

2014-02-03 04:55:42 +03:00

walllockers.dm

…

washing_machine.dm

…

wishgranter.dm

…