Repede 7c6aadd829 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm

2018-03-23 20:25:18 -04:00

..

internal

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2018-03-04 13:32:53 -05:00

subtypes

Change to Teshari to test for bug

2018-03-21 23:24:41 -04:00

blood.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

misc.dm

…

organ_external_vr.dm

VS: Nano ignores organ robotics sometimes

2018-03-17 19:45:59 -04:00

organ_external.dm

VS: Fix various screams and emotes in bellies

2018-03-18 20:36:00 -04:00

organ_icon.dm

POLARIS: Fixes #3308 (VS) - Skrell lack eyes

2018-03-20 14:22:51 -04:00

organ_internal.dm

Clears out the rest of them and leaves comments.

2017-10-21 15:38:19 -04:00

organ_stump.dm

…

organ.dm

POLARIS: Fix a couple organ dropping bugs

2018-03-17 22:15:13 -04:00

pain.dm

Should fix a Travis issue

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

robolimbs_vr.dm

Update robolimbs_vr.dm

2017-09-10 20:07:26 -04:00

robolimbs_yw.dm

…

robolimbs.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

wound.dm

Makes Fire Burn Again

2017-09-13 06:26:08 -04:00