Skip to content
  • Morb0's avatar
    f062cbce
    Merge remote-tracking branch 'upstream/master' into upstream-sync · f062cbce
    Morb0 authored
    # Conflicts:
    #	Content.Server/Chat/Systems/ChatSystem.cs
    #	LICENSE.TXT
    #	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
    #	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
    #	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
    #	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
    #	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
    #	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
    #	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
    #	Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
    #	Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
    f062cbce
    Merge remote-tracking branch 'upstream/master' into upstream-sync
    Morb0 authored
    # Conflicts:
    #	Content.Server/Chat/Systems/ChatSystem.cs
    #	LICENSE.TXT
    #	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
    #	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
    #	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
    #	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
    #	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
    #	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
    #	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
    #	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
    #	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
    #	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
    #	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
    #	Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
    #	Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
    #	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
This project is licensed under the MIT License. Learn more
Loading