diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml index a359dfbd49..3a92d1f81a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml @@ -56,14 +56,23 @@ contents: - name: BoxSurvival -#- type: entity -# abstract: true -# parent: ClothingBackpackDuffelScience -# id: ClothingBackpackDuffelScienceFilled -# components: -# - type: StorageFill -# contents: -# - name: BoxSurvival +- type: entity + abstract: true + parent: ClothingBackpackDuffelScience + id: ClothingBackpackDuffelScienceFilled + components: + - type: StorageFill + contents: + - name: BoxSurvival + +- type: entity + abstract: true + parent: ClothingBackpackDuffelMime + id: ClothingBackpackDuffelMimeFilled + components: + - type: StorageFill + contents: + - name: BoxSurvival #- type: entity # abstract: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c8d13a07f8..279c68870f 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingBackpackDuffelMedical id: ClothingBackpackDuffelSurgeryFilled - name: surgical duffelbag + name: surgical duffel bag description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." components: - type: StorageFill @@ -16,7 +16,7 @@ - type: entity parent: ClothingBackpackDuffelSyndicateMedical id: ClothingBackpackDuffelSyndicateFilledMedical - name: syndicate surgical duffelbag + name: syndicate surgical duffel bag description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools." components: - type: StorageFill @@ -86,7 +86,7 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom - name: Centcom official costume duffelbag + name: Centcom official costume duffel bag description: "Contains a full CentCom Official uniform set, headset and clipboard included. The headset comes without an encryption key." components: - type: StorageFill @@ -105,7 +105,7 @@ - type: entity parent: ClothingBackpackDuffelClown id: ClothingBackpackDuffelSyndicateCostumeClown - name: clown costume duffelbag + name: clown costume duffel bag description: "Contains a complete Clown outfit." components: - type: StorageFill diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 030eb987c0..fb5b80355a 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -16,7 +16,7 @@ - type: Storage capacity: 100 storageSoundCollection : storageRustle - + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelEngineering @@ -72,6 +72,39 @@ - type: Clothing sprite: Clothing/Back/Duffels/security.rsi +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelChemistry + name: chemistry duffel bag + description: "A large duffel bag for holding extra beakers and test tubes." + components: + - type: Sprite + sprite: Clothing/Back/Duffels/chemistry.rsi + - type: Clothing + sprite: Clothing/Back/Duffels/chemistry.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelMime + name: mime duffel bag + description: "A large duffel bag for holding... mime... stuff." + components: + - type: Sprite + sprite: Clothing/Back/Duffels/mime.rsi + - type: Clothing + sprite: Clothing/Back/Duffels/mime.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelScience + name: science duffel bag + description: "A large duffel bag for holding extra science related goods." + components: + - type: Sprite + sprite: Clothing/Back/Duffels/science.rsi + - type: Clothing + sprite: Clothing/Back/Duffels/science.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicate diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 1e8ed0e686..1732d2f1ab 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -26,4 +26,4 @@ ears: ClothingHeadsetService innerclothingskirt: ClothingUniformJumpskirtMime satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled + duffelbag: ClothingBackpackDuffelMimeFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 788f3a6365..e418eb00a0 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -24,4 +24,4 @@ ears: ClothingHeadsetScience innerclothingskirt: ClothingUniformJumpskirtResearchDirector satchel: ClothingBackpackSatchelScienceFilled - duffelbag: ClothingBackpackDuffelFilled + duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 7b4a14f302..f7cf2b8a08 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -22,4 +22,4 @@ ears: ClothingHeadsetScience innerclothingskirt: ClothingUniformJumpskirtScientist satchel: ClothingBackpackSatchelScienceFilled - duffelbag: ClothingBackpackDuffelFilled + duffelbag: ClothingBackpackDuffelScienceFilled diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..e88663b3a6 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png new file mode 100644 index 0000000000..26dd1e4c0a Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png new file mode 100644 index 0000000000..8a35e6c49a Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png new file mode 100644 index 0000000000..b998e351b1 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json new file mode 100644 index 0000000000..89236692cc --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/chemistry.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png index 07c8e5e54e..db21970285 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png index b24896c01b..2c0192c6e6 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png index 1be16c33e4..1388323fa9 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png index 0cedf53f5c..fc98361003 100644 Binary files a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png and b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json index fce8c90ce8..89236692cc 100644 --- a/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Duffels/medical.rsi/meta.json @@ -8,7 +8,8 @@ }, "states": [ { - "name": "icon" + "name": "icon", + "directions": 1 }, { "name": "equipped-BACKPACK", diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..4d5f4cc557 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png new file mode 100644 index 0000000000..937e82349a Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png new file mode 100644 index 0000000000..110bc6ef48 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png new file mode 100644 index 0000000000..fbc6579f33 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json new file mode 100644 index 0000000000..89236692cc --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/mime.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..9be4782b18 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png new file mode 100644 index 0000000000..709e67d3a4 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/inhand-left.png new file mode 100644 index 0000000000..f5fb0af9be Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/science.rsi/inhand-right.png new file mode 100644 index 0000000000..da549fec4c Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/science.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json new file mode 100644 index 0000000000..89236692cc --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/science.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}