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

# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm

2018-03-03 13:09:57 -05:00

..

internal

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

2018-02-23 21:55:42 -05:00

subtypes

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

2018-03-03 13:09:57 -05:00

blood.dm

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

2018-01-21 00:23:00 -05:00

misc.dm

Returns the Vox, who now breath Phoron

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

organ_external.dm

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

2018-02-27 21:27:35 -05:00

organ_icon.dm

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

2018-02-23 21:55:42 -05: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

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

2018-02-23 21:55:42 -05: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.dm

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

2018-02-23 21:55:42 -05:00

wound.dm

Makes Fire Burn Again

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