Fox-McCloud 9d14e6c9da Merge remote-tracking branch 'upstream/master' into lungsss ...

# Conflicts:
#	code/modules/mob/living/carbon/alien/humanoid/life.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/station.dm
#	code/modules/surgery/surgery.dm

2017-08-05 19:03:52 -04:00

..

organs

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

2017-08-05 19:03:52 -04:00

bones.dm

BURNNNNNNN

2017-07-15 23:43:51 -04:00

cavity_implant.dm

BURNNNNNNN

2017-07-15 23:43:51 -04:00

dental_implant.dm

Fixes Dental Pill being an internal organ

2017-01-27 20:02:06 -05:00

encased.dm

BURNNNNNNN

2017-07-15 23:43:51 -04:00

face.dm

BURNNNNNNN

2017-07-15 23:43:51 -04:00

generic.dm

Fixes IPC and Diona Knockdown Immunity

2017-07-20 21:01:55 -04:00

helpers.dm

Binsult.ogg

2017-07-15 12:12:59 -04:00

implant_removal.dm

fixes

2017-06-05 20:34:50 -04:00

limb_augmentation.dm

Binsult.ogg

2017-07-15 12:12:59 -04:00

limb_reattach.dm

Fixes IPC and Diona Knockdown Immunity

2017-07-20 21:01:55 -04:00

organs_internal.dm

instant updates

2017-07-21 02:19:12 -04:00

other.dm

BURNNNNNNN

2017-07-15 23:43:51 -04:00

remove_embedded_object.dm

mostly working now

2017-06-05 19:35:06 -04:00

rig_removal.dm

Ports MarsM0nd's RIG suit fixes.

2017-01-14 17:06:44 -05:00

robotics.dm

instant updates

2017-07-21 02:19:12 -04:00

slime.dm

Surgery Tweaks

2016-03-04 21:47:41 -05:00

surgery.dm

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

2017-08-05 19:03:52 -04:00

tools.dm

The Most Non-Edgey PR Ever

2017-07-01 19:48:43 -04:00