Leshana ef3df27528 VOREStation Specific Merge Changes ...

* PolarisSS13/Polaris#4818 with VOREStation/VOREStation#3004
* Repath /obj/item/weapon/material/knuckledusters to /obj/item/clothing/gloves/knuckledusters
* Keep lights on explorer hoods
* Don't map in anti-xeno tasers from Polaris lore.

2018-02-17 16:56:31 -05:00

..

internal

VOREStation Specific Merge Changes

2018-02-17 16:56:31 -05:00

subtypes

VOREStation Specific Merge Changes

2018-02-17 16:56:31 -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

…

organ_external.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

organ_icon.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

2017-12-26 23:07:58 -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 remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10

2018-01-15 13:27:39 -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

Polaris sync

2017-12-21 04:01:07 -05:00

wound.dm

Makes Fire Burn Again

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