Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

augment

Adds two new augments to Traitor uplink

2020-09-20 06:49:58 -04:00

robotic

FBP Internal Components

2020-08-20 21:40:15 -04:00

appendix.dm

…

augment.dm

Antag Uplink Expansion

2020-03-17 00:23:20 -04:00

brain.dm

Fix promethean revival flavor text and OOC notes

2020-08-05 05:26:03 -04:00

eyes.dm

…

heart.dm

FBP Internal Components

2020-08-20 21:40:15 -04:00

intestine.dm

…

kidneys.dm

…

liver.dm

…

lungs_ch.dm

…

lungs.dm

Update lungs.dm

2020-03-27 08:39:57 -04:00

organ_internal.dm

…

spleen.dm

…

stomach.dm

Merge pull request #7668 from Mechoid/ReagentCyclingCycler

2020-09-21 12:48:24 -04:00

voicebox.dm

…