Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 ...

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm

2018-04-06 15:40:06 -04:00

..

internal

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

2018-03-31 09:20:59 -04:00

subtypes

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

2018-04-06 15:40:06 -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

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

2018-03-31 09:20:59 -04:00

organ_icon.dm

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

2018-03-31 09:20:59 -04:00

organ_internal.dm

…

organ_stump.dm

…

organ.dm

Ports antibiotics overhaul (#5050)

2018-03-22 09:55:49 -07:00

pain.dm

…

robolimbs_vr.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

…