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

# Conflicts:
#	code/datums/supplypacks/engineering.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	code/modules/vore/appearance/spider_taur_powers_vr.dm
#	code/modules/vore/resizing/resize_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi

2017-08-18 08:14:12 -04:00

..

internal

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

subtypes

A big accessory blend mode overhaul.

2017-08-12 19:08:23 +03:00

blood.dm

Polaris sync

2017-08-06 19:07:17 -04:00

misc.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

organ_external.dm

Make NIFs survive Rejuve

2017-06-06 19:34:53 -04:00

organ_icon.dm

Fixes Promethean Humans looking really, really bad

2017-08-13 21:48:41 +01:00

organ_internal.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

organ_stump.dm

…

organ.dm

Basically initial working traits

2017-05-29 05:08:25 -04:00

pain.dm

Should fix a Travis issue

2017-03-28 20:24:17 -05:00

robolimbs_vr.dm

FIXES

2017-08-12 23:49:24 -04:00

robolimbs_yw.dm

…

robolimbs.dm

Polaris sync

2017-08-06 19:07:17 -04:00

wound.dm

Reduces autoheal cutoff on all external wounds to 10.

2017-05-24 15:45:48 -05:00