Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme

2015-08-23 01:30:46 -04:00

..

atmoalter

Merge pull request #10040 from PsiOmegaDelta/150707-MoreOverlaysFewerStates

2015-08-16 00:40:47 +01:00

bots

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

2015-08-17 09:44:21 +02:00

camera

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

2015-08-23 01:30:46 -04:00

computer

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

2015-08-23 01:30:46 -04:00

computer3

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

doors

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

2015-08-23 01:30:46 -04: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

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

telecomms

More computer overlay changes.

2015-08-20 08:38:43 +02:00

adv_med.dm

Sets the density of sleeper/body scan consoles to 0

2015-08-04 05:03:42 -04:00

ai_slipper.dm

…

alarm.dm

One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.

2015-08-15 15:22:37 +02:00

atmo_control.dm

Computers are now overlay based.

2015-07-07 17:23:49 +02:00

autolathe_datums.dm

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

2015-08-22 15:44:02 +01:00

autolathe.dm

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

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

Beacon.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

biogenerator.dm

…

bioprinter.dm

Fixes #10314

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

buttons.dm

…

CableLayer.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

cell_charger.dm

…

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

constructable_frame.dm

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

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

cryo.dm

Sleepers, body scanners, intercoms, sinks, stools and fire extinguisher cabinets will now rotate correctly with client.dir

2015-08-18 14:51:59 +01:00

cryopod.dm

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

2015-08-23 01:30:46 -04:00

deployable.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

door_control.dm

Removes #undefine

2015-08-18 17:20:39 -04:00

doppler_array.dm

All the span-corrected dm files.

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

flasher.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

floodlight.dm

…

floor_light.dm

Reimplemented floor lights as a machine built at the autolathe.

2015-08-16 19:26:17 -07:00

floorlayer.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

hologram.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/25/2015_bay_sync

2015-06-25 18:50:18 -04:00

holosign.dm

Fixes #9847

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

igniter.dm

…

iv_drip.dm

…

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

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

mass_driver.dm

…

navbeacon.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

newscaster.dm

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

nuclear_bomb.dm

…

OpTable.dm

…

overview.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

portable_turret.dm

Merge pull request #9159 from Kelenius/ofClicksAndCooldowns

2015-08-22 01:51:05 +09:30

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

…

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

Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir

2015-08-18 13:43:11 +01:00

spaceheater.dm

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

2015-08-12 21:18:18 +02: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

Computers are now overlay based.

2015-07-07 17:23:49 +02:00

transformer.dm

…

turret_control.dm

One can now greatly customize syndicate ids. Partially based on https://github.com/ParadiseSS13/Paradise/pull/1686.

2015-08-15 15:22:37 +02:00

turrets.dm

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

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

vending.dm

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

2015-08-23 01:30:46 -04:00

wall_frames.dm

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

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

walllockers.dm

…

washing_machine.dm

…

wishgranter.dm

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

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