Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 ...

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

2017-05-08 21:07:45 -04:00

..

internal

Adds Modifier System, Changes Some Ling Stuff

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

subtypes

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

2017-04-25 15:04:54 -04:00

blood.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04: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 polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

organ_icon.dm

Merge pull request #3152 from VOREStation/aro-pol-bodymarks

2017-03-30 20:13:15 -05:00

organ_internal.dm

Adds Modifier System, Changes Some Ling Stuff

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

organ_stump.dm

…

organ.dm

Ling and Technomancer now have ways to cure infections

2017-04-12 19:15:32 -05:00

pain.dm

Should fix a Travis issue

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

robolimbs_vr.dm

Fix up a few more things with synth printing

2017-04-09 23:56:13 -04:00

robolimbs.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

wound.dm

Bruises now bleed at a much higher damage threshold.

2016-10-11 22:28:57 -05:00