From: Lei Yunxing Date: Wed, 3 May 2023 17:01:55 +0000 (+0800) Subject: adds damp rag (#15553) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b1391b35ef704a7925011fa130e0fe4decdeb187;p=space-station-14.git adds damp rag (#15553) Co-authored-by: metalgearsloth --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 3da7d09144..19cfa5e927 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -17,6 +17,8 @@ prob: 0.5 - id: BoxBeanbag amount: 2 + - id: RagItem + amound: 2 #- type: entity # id: LockerFormalFilled diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 4e4d1b57ef..7b6485bfba 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -374,3 +374,39 @@ - !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 index 0000000000..8bba11188d --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/rag.yml @@ -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 diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 71de22a260..33a963d3a9 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -99,3 +99,16 @@ 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 index 0000000000..b750bcc3d1 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/meta.json @@ -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 index 0000000000..1539e4916a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/rag.rsi/rag.png differ