Copyright Pass/Pruning | Part 1 - Clothing (#2539)

* Backpacks/Belts

* Cleans up Headsets

* Glasses and Gloves (Remind me to make an alpha for those stupid gloves)

* This commit has taken too many of my damn tears please appreciate it

* Holy SHIT that was an ordeal

* NECK and MASKS

* Jumpsuits/skirts

* Goodbye old color.rsi

* Outerclothing

* More Outerclothing

* It builds now

* More ID organization :)

* Gloves up to scratch

* My piss burns

* GLasses

* Added some more glasses

* Mission control we are ready for review

* Hotfix

* Cleanup

* Fix not commenting out whole line in contents

* duffelbag => duffel bag

* Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Fixed Breath Mask

* Scrubs

* New line

* Fixed Build

* Ok

* Update engivend.yml

* Fix meson glasses prototype in boxes

* Fix prototype name for sec glasses in boxes

* Fix InventoryHelpersTest janitor jumpsuit prototype

* Fix outdated stationstation prototypes

* Fix vending machines having invalid starting inventories

* Fix chapel vending machine

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Swept
2020-11-22 04:17:14 +00:00
committed by GitHub
parent ccb7719935
commit f46a6a8d81
3124 changed files with 16722 additions and 17241 deletions

View File

@@ -1 +1,173 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", "states": [{"name": "armor", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "cardborg", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "deathsquad", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "fire_extinguisher0", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "fire_extinguisher1", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "ian", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "oxygen", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "petcollar", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "walkietalkie", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "armor",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cardborg",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "deathsquad",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "fire_extinguisher0",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "fire_extinguisher1",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "ian",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "oxygen",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "petcollar",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "walkietalkie",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}

View File

@@ -1 +1,737 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b", "states": [{"name": "beret", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "blackscarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "bunny", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "captain", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "cardborg_h", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "cargosoft", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "chef", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "christmasscarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "clown", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "detective", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "festive", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_cakehat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_reindeer", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat0_yellow", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat1_cakehat", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "hardhat1_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hardhat1_yellow", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "helmet", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hopcap", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "kitty", "directions": 4, "delays": [[0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1], [0.1, 0.1, 0.1, 0.1]]}, {"name": "nursehat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "paper", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "paper_words", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "pirate", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "policehelm", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "redwizard", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "santahat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "scarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sheet", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sheriff", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sombrero", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "sun", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "tophat", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "ushankadown", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "ushankaup", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wizard", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "wizard-fake", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "zebrascarf", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "beret",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "blackscarf",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "bunny",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "captain",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cardborg_h",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "cargosoft",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "chef",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "christmasscarf",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "clown",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "detective",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "festive",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hardhat0_cakehat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hardhat0_reindeer",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hardhat0_white",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hardhat0_yellow",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hardhat1_cakehat",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "hardhat1_white",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hardhat1_yellow",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "helmet",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "hopcap",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "kitty",
"directions": 4,
"delays": [
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
],
[
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "nursehat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "paper",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "paper_words",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "pirate",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "policehelm",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "redwizard",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "santahat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "scarf",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "sheet",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "sheriff",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "sombrero",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "sun",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "tophat",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "ushankadown",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "ushankaup",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "wizard",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "wizard-fake",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "zebrascarf",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}