GinjaNinja32 631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm

2015-08-11 18:47:05 +01:00

..

atmoalter

Merge pull request #10234 from Baystation12/dev-freeze

2015-07-18 23:56:10 +03:00

bots

Compilation fixes.

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

camera

Merge with dev.

2015-07-15 16:20:39 +09:30

computer

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

2015-08-08 15:34:51 +02:00

computer3

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

2015-08-11 18:47:05 +01:00

doors

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

2015-08-11 08:34:46 +02:00

embedded_controller

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

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

kitchen

Merge pull request #10272 from Baystation12/dev-freeze

2015-07-23 08:14:39 +02:00

pipe

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

2015-08-08 15:34:51 +02:00

telecomms

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

2015-07-31 10:00:16 +02:00

adv_med.dm

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

2015-07-26 10:21:36 +02:00

ai_slipper.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

alarm.dm

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

2015-08-10 17:56:14 +02:00

atmo_control.dm

…

autolathe_datums.dm

…

autolathe.dm

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

2015-08-08 15:34:51 +02:00

Beacon.dm

…

bees_items.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

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

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

cloning.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

commsbantenna.dm

…

constructable_frame.dm

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

2015-07-20 08:28:32 +02:00

cryo.dm

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

2015-07-26 10:21:36 +02:00

cryopod.dm

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

2015-06-16 10:52:33 +02:00

deployable.dm

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

2015-08-08 15:34:51 +02:00

door_control.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

doppler_array.dm

All the span-corrected dm files.

2015-06-14 22:08:14 +02:00

flasher.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

floodlight.dm

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

2015-05-30 16:11:57 +02:00

floorlayer.dm

Fixes misleading path and proc name

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

hologram.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

holosign.dm

Fixes #9847

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

igniter.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

iv_drip.dm

Dev-freeze into dev merge.

2015-05-30 00:31:12 +09:30

jukebox.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

lightswitch.dm

…

machinery.dm

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

2015-07-26 10:21:36 +02:00

magnet.dm

…

mass_driver.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

navbeacon.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

newscaster.dm

…

nuclear_bomb.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

OpTable.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

overview.dm

…

portable_tag_turret.dm

…

portable_turret.dm

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

2015-08-11 08:34:46 +02:00

recharger.dm

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

2015-07-20 08:28:32 +02:00

rechargestation.dm

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

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

records_scanner.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

requests_console.dm

Request Console NanoUI and fixes

2015-06-11 21:43:27 -04:00

robot_fabricator.dm

Fixes #10314

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

seed_extractor.dm

…

Sleeper.dm

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

2015-08-11 18:47:05 +01:00

spaceheater.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-02 17:33:20 +01:00

status_display_ai.dm

…

status_display.dm

…

suit_storage_unit.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

supply_display.dm

…

syndicatebeacon.dm

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

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

teleporter.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

transformer.dm

…

turret_control.dm

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

2015-08-11 08:34:46 +02:00

turrets.dm

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

2015-07-30 10:49:37 +02:00

vending.dm

Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct

2015-06-21 01:18:25 +09:30

wall_frames.dm

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

walllockers.dm

…

washing_machine.dm

code/machinery, fix for code/antagonist merge string causing false positive

2015-05-30 14:05:32 +01:00

wishgranter.dm

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

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