требования ревью

AdventureTimeSS14 · Sep 6, 2024 · 1f956b8 · 1f956b8
1 parent 26b42b2
commit 1f956b8
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/...-RU/ADT/Objects/Specific/borg_modules.ftl → ...bjects/Specific/Robotics/borg_modules.ftl b/...-RU/ADT/Objects/Specific/borg_modules.ftl → ...bjects/Specific/Robotics/borg_modules.ftl
diff --git a/...ru-RU/ADT/Objects/Specific/borg_parts.ftl → .../Objects/Specific/Robotics/borg_parts.ftl b/...ru-RU/ADT/Objects/Specific/borg_parts.ftl → .../Objects/Specific/Robotics/borg_parts.ftl
diff --git a/...ocale/ru-RU/ADT/Objects/Specific/borg.ftl → ...prototypes/Entities/Mobs/Cyborgs/borg.ftl b/...ocale/ru-RU/ADT/Objects/Specific/borg.ftl → ...prototypes/Entities/Mobs/Cyborgs/borg.ftl
diff --git a/...ntities/Objects/Weapons/Guns/security.ftl → ...pes/Entities/Objects/Weapons/security.ftl b/...ntities/Objects/Weapons/Guns/security.ftl → ...pes/Entities/Objects/Weapons/security.ftl
diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/bodycamera.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/bodycamera.yml
@@ -8,9 +8,9 @@
     size: Small
   - type: Sprite
     state: icon
-    sprite: ADT/Clothing/Neck/Misc/bodycam.rsi
+    sprite: ADT/Clothing/Neck/bodycam.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Neck/Misc/bodycam.rsi
+    sprite: ADT/Clothing/Neck/bodycam.rsi
     quickEquip: true
     slots:
     - neck

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -75,14 +75,14 @@
         coefficients:
           Blunt: 0.7
           Slash: 0.7
-          Piercing: 3
-          Heat: 3
+          Piercing: 2 # ADT shieldnerf
+          Heat: 2 # ADT shieldnerf
       activeBlockModifier:
         coefficients:
           Blunt: 0.5
           Slash: 0.5
-          Piercing: 3.6
-          Heat: 3.6
+          Piercing: 2 # ADT shieldnerf
+          Heat: 2 # ADT shieldnerf
         flatReductions:
           Blunt: 1
           Slash: 1
@@ -100,15 +100,15 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Blunt: 3.6
-          Slash: 3.6
-          Piercing: 3.6
+          Blunt: 2 # ADT shieldnerf
+          Slash: 2 # ADT shieldnerf
+          Piercing: 2 # ADT shieldnerf
           Heat: 0.7
       activeBlockModifier:
         coefficients:
-          Blunt: 3.6
-          Slash: 3.6
-          Piercing: 3.6
+          Blunt: 2 # ADT shieldnerf
+          Slash: 2 # ADT shieldnerf
+          Piercing: 2 # ADT shieldnerf
           Heat: 0.5
         flatReductions:
           Heat: 1
@@ -126,13 +126,13 @@
     - type: Blocking
       passiveBlockModifier:
         coefficients:
-          Blunt: 1.3
-          Slash: 1.3
+          Blunt: 1.3 # ADT shieldnerf
+          Slash: 1.3 # ADT shieldnerf
           Piercing: 0.7
       activeBlockModifier:
         coefficients:
-          Blunt: 1.3
-          Slash: 1.3
+          Blunt: 1.3 # ADT shieldnerf
+          Slash: 1.3 # ADT shieldnerf
           Piercing: 0.5
         flatReductions:
           Piercing: 1

diff --git a/...g/Neck/Misc/bodycam.rsi/equipped-NECK.png → ...othing/Neck/bodycam.rsi/equipped-NECK.png b/...g/Neck/Misc/bodycam.rsi/equipped-NECK.png → ...othing/Neck/bodycam.rsi/equipped-NECK.png
diff --git a/...T/Clothing/Neck/Misc/bodycam.rsi/icon.png → ...es/ADT/Clothing/Neck/bodycam.rsi/icon.png b/...T/Clothing/Neck/Misc/bodycam.rsi/icon.png → ...es/ADT/Clothing/Neck/bodycam.rsi/icon.png
diff --git a/.../Clothing/Neck/Misc/bodycam.rsi/meta.json → ...s/ADT/Clothing/Neck/bodycam.rsi/meta.json b/.../Clothing/Neck/Misc/bodycam.rsi/meta.json → ...s/ADT/Clothing/Neck/bodycam.rsi/meta.json
diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github).",
+  "copyright": "Created by EmoGarbage404 (github) for Space Station 14. icon-construction.png created by deltanedas (github). syndicateborgbomb.png created by Mangohydra (github). icons-detentions, icons-peace, icons-harm, icons-disabler made by ratyyy.",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/cf45322c7ee16f9d7e43d5260daf24ceb77c1b25",
+  "copyright": "Made by Ratyyy.",
   "size": {
     "x": 32,
     "y": 32