LetterJay 8bc642c6bd Merge pull request #6992 from Citadel-Station-13/upstream-merge-38220 ...

[MIRROR] Fixes pocket items being deleted when monkeyizing

2018-06-03 16:19:36 -05:00

..

_common

…

abductor

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

blob

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

brainwashing

…

brother

Makes more messages pronoun sensitive

2018-05-03 17:46:25 -05:00

changeling

Merge branch 'master' into upstream-merge-37582

2018-05-22 07:22:42 -05:00

clockcult

Merge pull request #6978 from Citadel-Station-13/upstream-merge-38170

2018-06-02 07:32:31 -05:00

cult

Merge pull request #6986 from Citadel-Station-13/upstream-merge-38250

2018-06-03 10:42:16 -05:00

devil

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

disease

…

ert

…

greentext

…

highlander

Fixes pocket items being deleted when monkeyizing (#38220)

2018-06-03 09:04:08 -05:00

monkey

…

morph

Fixes morphs (#37772)

2018-05-11 17:30:41 -05:00

nightmare

…

ninja

…

nukeop

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

official

Merge pull request #37229 from vuonojenmustaturska/centcommission

2018-04-16 16:17:42 -05:00

pirate

…

revenant

Removes drone overlays and the associated code (#38175)

2018-05-31 22:41:21 -05:00

revolution

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

separatist

…

slaughter

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

survivalist

…

swarmer

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

traitor

Fixes a locate and adds job checks to download objective (#38199)

2018-06-03 09:03:23 -05:00

valentines

Makes more messages pronoun sensitive

2018-05-03 17:46:25 -05:00

wishgranter

…

wizard

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

xeno

…