diff --git a/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scp/scp1837.ftl b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scp/scp1837.ftl new file mode 100644 index 0000000000..bc8c09a229 --- /dev/null +++ b/Resources/Locale/en-US/_prototypes/_scp/entities/objects/scp/scp1837.ftl @@ -0,0 +1,2 @@ +ent-Scp1837 = modern mop + .desc = A good quality mop with a wooden handle and wool cloth on the cleaning surface. diff --git a/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp1837.ftl b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp1837.ftl new file mode 100644 index 0000000000..33c7d3f3d3 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/scp/scp1837.ftl @@ -0,0 +1,2 @@ +ent-Scp1837 = современная швабра + .desc = Швабра хорошего качества с деревянной ручкой и шерстяной тканью у моющей поверхности. diff --git a/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp1837.yml b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp1837.yml new file mode 100644 index 0000000000..c943d95d4d --- /dev/null +++ b/Resources/Prototypes/_Scp/Entities/Objects/Scp/scp1837.yml @@ -0,0 +1,50 @@ +- type: entity + id: Scp1837 + parent: MopItem + suffix: SCP-1837 + components: + - type: Sprite + sprite: _Scp/Objects/Scp/scp-1837.rsi + layers: + - state: mop + - map: ["enum.SolutionContainerLayers.Fill"] + state: fill-3 + visible: false + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 3 + fillBaseName: fill- + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 2 + - type: Item + size: Large + sprite: _Scp/Objects/Scp/scp-1837.rsi + - type: Scp + class: Safe + - type: Absorbent + pickupAmount: 100 + useAbsorberSolution: true + - type: UseDelay + delay: 0.5 + - type: SolutionRegeneration + solution: absorbed + generated: + reagents: + - ReagentId: Water + Quantity: 5 + - ReagentId: PolytrinicAcid + Quantity: 10 + - type: SolutionPurge + solution: absorbed + preserve: + - Water + quantity: 10 + - type: MeleeWeapon + damage: + types: + Blunt: 10 + Structural: 40 + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 diff --git a/Resources/Prototypes/_Scp/GameRules/events.yml b/Resources/Prototypes/_Scp/GameRules/events.yml index 8f879b2621..6bd4b78af8 100644 --- a/Resources/Prototypes/_Scp/GameRules/events.yml +++ b/Resources/Prototypes/_Scp/GameRules/events.yml @@ -39,6 +39,25 @@ entities: - id: Scp096PhotoDeveloped +- type: entity + id: SpawnScp1837 + parent: BaseStationEventShortDelay + components: + - type: StationEvent + weight: 5 + - type: SpawnInEntityStorageRule + probability: 0.08 + entities: + - id: Scp1837 + - type: SpawnInPlayerInventoryRule + probability: 0.05 + sound: + path: /Audio/_Scp/Effects/spawn.ogg + params: + volume: 3 + entities: + - id: Scp1837 + - type: entity id: SpawnScp133Paper parent: BaseStationEventShortDelay @@ -125,4 +144,5 @@ - id: Blackout - id: SpawnScp096Photo - id: AirlockManEater + - id: SpawnScp1837 - id: SpawnScp133Paper diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-1.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-1.png new file mode 100644 index 0000000000..b1d4ecda04 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-1.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-2.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-2.png new file mode 100644 index 0000000000..8a6069fed9 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-2.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-3.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-3.png new file mode 100644 index 0000000000..a79da2d3b1 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/fill-3.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-1.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000..3007efa01e Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-2.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-2.png new file mode 100644 index 0000000000..e8ee5a3f58 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left.png new file mode 100644 index 0000000000..dee62d16cf Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-1.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000..17495e7182 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-2.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-2.png new file mode 100644 index 0000000000..58c3bd2c42 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right.png new file mode 100644 index 0000000000..2de9806aea Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/meta.json b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/meta.json new file mode 100644 index 0000000000..4f9b9a12aa --- /dev/null +++ b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/meta.json @@ -0,0 +1,71 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by timur", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mop" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-left-fill-2", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "inhand-right-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-2", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/mop.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/mop.png new file mode 100644 index 0000000000..66abb2c99f Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/mop.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 0000000000..997f3ae039 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-2.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-2.png new file mode 100644 index 0000000000..288492b96a Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left-fill-2.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..8fd9168b55 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 0000000000..956f9bbbd1 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-1.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-2.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-2.png new file mode 100644 index 0000000000..5f8cd98644 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right-fill-2.png differ diff --git a/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right.png b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..1bdd20aa48 Binary files /dev/null and b/Resources/Textures/_Scp/Objects/Scp/scp-1837.rsi/wielded-inhand-right.png differ