]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Space Asshole Gear (#21243)
authorPsychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Mon, 30 Oct 2023 00:09:18 +0000 (01:09 +0100)
committerGitHub <noreply@github.com>
Mon, 30 Oct 2023 00:09:18 +0000 (20:09 -0400)
* Add Space Asshole Coat

* Add sledgehammer

* Adjust sledgehammer damage values

* Add copyright string to sledgehammer

13 files changed:
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png [new file with mode: 0644]

index a7c3a553384a2bfda1f96733a4016a191b2400e6..1118a9efc7f14154dcae59237c705eed0b74c262 100644 (file)
     modifiers:
       coefficients:
         Caustic: 0.75
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatSpaceAsshole
+  name: the coat of space asshole
+  description: And there he was...
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/space_asshole.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/space_asshole.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
new file mode 100644 (file)
index 0000000..8a3754c
--- /dev/null
@@ -0,0 +1,22 @@
+- type: entity
+  name: sledgehammer
+  parent: BaseItem
+  id: Sledgehammer
+  description: The perfect tool for wanton carnage.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/sledgehammer.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 14
+        Structural: 15
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 10
+        Structural: 60
+  - type: Item
+    size: 80
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..d0b9d06
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png
new file mode 100644 (file)
index 0000000..41a9647
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..afafe24
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..144d4d7
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/space_asshole.rsi/meta.json
new file mode 100644 (file)
index 0000000..70ee956
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png
new file mode 100644 (file)
index 0000000..287c02b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..d728c41
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..b5889d3
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/meta.json
new file mode 100644 (file)
index 0000000..b8bbd26
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Made by Github user Psychpsyo for Space Station 14",
+  "size": {
+      "x": 32,
+      "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+         {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png
new file mode 100644 (file)
index 0000000..c0ae127
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png
new file mode 100644 (file)
index 0000000..21c9a32
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/sledgehammer.rsi/wielded-inhand-right.png differ