Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

..

admin

Demodularizing a few reagents, a client var, the rest hud button. (#12329)

2020-05-24 13:21:14 -07:00

client

Adds polychrome uniforms to loadout / kinkmate (#12506)

2020-06-12 17:07:48 -07:00

clothing

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667

2020-04-16 15:09:52 +02:00

custom_loadout

Deleting poly clothes copypasta.

2020-04-13 22:51:46 +02:00

mentor

mentor fixes and improvements (#11519)

2020-03-18 19:23:19 +01:00

mob

a tonne of fixes

2020-06-11 20:18:36 +01:00

projectiles

More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)

2020-06-02 15:22:06 -07:00

reagents

New fermi chem Zeolites! (#12428)

2020-06-09 03:25:40 -07:00