mwerezak d6498cd45f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation ...

Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm

2015-04-13 17:12:02 -04:00

..

blood.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs

2015-03-26 23:25:26 +10:30

organ_alien.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

organ_external.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation

2015-04-13 17:12:02 -04:00

organ_icon.dm

Attempting to fix icon procs for organs.

2015-04-03 21:04:05 -07:00

organ_internal.dm

More organ fixes. Yay.

2015-04-03 21:47:37 -07:00

organ_stump.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

organ.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dislocation

2015-04-13 17:12:02 -04:00

pain.dm

More work on severing, improvements to yank-out-object.

2015-03-27 17:51:10 +10:30

robolimbs.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

wound.dm

More organ fixes. Yay.

2015-04-03 21:47:37 -07:00