Merge pull request #292 from Schrodinger71/mini_update

Mini update
AdventureTimeSS14 · Jan 8, 2024 · 4cfbada · 4cfbada
2 parents 36b5a23 + 0e4faf5
commit 4cfbada
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl
@@ -24,3 +24,5 @@ ent-ADTPlushieTeo = плюшевый Тео
 ent-ADTPlushieDekus = плюшевый Декус-Га
     .desc = Это милый, ярко красный унатх в форме Квартирмейстера. Так и хочется его погладить.
 
+ent-ADTPlushieAfi = плюшевая Афи
+    .desc = Розовенький и слегка прозрачный милый слаймолюд. Почему-бы не обнять её?
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml
@@ -3,7 +3,7 @@
   coefficients:
     Blunt: 0.6
     Slash: 0.6
-    Piercing: 0.3
+    Piercing: 0.6
     # fire and lasers burn it good
     Heat: 1.0
     # zap

diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml
@@ -5,19 +5,19 @@
   playTimeTracker: JobSecurityCyborg
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 216000000 #60 hrs    216000
+      time: 2160000000 #60 hrs    216000
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 460000000 #46000
+      time: 4600000000 #46000
     - !type:RoleTimeRequirement
       role: JobSecurityOfficer
-      time: 21600 #6 hrs
+      time: 21600000000 #6 hrs 21600
     - !type:RoleTimeRequirement
       role: JobWarden
-      time: 21600 #6 hrs
+      time: -100000000 #6 hrs 21600
     - !type:RoleTimeRequirement
       role: JobDetective
-      time: 7200 #2 hrs
+      time: 720000000 #2 hrs 7200
   icon: "JobADTIconSecurityCyborg"
   supervisors: job-supervisors-rd
   jobEntity: ADTMobCyborSecurity

diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
@@ -514,3 +514,13 @@
   - type: Sprite
     sprite: ADT/Objects/Fun/toys.rsi
     state: plushie_dekus
+
+- type: entity
+  parent: BasePlushie
+  id: ADTPlushieAfi
+  name: Djessie plushie
+  description: It looks like a soft and cute blondie.
+  components:
+  - type: Sprite
+    sprite: ADT/Objects/Fun/toys.rsi
+    state: plushie_afi
diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
@@ -135,6 +135,9 @@
         },
         {
             "name": "plushie_dekus"
+        },
+        {
+            "name": "plushie_afi"
         }
     ]
 }
diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_afi.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_afi.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,6 +135,9 @@ @@
             },
             {
                 "name": "plushie_dekus"
+            },
+            {
+                "name": "plushie_afi"
             }
         ]
     }