Lohikar dcf1b7d3ea Fix merge conflicts with mining changes

2017-03-22 17:54:52 -05:00

..

_defines.dm

Fixes hemostat surgery.

2015-12-02 08:56:58 +01:00

~defines.dm

Fixes hemostat surgery.

2015-12-02 08:56:58 +01:00

bones.dm

Tech Fixes: (#1888)

2017-03-12 11:52:33 +02:00

encased.dm

Tech Fixes: (#1888)

2017-03-12 11:52:33 +02:00

face.dm

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

generic.dm

Fixing Airlocks (#1546)

2017-01-13 23:39:22 +02:00

implant.dm

Merge remote-tracking branch 'bay12-upstream/master' into development

2016-10-07 00:58:39 +03:00

limb_reattach.dm

Merge pull request #11935 from comma/wounds

2016-01-11 17:37:25 +01:00

organs_internal.dm

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

other.dm

New Map Mining (#1935)

2017-03-22 18:14:37 -04:00

robotics.dm

Fix merge conflicts with mining changes

2017-03-22 17:54:52 -05:00

slimes.dm

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

surgery.dm

Tech Fixes: (#1888)

2017-03-12 11:52:33 +02:00