Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm

2015-08-18 18:38:59 +02:00

..

appendix.dm

Squish Squash

2015-04-04 14:27:53 -04:00

bones.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

braincore.dm

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

brainrepair.dm

Squish Squash

2015-04-04 14:27:53 -04:00

encased.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

eye.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

face.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

generic.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

implant.dm

IPC overhaul part deux

2015-08-16 02:34:52 +02:00

limb_reattach.dm

IPC overhaul part deux

2015-08-16 02:34:52 +02:00

organs_internal.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

other.dm

Fixes surgery runtimes/errors

2015-05-18 06:12:40 -04:00

ribcage.dm

Squish Squash

2015-04-04 14:27:53 -04:00

robotics.dm

Final IPC fixes (hopefully)

2015-08-16 03:43:20 +02:00

slime.dm

IPC overhaul

2015-08-15 23:52:26 +02:00

surgery.dm

Fixed being able to switch surgery targets mid-step

2015-04-06 17:05:48 -04:00

tools.dm

Icon and Sound Cleanup

2015-06-06 09:38:10 -04:00