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

..

PDA

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

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

radio

Merge pull request #10972 from Zuhayr/resomi

2015-09-06 13:09:34 +03:00

aicard.dm

Should fix AI-camera breaking when moved between cards.

2015-08-24 17:12:41 +09:30

binoculars.dm

…

chameleonproj.dm

…

debugger.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

flash.dm

Species flash cleanup.

2015-09-06 10:09:03 +09:30

flashlight.dm

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

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

floor_painter.dm

Removing unneeded defines.

2015-08-19 14:23:27 +09:30

lightreplacer.dm

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

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

megaphone.dm

…

modkit.dm

…

multitool.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

paicard.dm

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

2015-08-29 10:06:18 +02:00

pipe_painter.dm

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

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

powersink.dm

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

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

scanners.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

spy_bug.dm

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

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

suit_cooling.dm

…

t_scanner.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

taperecorder.dm

…

traitordevices.dm

…

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

uplink_categories.dm

Adds anti-photon grenades.

2015-07-28 09:25:38 +02:00

uplink_items.dm

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

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

uplink_random_lists.dm

Adds anti-photon grenades.

2015-07-28 09:25:38 +02:00

uplink.dm

Uplink fixes.

2015-09-08 08:43:40 +02:00

violin.dm

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

whistle.dm

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

2015-08-24 10:23:12 +02:00