Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

appendix.dm

fixed some weird slime runtime that's been around forever apparently

2014-06-17 23:30:25 +01:00

bones.dm

fixed some weird slime runtime that's been around forever apparently

2014-06-17 23:30:25 +01:00

braincore.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

eye.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

face.dm

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

generic.dm

Merge pull request #5284 from boopcat/happydrones

2014-06-18 08:58:00 +09:30

headreattach.dm

Merge pull request #5284 from boopcat/happydrones

2014-06-18 08:58:00 +09:30

implant.dm

fixed some weird slime runtime that's been around forever apparently

2014-06-17 23:30:25 +01:00

other.dm

fixed some weird slime runtime that's been around forever apparently

2014-06-17 23:30:25 +01:00

ribcage.dm

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

2014-06-20 22:02:40 +01:00

robolimbs.dm

Merge pull request #5284 from boopcat/happydrones

2014-06-18 08:58:00 +09:30

surgery.dm

IPC brain surgery code.

2014-01-29 16:01:25 +10:30