mwerezak 77288fb951 Merge remote-tracking branch 'upstream/dev' into camera ...

Conflicts:
	code/game/machinery/portable_turret.dm

2014-12-03 23:37:02 -05:00

..

diseases

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

helper_datums

Fixes teleporting while buckled

2014-07-02 22:35:11 +02:00

spells

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

wires

Cameras can be broken by weapons/projectiles, fixes

2014-12-03 10:36:30 -05:00

ai_laws.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

browser.dm

Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.

2014-06-22 03:31:06 -07:00

computerfiles.dm

…

datacore.dm

Skrell icon/appearance changes

2014-11-20 13:10:42 -05:00

datumvars.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

disease.dm

Update disease.dm

2013-09-01 23:42:35 -07:00

mind.dm

Relocates combat log proc as a child of unarmed_attack, adds procs for

2014-11-20 17:42:40 +01:00

mixed.dm

Powernets

2014-09-07 01:10:22 -04:00

modules.dm

…

organs.dm

…

recipe.dm

…

spell.dm

Moved everything to a module-based hardsuit system.

2014-11-14 22:57:26 +10:30

sun.dm

Automatic solar tracking again functional.

2014-11-14 08:12:39 +01:00

supplypacks.dm

Merge pull request #7195 from PsiOmegaDelta/BloodDrive

2014-12-02 20:31:04 -05:00