From 0aa1fa8108ac2f2031db493494c3e1c9b370938a Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 27 Dec 2024 00:01:07 +0200 Subject: [PATCH] Cleanup --- .../Structures/Storage/Crates/barrel.yml | 55 ------------------ .../_NF/Recipes/Crafting/Graphs/barrel.yml | 26 --------- .../_NF/Recipes/Crafting/barrel.yml | 12 ---- .../Storage/Barrels/wood.rsi/closed.png | Bin 339 -> 0 bytes .../Objects/Storage/Barrels/wood.rsi/icon.png | Bin 1138 -> 0 bytes .../Storage/Barrels/wood.rsi/meta.json | 20 ------- .../Objects/Storage/Barrels/wood.rsi/open.png | Bin 1138 -> 0 bytes 7 files changed, 113 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml delete mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml index 1b568262482..0f5f702f97a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml @@ -1,58 +1,3 @@ -- type: entity - parent: CrateGeneric - id: WoodenBarrel - name: wooden barrel - description: A musty old wooden barrel. - components: - - type: Sprite - sprite: _NF/Objects/Storage/Barrels/wood.rsi - layers: - - state: icon - map: ["enum.StorageVisualLayers.Base"] - - state: closed - map: ["enum.StorageVisualLayers.Door"] - - type: Icon - sprite: _NF/Objects/Storage/Barrels/wood.rsi - state: icon - - type: Damageable - damageContainer: StructuralInorganic - damageModifierSet: Wood - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: WoodDestroy - - !type:SpawnEntitiesBehavior - spawn: - MaterialWoodPlank1: - min: 1 - max: 4 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Construction - graph: WoodenBarrel - node: woodenbarrel - containers: - - entity_storage - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.2,-0.3,0.2,0.4" - density: 150 - mask: - - SmallMobMask #this is so they can go under plastic flaps - layer: - - MachineLayer - - type: Climbable - - type: StaticPrice - price: 50 - - type: entity parent: StorageTank id: BaseBarrel diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml deleted file mode 100644 index ac91b2e2370..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: constructionGraph - id: WoodenBarrel - start: start - graph: - - node: start - edges: - - to: woodenbarrel - steps: - - material: WoodPlank - amount: 5 - doAfter: 5 - - - node: woodenbarrel - entity: WoodenBarrel - edges: - - to: start - steps: - - tool: Prying - doAfter: 2 - completed: - - !type:SpawnPrototype - prototype: MaterialWoodPlank1 - amount: 5 - - !type:EmptyAllContainers - - !type:DeleteEntity - diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml deleted file mode 100644 index a6649928cba..00000000000 --- a/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml +++ /dev/null @@ -1,12 +0,0 @@ -- type: construction - name: wooden barrel - id: WoodenBarrel - graph: WoodenBarrel - startNode: start - targetNode: woodenbarrel - category: construction-category-storage - description: A musty old wooden barrel. - icon: - sprite: _NF/Objects/Storage/Barrels/wood.rsi - state: icon - objectType: Structure \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png deleted file mode 100644 index b111827b8e5ded4cdf0b14e4ed96426d126971bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6qGJ; zjVKAuPb(=;EJ|f?PR%K?Mkcif|m#w)DIS4d7 zv~P915aGeH+SO4yy80snWBzkbn}#y8uxVV4Ax-|1+_pq;dm1bjA1_qV_#utx|9t_`@bP?!N22WQ%mvv4FO#mcBf<^!U diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png deleted file mode 100644 index bfc92c166d4378a6145536c6386dd95e55c9ea7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1138 zcmV-&1daQNP)YAX9X8WNB|8RBvx=!KdMT000C1 zNkl*{Q&wL`~LRvcaw=0y=i5FNt2 z6}<4q8xizEuXZ!WypvuC_M%jZMb?6`!rCp9cG)UPld{C5Uon|!(vRas$T8`blaDIH z=juJ@JTK4hJnwrruSS+-o@HqMcYya^>{gv{xtV0GE81UeBHvnMk77#jZ zL|0<~%uNQlefvHD-`)vT1gQvc$z_#aJO4axcLUe1dsTCQ_x&Q5vl-d&vT5P)bsKiPCoi@ylnA&MD{dH-yCCZGRVY(H1VaoM+3Os4ZQu? zt*7Rdicd#e>^GV5?F#%l`F(8w$*f~w>;o+RALt%z$JQ+{^6t25;pv-W#8#sC{X6(} z1>)W*0-KrI0OwCOVKwRr3&RWz4Ut}$!0m3p)-3=ablQsML|0?XO$O2Tk1{_$j~Ml` zd9cS%iyPGgOeT{oiXDu$XIThrBev?;alMMe;Q+vHw-@C{A`$F%JCR6)*vvO92b1)k zHuHO;jrj-5Boc}00eyXaNRmX{JB72;!2aW10G5MEPC1Q5`G@a?*E76%`2w@v7!!Bz z)CM?b(~=TAbaizxI5^0oiLaGz9BVudfVr+-nX?esreA7C^THUR**T)=49@yB#+Q<{ z1NxY+IunY zYiRQrh;8Wr_{-)5U?;P~dVC!Kt^dcOC8-&3<^VJXo>*J4RfpB6FUpT6)51ftZPrN@Y3aG;*x*IKkDF>Js!z z&B{2H%CcqYARJz+9#Gf?R($lHHgm$HXUP{Y>PSBFZ=44#2a`w_M^*m=6#+!CgO(OE zk|fdiXs&2|3->```vY1x;Y5P1txeUpFAF$~0FWf9=((*e_dkgJ5o2$2lW-ydP*L%U z0q1O5Wjz4}Q!-Y37z|p~&#z)Y9&zR%H#Q16OyL0(D7u%7W>r7EssVWfK;Mbnu`GY| zl2f_o>sp!CtcH7ax$8=bR|Pl>DHW9#t{L!e$1?}~4bn|!-yh?@1poj507*qoM6N<$ Ef&g0-IRF3v diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json deleted file mode 100644 index 8e941fd7d61..00000000000 --- a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "closed" - }, - { - "name": "open" - }, - { - "name": "icon" - } - ] -} diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png deleted file mode 100644 index bfc92c166d4378a6145536c6386dd95e55c9ea7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1138 zcmV-&1daQNP)YAX9X8WNB|8RBvx=!KdMT000C1 zNkl*{Q&wL`~LRvcaw=0y=i5FNt2 z6}<4q8xizEuXZ!WypvuC_M%jZMb?6`!rCp9cG)UPld{C5Uon|!(vRas$T8`blaDIH z=juJ@JTK4hJnwrruSS+-o@HqMcYya^>{gv{xtV0GE81UeBHvnMk77#jZ zL|0<~%uNQlefvHD-`)vT1gQvc$z_#aJO4axcLUe1dsTCQ_x&Q5vl-d&vT5P)bsKiPCoi@ylnA&MD{dH-yCCZGRVY(H1VaoM+3Os4ZQu? zt*7Rdicd#e>^GV5?F#%l`F(8w$*f~w>;o+RALt%z$JQ+{^6t25;pv-W#8#sC{X6(} z1>)W*0-KrI0OwCOVKwRr3&RWz4Ut}$!0m3p)-3=ablQsML|0?XO$O2Tk1{_$j~Ml` zd9cS%iyPGgOeT{oiXDu$XIThrBev?;alMMe;Q+vHw-@C{A`$F%JCR6)*vvO92b1)k zHuHO;jrj-5Boc}00eyXaNRmX{JB72;!2aW10G5MEPC1Q5`G@a?*E76%`2w@v7!!Bz z)CM?b(~=TAbaizxI5^0oiLaGz9BVudfVr+-nX?esreA7C^THUR**T)=49@yB#+Q<{ z1NxY+IunY zYiRQrh;8Wr_{-)5U?;P~dVC!Kt^dcOC8-&3<^VJXo>*J4RfpB6FUpT6)51ftZPrN@Y3aG;*x*IKkDF>Js!z z&B{2H%CcqYARJz+9#Gf?R($lHHgm$HXUP{Y>PSBFZ=44#2a`w_M^*m=6#+!CgO(OE zk|fdiXs&2|3->```vY1x;Y5P1txeUpFAF$~0FWf9=((*e_dkgJ5o2$2lW-ydP*L%U z0q1O5Wjz4}Q!-Y37z|p~&#z)Y9&zR%H#Q16OyL0(D7u%7W>r7EssVWfK;Mbnu`GY| zl2f_o>sp!CtcH7ax$8=bR|Pl>DHW9#t{L!e$1?}~4bn|!-yh?@1poj507*qoM6N<$ Ef&g0-IRF3v