Hawk_v3 22f600c51d Merge remote-tracking branch 'upstream/master'

2018-07-21 22:56:04 +01:00

..

internal

Language and Larynx Additions

2018-07-14 00:14:49 -04:00

subtypes

Fix merge conflicts

2018-07-21 11:34:54 -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 pull request #5386 from Mechoid/End_The_Tyranny_Of_Chemistry

2018-07-14 15:57:52 -04:00

organ_icon.dm

Synth markings

2018-07-11 21:28:19 -04:00

organ_internal.dm

…

organ_stump.dm

…

organ.dm

Language and Larynx Additions

2018-07-14 00:14:49 -04:00

pain.dm

…

robolimbs_vr.dm

Enables skin_tone on DSI parts

2018-07-08 22:46:58 -04:00

robolimbs_yw.dm

…

robolimbs.dm

Remove Veymed portion of change for weakness

2018-06-15 08:55:20 -04:00

wound.dm

…