Cael_Aislinn 7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-01-07 22:26:24 +10:00

..

organ_external.dm

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-07 22:26:24 +10:00

organ_internal.dm

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

organ.dm

Ported autopsy.

2012-11-14 20:31:31 +01:00

pain.dm

Surgery now triggers specialized pain messages if not done with anesthetic.

2012-11-13 17:06:06 +01:00

wound.dm

Balance fixes to internal wounds.

2012-11-13 16:01:43 +01:00