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

Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml

2015-09-11 08:54:03 +02:00

..

antimatter

…

sensors

Fixes computers with custom icon states.

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

singularity

fixes emitter runtime by using new calling syntax

2015-08-31 16:41:43 +10:00

apc.dm

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

2015-09-11 08:54:03 +02:00

batteryrack.dm

…

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

Multi-Z.

2015-08-30 14:15:20 -07:00

cell.dm

…

fractal_reactor.dm

…

generator_type2.dm

…

generator.dm

Merge resolution with master.

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

gravitygenerator.dm

…

lighting.dm

Merge pull request #10784 from Kelenius/masterRuntimes

2015-09-07 14:01:24 +09:30

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

…

profiling.dm

…

smes_construction.dm

Compilation fixes.

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

smes.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02: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

…

turbine.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-20 14:09:07 +02:00