]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d26a38) | patch
New Weapon: Knuckle Dusters (#33470)
authorUnkn0wn_Gh0st <shadowstalkermll@gmail.com>
Sat, 3 May 2025 04:18:08 +0000 (23:18 -0500)
committerGitHub <noreply@github.com>
Sat, 3 May 2025 04:18:08 +0000 (00:18 -0400)
commit11096ad9bf6ce9bcbe5c090736549eb91352ef3f
tree580e40f7b331729a3f3155846c27dd881af46342tree | snapshot
parent5d26a38a1dd58df7589ffc616fe5ebd47494037fcommit | diff
New Weapon: Knuckle Dusters (#33470)

* New Weapon: Knuckle Dusters

* Tag YAML Error Fix

* Crafting Graph Node Error

(Thank you slarticodefast)

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Crafting Node Error Part 2 Electric Boogaloo

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Contraban & QM Dusters Nerf

* Stun Knuckledusters (Unfinished)

* Typo

* Fix test fails

* The dastardly maintainer balance webedit

* Fix contraband parenting

* Fix construction failure

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
42 files changed:
Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl diff | blob | history
Resources/Locale/en-US/store/uplink-catalog.ftl diff | blob | history
Resources/Prototypes/Actions/security.yml [new file with mode: 0644] blob
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml diff | blob | history
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml diff | blob | history
Resources/Prototypes/Catalog/uplink_catalog.yml diff | blob | history
Resources/Prototypes/Entities/Clothing/Hands/gloves.yml diff | blob | history
Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml diff | blob | history
Resources/Prototypes/Objectives/stealTargetGroups.yml diff | blob | history
Resources/Prototypes/Objectives/traitor.yml diff | blob | history
Resources/Prototypes/Recipes/Construction/Graphs/weapons/brass_knuckles.yml [new file with mode: 0644] blob
Resources/Prototypes/Recipes/Construction/weapons.yml diff | blob | history
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/brassknuckleduster.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-HAND.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_nocell.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_off.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/knuckleduster_on.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-equipped-HAND.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/off-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-equipped-HAND.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/electricknuckleduster.rsi/on-inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/equipped-HAND.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/goldenknuckleduster.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/goldenknuckleduster.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/equipped-HAND.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/knuckleduster.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/knuckleduster.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/equipped-HAND.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-left.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/inhand-right.png [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/meta.json [new file with mode: 0644] blob
Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/syndicateknuckleduster.rsi/syndicateknuckleduster.png [new file with mode: 0644] blob
Форк Space Station 14 с переводами на русский