PsiOmega 7e498e1cf7 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/hydroponics/seed_datums.dm
	code/modules/hydroponics/trays/tray_apiary.dm
	code/modules/power/apc.dm
	code/setup.dm

2015-02-27 09:06:48 +01:00

..

blob

…

carbon

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

2015-02-27 09:06:48 +01:00

silicon

Merge pull request #8279 from PsiOmegaDelta/CameraNet

2015-02-26 16:28:49 +10:30

simple_animal

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

damage_procs.dm

…

living_defense.dm

Fixes throwing miss chance using min instead of max

2015-02-14 22:12:42 -05:00

living_defines.dm

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

2015-02-03 22:27:22 +01:00

living_powers.dm

Fixes hiding mobs being layered underneath vents

2015-02-19 01:02:32 -05:00

living.dm

Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay.

2015-02-20 08:04:17 -05:00

login.dm

Overhauls SSD mechanic.

2014-12-27 09:16:50 -08:00

logout.dm

Fixes a comment, bleh.

2014-12-27 10:57:13 -08:00

say.dm

…