PsiOmegaDelta e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm

2015-08-11 08:21:06 +02:00

..

atmoalter

Merge pull request #10233 from Baystation12/master

2015-07-18 22:45:44 +02:00

bots

Compilation fixes.

2015-07-27 10:03:31 +02:00

camera

Fixes #9509

2015-07-13 22:16:35 -04:00

computer

Changes reinforced glass material name

2015-08-03 23:01:34 -04:00

computer3

Fixes #10314

2015-08-02 00:01:10 -04:00

doors

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

2015-08-11 08:21:06 +02:00

embedded_controller

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

2015-07-06 17:31:41 +02:00

kitchen

Fixes #9550 - beakers hit microwaves

2015-07-22 12:40:16 +03:00

pipe

Fixes #10314

2015-08-02 00:01:10 -04:00

telecomms

Updates telecommunications presets

2015-07-29 11:17:42 +02:00

adv_med.dm

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

2015-07-26 10:00:12 +02:00

ai_slipper.dm

…

alarm.dm

Compilation fixes and partial revert of #10456.

2015-08-09 13:27:59 +02:00

atmo_control.dm

…

autolathe_datums.dm

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

2015-05-22 08:26:13 +02:00

autolathe.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

Beacon.dm

…

bees_items.dm

…

biogenerator.dm

…

bioprinter.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

bluespacerelay.dm

Fixes bluespace relay issues (being un deconstructable, and not building properly.

2015-05-28 03:56:53 +01:00

buttons.dm

…

CableLayer.dm

…

cell_charger.dm

Refactor floodlights

2015-05-28 21:45:54 +02:00

cloning.dm

…

commsbantenna.dm

…

constructable_frame.dm

Fixes #10218

2015-07-19 00:36:18 -04:00

cryo.dm

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

2015-07-26 10:00:12 +02:00

cryopod.dm

Cryogenic/robotic storage now uses alt-title for announcements

2015-06-11 21:44:08 +01:00

deployable.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

door_control.dm

…

doppler_array.dm

…

flasher.dm

…

floodlight.dm

Adjustments

2015-05-29 11:42:46 +02:00

floorlayer.dm

Fixes misleading path and proc name

2015-06-26 00:40:31 -04:00

hologram.dm

…

holosign.dm

Fixes #9847

2015-06-20 22:15:38 +09:30

igniter.dm

…

iv_drip.dm

IV stand span classes

2015-05-26 23:07:21 -04:00

jukebox.dm

…

lightswitch.dm

…

machinery.dm

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

2015-07-26 10:00:12 +02:00

magnet.dm

…

mass_driver.dm

…

navbeacon.dm

…

newscaster.dm

…

nuclear_bomb.dm

…

OpTable.dm

…

overview.dm

…

portable_tag_turret.dm

…

portable_turret.dm

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

2015-08-11 08:21:06 +02:00

recharger.dm

Removes unlimited_power var

2015-07-19 00:33:17 -04:00

rechargestation.dm

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

2015-07-26 10:00:12 +02:00

records_scanner.dm

…

requests_console.dm

…

robot_fabricator.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

seed_extractor.dm

…

Sleeper.dm

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

2015-07-26 10:00:12 +02:00

spaceheater.dm

Refactor floodlights

2015-05-28 21:45:54 +02:00

status_display_ai.dm

…

status_display.dm

…

suit_storage_unit.dm

…

supply_display.dm

…

syndicatebeacon.dm

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

2015-08-09 13:15:22 +02:00

teleporter.dm

…

transformer.dm

…

turret_control.dm

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

2015-08-11 08:21:06 +02:00

turrets.dm

Fixes #10258

2015-07-28 20:17:32 -04:00

vending.dm

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

wall_frames.dm

Fixes #9899

2015-07-09 23:17:06 +03:00

walllockers.dm

…

washing_machine.dm

Major sheet and material refactor.

2015-05-17 01:46:53 +09:30

wishgranter.dm

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00