Kelshark c57914a426 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/admin/verbs/adminhelp.dm
#	maps/virgo-1.dmm

2017-01-21 01:42:11 -05:00

..

internal

Merge pull request #2722 from Anewbe/liver_damage

2016-11-21 12:35:51 -06:00

subtypes

Polaris sync

2017-01-15 18:12:15 -05:00

blood.dm

Tweaks to restore a few VS things

2016-10-21 01:00:59 -04:00

misc.dm

…

organ_external.dm

FBP/Synth wound sprite updater

2016-11-04 14:24:42 -04:00

organ_icon.dm

Revert "Fix: Promethean coloration error"

2017-01-09 20:42:41 -05:00

organ_internal.dm

…

organ_stump.dm

…

organ.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

pain.dm

…

robolimbs_vr.dm

Added Tajaran alternate head for Zeng-Hu synth manufacturer

2016-10-11 13:47:01 -03:00

robolimbs_yw.dm

Merge pull request #8 from izac112/Fluffthing

2016-12-04 13:26:43 -05:00

robolimbs.dm

Brand disks now come in their own crates, prices increased

2016-11-13 16:03:03 -06:00

wound.dm

Bruises now bleed at a much higher damage threshold.

2016-10-11 22:28:57 -05:00