Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

atmoalter

Effeciency Project: APC / Machinery power usage.

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

bots

Merge pull request #4715 from Iamgoofball/FUCKMONKEY

2014-04-11 11:47:37 -07:00

camera

Bugfix 2: Electric Boogaloo, Ninjas being tracked by AI's

2014-03-23 05:43:18 -05:00

computer

Merge pull request #4762 from mwerezak/holotable

2014-04-16 22:19:53 -05:00

doors

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

2014-03-28 18:46:04 -05:00

embedded_controller

Various fixes

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

kitchen

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

2014-04-04 01:14:31 -05:00

pipe

Pipe tweaks

2014-02-20 15:50:12 +13: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

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00: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 a critical exploit.

2014-04-13 11:30:44 +02:00

Beacon.dm

…

bees_apiary.dm

…

bees_items.dm

Update and clean up of all manuals

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

biogenerator.dm

Reading comprehension fail

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

buttons.dm

…

cell_charger.dm

…

cloning.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04: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

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

cryopod.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

deployable.dm

Grammar patch 1

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

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

Merge pull request #4704 from Jarcolr/patch-1

2014-04-06 18:33:51 -07:00

igniter.dm

changes attack hand to return

2014-04-09 14:07:16 -07:00

iv_drip.dm

…

lightswitch.dm

Effeciency Project: APC / Machinery power usage.

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

machinery.dm

die monkey emergency DIE

2014-04-06 12:05:41 -07: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

replaced electrodes with insta hit taser beams.

2014-04-05 17:13:09 -07:00

recharger.dm

…

rechargestation.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

records_scanner.dm

…

requests_console.dm

Grammar patch 1

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

robot_fabricator.dm

…

seed_extractor.dm

…

shieldgen.dm

Merge pull request #4723 from Jarcolr/diction

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

Sleeper.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

spaceheater.dm

…

status_display.dm

…

suit_storage_unit.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

syndicatebeacon.dm

…

teleporter.dm

…

transformer.dm

…

turrets.dm

…

vending.dm

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

2014-04-25 21:14:58 -05:00

walllockers.dm

…

washing_machine.dm

…

wishgranter.dm

…