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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

diseases

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

2014-12-16 02:52:08 +03:00

helper_datums

Merge pull request #5397 from Jordie0608/nowweneedassistantsanctuaries

2014-10-22 10:55:52 -07:00

spells

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

2014-12-16 02:52:08 +03:00

wires

* limit atmos/fire alerts to the current z_level

2014-11-14 10:10:45 +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

Reverts Antag selection happening before job selection

2014-10-09 22:57:19 +01: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

/datum/atom_hud (Passive HUDs) bugfixes

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

mixed.dm

Tweaked the power distribution handling :

2014-05-25 00:54:41 +02:00

modules.dm

…

mutations.dm

Added comments for RR for future

2014-12-16 02:35:54 +03:00

recipe.dm

…

spell.dm

SPANCLASSES!!!!!

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

sun.dm

Delegated the panels and trackers control to Solar Control Computers instead of the Sun controller.

2014-07-04 21:42:36 +02:00

supplypacks.dm

Merge pull request #6329 from phil235/HungerChange

2014-12-14 12:55:21 -06:00

uplink_item.dm

fixes c90 uplink

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