Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

2017-01-31 17:44:38 +01:00

..

organs

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-20 23:43:35 +01:00

bones.dm

…

dental_implant.dm

Fixes Dental Pill being an internal organ

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

encased.dm

…

face.dm

…

generic.dm

…

helpers.dm

…

implant.dm

…

limb_reattach.dm

…

organs_internal.dm

Fix xenomorph organ surgery (properly)

2016-12-21 07:16:13 -08:00

other.dm

…

rig_removal.dm

Ports MarsM0nd's RIG suit fixes.

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

robotics.dm

…

slime.dm

…

surgery.dm

…

tools.dm

…