From c17b3f738d1fe7c43030e8ea4fabf667d93ca114 Mon Sep 17 00:00:00 2001 From: SimpleStation14 Date: Mon, 22 Apr 2024 05:35:48 -0400 Subject: [PATCH 1/5] Cherry-picked commit 1938768ea69ad2f69758036816142a205552eb63 from space-wizards/space-station-14/master --- .../VendingMachines/Inventories/theater.yml | 1 + .../Entities/Clothing/Masks/masks.yml | 10 ++++++ .../equipped-MASK-reptilian.png | Bin 0 -> 442 bytes .../Mask/neckgaiterred.rsi/equipped-MASK.png | Bin 0 -> 409 bytes .../Clothing/Mask/neckgaiterred.rsi/icon.png | Bin 0 -> 307 bytes .../Mask/neckgaiterred.rsi/inhand-left.png | Bin 0 -> 332 bytes .../Mask/neckgaiterred.rsi/inhand-right.png | Bin 0 -> 349 bytes .../Clothing/Mask/neckgaiterred.rsi/meta.json | 30 ++++++++++++++++++ 8 files changed, 41 insertions(+) create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 92e4032b0cb..bb21bc36d47 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -87,6 +87,7 @@ ClothingShoesBootsCowboyBrown: 1 ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 + ClothingMaskNeckGaiterRed: 2 emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 1f70211caa8..ad738792a73 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -514,6 +514,16 @@ tags: - WhitelistChameleon +- type: entity + parent: ClothingMaskNeckGaiter + id: ClothingMaskNeckGaiterRed + name: red neck gaiter + components: + - type: Sprite + sprite: Clothing/Mask/neckgaiterred.rsi + - type: Clothing + sprite: Clothing/Mask/neckgaiterred.rsi + - type: entity parent: ClothingMaskClownBase id: ClothingMaskSexyClown diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000000000000000000000000000000000..88542905cfcfe65b7cebca3fe31c4d573ba03577 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|R4@ zr;B4q#hkadHu^OOh_F3~f6UnX|KM5h52X@ebpCp@BY?F y7w^xTCu(n6=qDVID!sz*$hw}A@!`Oc`yTz+vR@9N{n zE*^&rKbI-pQF$g3n4qU=WUkEKs%MLD#Z zZk_o0`oia5kLkHKS_HqDeqhys2_MZT2w$kTPmxIHy1kW`;j4=Agpkx^x%5@WZ}UID zjAQ(8i~ZJ${@{7Z^|qVerL6bcJLT7dS=>zue^~vm@kOwi|M*%B^e}^`tDnm{r-UW| DT{(Is literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5a37ace23e68bc693b636d6409220d71466ae9ba GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G9p zi(^Q|oVT|Oxehr9v_1^f*}}mcrWA2RFSJNJdi})iincBHT(!B6T7@c1Ez91j;K6ct zX2yg6zxH^hi3gqO02%=T9UEur|Cvy9{8r=Zmp;~)Ov3jv?ko<{3)UB^&wBW?Xy&gw zmc7@j4L5R}ojduIXkE2cPg2o0U)xoi4n29r{>nUIs)~|QQBL&KJrjhBwyrc+*l{nv ze(Gh{y^On0M*@wz-ttZV^eb@=h-C~60!!a3y5;OW_=Y{=YH)7DQxIFTBvW=g7$k77w1alox)LiaTPwqe^_Pj7i_IlP#X+b7olx zXaq!g{@X9=w13Z*)CzwVpvgesF!O9qT+6wH#hK?OzU@AJa!chbhFQBhZt7VRp}?mu98-qj^V@HpS1 zujikb?0kJi?7_dva&M82+`QM`1@*hP@jVXKw`~8!ZPGSP9AYs815d+yHW&HVk=u`* z`Y})PMe^QbtQ?lcA8!9HUs`0hz~{xxMxW3p58qXW$lX3IB)3Fy;F)U1Hi&=O7 qrO+2!;}7A+Tnno{eEG+CV4?o;F1P-kci&%v4EJ>Pb6Mw<&;$TKbd<9I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json new file mode 100644 index 00000000000..9094fa918f0 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From 35d0b3fd0e91a5e74d7caac712222551003e7a77 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sat, 11 May 2024 23:49:40 -0400 Subject: [PATCH 2/5] Fix arbitrage --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 6287710182a..0a83e4bd847 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,7 +33,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 7250 #DeltaV + cost: 7300 category: Service group: market From 417edd137ce44b04a645166ec8d4f2358350eee9 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 28 May 2024 20:37:12 -0400 Subject: [PATCH 3/5] fix arbitrage --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 4 +--- RobustToolbox | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 01342e20b8f..76ab0499170 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,10 +33,8 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 7300 - category: Service cost: 8050 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct diff --git a/RobustToolbox b/RobustToolbox index 25bbb21dc86..d8b7bb528d3 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 25bbb21dc868b4e0b43b6d28e899710891b35868 +Subproject commit d8b7bb528d3b0a8b85cd46c01cb509fed8252ec4 From 2bd29d9156a1c587796ec019d030e34c987a857f Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 28 May 2024 20:38:37 -0400 Subject: [PATCH 4/5] Revert "fix arbitrage" This reverts commit 417edd137ce44b04a645166ec8d4f2358350eee9. --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 4 +++- RobustToolbox | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 76ab0499170..01342e20b8f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,8 +33,10 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 8050 + cost: 7300 category: Service + cost: 8050 + category: cargoproduct-category-name-service group: market - type: cargoProduct diff --git a/RobustToolbox b/RobustToolbox index d8b7bb528d3..25bbb21dc86 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit d8b7bb528d3b0a8b85cd46c01cb509fed8252ec4 +Subproject commit 25bbb21dc868b4e0b43b6d28e899710891b35868 From cf7c3740f3adca09b33e53ca3ded464cad37637b Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 28 May 2024 20:39:09 -0400 Subject: [PATCH 5/5] Update cargo_vending.yml --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 01342e20b8f..76ab0499170 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -33,10 +33,8 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockClothesFilled - cost: 7300 - category: Service cost: 8050 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct