Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

diseases

Fixed some shiet

2014-12-21 08:19:23 +03:00

helper_datums

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00

spells

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00

wires

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

ai_laws.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

browser.dm

Fixes grinders opening their menus on range. Fixed #4088

2014-11-08 15:28:32 +01:00

computerfiles.dm

…

datacore.dm

fixes bugs

2014-12-23 12:07:32 -08:00

datumvars.dm

TimSort for byond:

2014-09-01 11:29:49 +01:00

gas_mixture.dm

Fixes LINDA not properly activating turfs who are next to unsimulated turfs with differences (space turfs are unsimulated)

2014-11-05 14:54:29 -03:00

hud.dm

/datum/atom_hud (Passive HUDs) bugfixes

2014-12-06 15:05:23 -03:00

mind.dm

Fixes 2 runtimes

2014-12-15 22:30:23 -03:00

mixed.dm

…

modules.dm

…

mutations.dm

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00

recipe.dm

…

spell.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

sun.dm

…

supplypacks.dm

Merge pull request #6591 from phil235/FingerlessSpriteFix

2014-12-27 15:46:43 -03:00

uplink_item.dm

fixes c90 uplink

2014-12-11 13:48:10 -08:00