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

..

antimatter

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

sensors

Fixes computers with custom icon states.

2015-08-21 09:50:39 +02:00

singularity

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

apc.dm

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

batteryrack.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

breaker_box.dm

Compilation fixes.

2015-06-16 11:03:25 +02:00

cable_heavyduty.dm

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

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

cable_logic.dm

…

cable.dm

Added more colour defines, added functionality to the floor painter.

2015-08-18 13:41:04 -07:00

cell.dm

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

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

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

Merge resolution with master.

2015-06-28 06:02:52 +09:30

gravitygenerator.dm

remove the sub-area system

2015-05-10 17:06:29 +01:00

lighting.dm

Commit verison v5 Pre-Alpha Playable Release

2015-08-01 00:02:29 -07:00

pacman2.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

port_gen.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

power.dm

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

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

powernet.dm

Refactors get_apc()

2015-05-28 17:11:26 +02:00

profiling.dm

…

smes_construction.dm

Compilation fixes.

2015-06-16 11:03:25 +02:00

smes.dm

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

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

solar.dm

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

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

terminal.dm

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

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

tracker.dm

Major sheet and material refactor.

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

turbine.dm

More computer overlay changes.

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