From e43758e6a61e1f7aed63a578b15722cc3021b83c Mon Sep 17 00:00:00 2001 From: Milon Date: Sun, 1 Sep 2024 04:16:38 +0200 Subject: [PATCH 1/3] FUCK!! --- .../DeltaV/Entities/Mobs/Species/harpy.yml | 1 - .../digitigrade_inventory_template.yml | 112 ------------------ 2 files changed, 113 deletions(-) delete mode 100644 Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index f33013ff63a..f93cdd8217d 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -128,7 +128,6 @@ weightlessAcceleration: 2.5 - type: Inventory speciesId: harpy - templateId: digitigrade # Einstein Engines displacements: jumpsuit: sizeMaps: diff --git a/Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml deleted file mode 100644 index fc7dbda9321..00000000000 --- a/Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml +++ /dev/null @@ -1,112 +0,0 @@ -- type: inventoryTemplate - id: digitigrade - slots: - - name: jumpsuit - slotTexture: uniform - slotFlags: INNERCLOTHING - stripTime: 6 - uiWindowPos: 0,1 - strippingWindowPos: 0,2 - displayName: Jumpsuit - whitelist: - tags: - - Skirt - - name: outerClothing - slotTexture: suit - slotFlags: OUTERCLOTHING - stripTime: 6 - uiWindowPos: 1,1 - strippingWindowPos: 1,2 - displayName: Suit - - name: gloves - slotTexture: gloves - slotFlags: GLOVES - uiWindowPos: 2,1 - strippingWindowPos: 2,2 - displayName: Gloves - - name: neck - slotTexture: neck - slotFlags: NECK - uiWindowPos: 0,2 - strippingWindowPos: 0,1 - displayName: Neck - - name: mask - slotTexture: mask - slotFlags: MASK - uiWindowPos: 1,2 - strippingWindowPos: 1,1 - displayName: Mask - - name: eyes - slotTexture: glasses - slotFlags: EYES - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,0 - displayName: Eyes - - name: ears - slotTexture: ears - slotFlags: EARS - stripTime: 3 - uiWindowPos: 2,2 - strippingWindowPos: 2,0 - displayName: Ears - - name: head - slotTexture: head - slotFlags: HEAD - uiWindowPos: 1,3 - strippingWindowPos: 1,0 - displayName: Head - - name: pocket1 - slotTexture: pocket - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 0,3 - strippingWindowPos: 0,4 - dependsOn: jumpsuit - displayName: Pocket 1 - stripHidden: true - - name: pocket2 - slotTexture: pocket - slotFlags: POCKET - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,3 - strippingWindowPos: 1,4 - dependsOn: jumpsuit - displayName: Pocket 2 - stripHidden: true - - name: suitstorage - slotTexture: suit_storage - slotFlags: SUITSTORAGE - slotGroup: MainHotbar - stripTime: 3 - uiWindowPos: 2,0 - strippingWindowPos: 2,5 - dependsOn: outerClothing - displayName: Suit Storage - - name: id - slotTexture: id - slotFlags: IDCARD - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 2,1 - strippingWindowPos: 2,4 - dependsOn: jumpsuit - displayName: ID - - name: belt - slotTexture: belt - slotFlags: BELT - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,1 - strippingWindowPos: 1,5 - displayName: Belt - - name: back - slotTexture: back - slotFlags: BACK - slotGroup: SecondHotbar - stripTime: 6 - uiWindowPos: 3,0 - strippingWindowPos: 0,5 - displayName: Back From 0e081265877ab92df4349b0da29e3a81ea25b1ec Mon Sep 17 00:00:00 2001 From: Milon Date: Sun, 1 Sep 2024 04:22:10 +0200 Subject: [PATCH 2/3] but wait there's more --- Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml index f93cdd8217d..951660edfe4 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml @@ -110,7 +110,7 @@ - type: Speech speechSounds: Harpy speechVerb: Harpy - allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw'] + allowedEmotes: ['Meow', 'Hiss', 'Mew', 'Purr', 'Growl', 'Bark', 'Snarl', 'Whine', 'Howl', 'Awoo', 'HarpyHonk', 'HarpyRing', 'HarpyPew', 'HarpyBang', 'HarpyBeep', 'HarpyRev', 'HarpyCaw', 'Squish', 'Chitter', 'Squeak', 'Click', ] - type: Vocal sounds: Male: SoundsHarpy @@ -160,7 +160,6 @@ 32: sprite: DeltaV/Mobs/Species/Harpy/displacement.rsi state: jumpsuit - templateId: digitigrade - type: Sprite scale: 0.9, 0.9 layers: From e04cd6f6b3d4c32e00b82005525d0e1df9769ef1 Mon Sep 17 00:00:00 2001 From: Milon Date: Sun, 1 Sep 2024 04:40:10 +0200 Subject: [PATCH 3/3] move --- .../Prototypes/{ => Einstein-Engines}/SoundCollections/harpy.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/{ => Einstein-Engines}/SoundCollections/harpy.yml (100%) diff --git a/Resources/Prototypes/SoundCollections/harpy.yml b/Resources/Prototypes/Einstein-Engines/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/SoundCollections/harpy.yml rename to Resources/Prototypes/Einstein-Engines/SoundCollections/harpy.yml