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

# Conflicts:
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt
#	maps/tether/tether-03-station.dmm
#	vorestation.dme

2017-09-03 12:49:08 -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

…

organ_external.dm

Make NIFs survive Rejuve

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

organ_icon.dm

Enables markings system on synth body parts.

2017-08-31 15:40:34 +03: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-28 20:52:11 -04:00

wound.dm

Reduces autoheal cutoff on all external wounds to 10.

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