]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
adds damp rag (#15553)
authorLei Yunxing <lyx2020@sjtu.edu.cn>
Wed, 3 May 2023 17:01:55 +0000 (01:01 +0800)
committerGitHub <noreply@github.com>
Wed, 3 May 2023 17:01:55 +0000 (10:01 -0700)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Resources/Prototypes/Catalog/Fills/Lockers/service.yml
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml [new file with mode: 0644]
Resources/Prototypes/Recipes/Crafting/improvised.yml
Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Objects/Specific/Janitorial/rag.rsi/rag.png [new file with mode: 0644]

index 3da7d091447f1275c55bca94bcb7dce6c5ad978b..19cfa5e9276750313b66f009cfc7e8869ca74708 100644 (file)
@@ -17,6 +17,8 @@
         prob: 0.5
       - id: BoxBeanbag
         amount: 2
+      - id: RagItem
+        amound: 2
 
 #- type: entity
 #  id: LockerFormalFilled
index 4e4d1b57efea6460c2e657909c7e4c16140b3d24..7b6485bfbafbc3d3188704ee3cbdcd8c172382d9 100644 (file)
             - !type:PlaySoundBehavior
               sound:
                 path: /Audio/Effects/metalbreak.ogg
+
+- type: entity
+  parent: BaseItem
+  name: damp rag
+  id: RagItem
+  description: For cleaning up messes, you suppose.
+  components:
+    - type: Sprite
+      sprite: Objects/Specific/Janitorial/rag.rsi
+      state: rag
+    - type: Spillable
+      solution: absorbed
+    - type: MeleeWeapon
+      soundNoDamage:
+        path: "/Audio/Effects/Fluids/splat.ogg"
+      damage:
+        types:
+          Blunt: 0
+    - type: Item
+      size: 10
+      sprite: Objects/Specific/Janitorial/rag.rsi
+    - type: Absorbent
+      pickupAmount: 15
+    - type: Construction
+      graph: Rag
+      node: rag
+    - type: SolutionContainerManager
+      solutions:
+        absorbed:
+          maxVol: 30
+    - type: UseDelay
+      delay: 1.5
+    - type: Tag
+      tags:
+        - DroneUsable
+        - Mop
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml
new file mode 100644 (file)
index 0000000..8bba111
--- /dev/null
@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: Rag
+  start: start
+  graph:
+  - node: start
+    edges:
+    - to: rag
+      steps:
+      - material: Cloth
+        amount: 1
+        doAfter: 3
+  - node: rag
+    entity: RagItem
index 71de22a2604e00bb60275b88b8dd538325b14d4a..33a963d3a93e8733fc14b0ddadce5ac797632324 100644 (file)
     sprite: Clothing/Head/Misc/flower-crown.rsi
     state: icon
   objectType: Item
+
+- type: construction
+  name: damp rag
+  id: rag
+  graph: Rag
+  startNode: start
+  targetNode: rag
+  category: construction-category-tools
+  objectType: Item
+  description: A damp rag to clean up the ground. Better than slipping around all day.
+  icon:
+    sprite: Objects/Specific/Janitorial/rag.rsi
+    state: rag
diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json
new file mode 100644 (file)
index 0000000..b750bcc
--- /dev/null
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/1b8c53516ce8b14828b7147b0fa344b7b57724e9",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "rag"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/rag.png b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/rag.png
new file mode 100644 (file)
index 0000000..1539e49
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/rag.png differ