From d7119946916b84289cc3ae34581613732e9c4bd1 Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 1 Dec 2020 08:18:36 +0000 Subject: [PATCH] Initial (#2655) --- .../Prototypes/Catalog/Fills/backpack.yml | 18 ++++++++++++ .../Entities/Clothing/Back/backpacks.yml | 11 +++++++ .../Roles/Jobs/Science/research_director.yml | 3 +- .../Roles/Jobs/Science/scientist.yml | 2 +- .../science.rsi/equipped-BACKPACK.png | Bin 0 -> 449 bytes .../Back/Backpacks/science.rsi/icon.png | Bin 0 -> 287 bytes .../Backpacks/science.rsi/inhand-left.png | Bin 0 -> 442 bytes .../Backpacks/science.rsi/inhand-right.png | Bin 0 -> 442 bytes .../Back/Backpacks/science.rsi/meta.json | 27 ++++++++++++++++++ 9 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/science.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/science.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/backpack.yml b/Resources/Prototypes/Catalog/Fills/backpack.yml index 842d8a12d9..052000f62d 100644 --- a/Resources/Prototypes/Catalog/Fills/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/backpack.yml @@ -55,3 +55,21 @@ - type: StorageFill contents: - name: BoxSurvival + +- type: entity + abstract: true + parent: ClothingBackpackScience + id: ClothingBackpackScienceFilled + components: + - type: StorageFill + contents: + - name: BoxSurvival + +- type: entity + abstract: true + parent: ClothingBackpackChemistry + id: ClothingBackpackChemistryFilled + components: + - type: StorageFill + contents: + - name: BoxSurvival diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 4ce83ff158..be690e8ef3 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -104,6 +104,17 @@ - type: Clothing sprite: Clothing/Back/Backpacks/botany.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackScience + name: science backpack + description: A backpack specially designed to repel stains and hazardous liquids. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/science.rsi + - type: Clothing + sprite: Clothing/Back/Backpacks/science.rsi + - type: entity parent: ClothingBackpack id: ClothingBackpackHolding diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 4e30a77141..9034e9a6b5 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -18,8 +18,7 @@ id: ResearchDirectorGear equipment: innerclothing: ClothingUniformJumpsuitResearchDirector - # Note to Swept add science backpacks - backpack: ClothingBackpackFilled + backpack: ClothingBackpackScienceFilled shoes: ClothingShoesColorBrown idcard: RnDPDA ears: ClothingHeadsetScience diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index b9c711a25b..72ae62d7c8 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -15,7 +15,7 @@ id: ScientistGear equipment: innerclothing: ClothingUniformJumpsuitScientist - backpack: ClothingBackpackFilled + backpack: ClothingBackpackScienceFilled shoes: ClothingShoesColorWhite outerclothing: ClothingOuterCoatLab idcard: SciencePDA diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..9c7b04a38b4bf8c612af0c985fd66ea4166f7760 GIT binary patch literal 449 zcmV;y0Y3hTP)RzWMsp`!V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sU*LmATc>xiHkEOv#1!Pjf*p_C^0t`#5UwoR&e!m0UHbeeBB!e z=C)qP0002oNkl}R41TD*h)fIgYaPNE(#D7r7vc$u4iB{{4-Ii@8R1e zoX*2TJ}yGM;NZ)13}k;DLdoG>0OIyN5^?DV^aA-nQr-(^E^TH@BP1US_K8o&?R%SQ r5R{vY1_9Koj_UEbQVF)IY4{ya*_R+Xuc*;P00000NkvXXu0mjfk>b0c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d1cf3b1540da57585cc2b8824d4c21649f4c0f4a GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L*q@<)6Gt8VjckWDv znb)peJAC+XGQ&h~hN-r;wpt7g5sj*SK*fwDL4Lsu4$p3+0Xb_tT^vI+CMG9H_&9iY z26%Wf985PUFUZ;IJWO@YuhER%%Wm_>e3}GtBE0NGR(~0Mev9x zh{SCydUi&%oAn{nvDISI%!YTQ+%}7LU!D}M)6A_gb1f6sny9oT3=fShXG+d)Ym=HS zX?c+K(g6m&1uVh=O&l9`&tBTbtB=r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..af2c3a61a2ad2fa5ac2922721943145345d09283 GIT binary patch literal 442 zcmV;r0Y(0aP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sU*LmATc>xiHkEOv#1!Pjf*p_C^0t`#5UwoR&e!m0UHbeeBB!e z=C)qP0002hNkl{jC zQ;SXOL~+7^2bZSbC=}oT(mbIh2Fw7;)+M^cfLN)_I6wiyST`t!Ptwcl&-L+RGvapo zsX^6X!$-MYEn$!m)x|2pIaH|w2>Z@R6!qN!q#X*8RNMu?4h4Duox6a&^W+7%lTZ^I kSg5@V?0QwqvfxX40=-2YGw0K9q5uE@07*qoM6N<$f&iqrZvX%Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..876366f932674e8fd26d8dcfa52724c2bbe75246 GIT binary patch literal 442 zcmV;r0Y(0aP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sU*LmATc>xiHkEOv#1!Pjf*p_C^0t`#5UwoR&e!m0UHbeeBB!e z=C)qP0002hNklQJa*PO&C;Ps- z>1suQuGFTI^^O9{JSG9CQ_99{5d&-p5I1dKMM`B905fHrQ&-72F?4bHpRj@T@z5)t zD}mcU*r0$ZZo{>;?k8|cQNK(qFse#@#XD*n)JkH|NehGx9Pqg$Sb#kM{=nl8Fjrd) kCdvX{#NU4*3mbfqJE!6vOwfJuM*si-07*qoM6N<$f^xI8KmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/science.rsi/meta.json new file mode 100644 index 0000000000..89236692cc --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/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 + } + ] +}