Merge pull request #397 from Schrodinger71/fixx

Фиксики

Content.Server/ADT/Changeling/EntitySystems/ChangelingSystem.cs

@@ -255,8 +255,6 @@ public void OnCycleDNA(EntityUid uid, ChangelingComponent component, ChangelingC
     public void OnTransform(EntityUid uid, ChangelingComponent component, ChangelingTransformActionEvent args)
     {
         var selectedHumanoidData = component.StoredDNA[component.SelectedDNA];
-        var transformedUid = _polymorph.PolymorphEntityAsHumanoid(uid, selectedHumanoidData);
-
         if (args.Handled)
             return;
 
@@ -283,6 +281,7 @@ public void OnTransform(EntityUid uid, ChangelingComponent component, Changeling
 
         args.Handled = true;
 
+        var transformedUid = _polymorph.PolymorphEntityAsHumanoid(uid, selectedHumanoidData);
         if (transformedUid == null)
             return;
 

Resources/Locale/ru-RU/ADT/Clothing/USSP.ftl

@@ -94,3 +94,9 @@ ent-ADTClothingHeadHatsOfficerUSSPCap = фуражка офицера СССП
 ent-ADTInfantrymanTUSSPUniform = униформа космодесантника СССП
     .desc = Комплект одежды для космодесантника СССП
     .suffix = { "СССП" }
+ent-ADTClothingOuterHardsuitMonolithReserch = НИБС-СФЕРА-М
+    .desc = Передовой исследовательский скафандр СССП разработанный для работ в условиях повышенной радиохимической а так же биологической угрозы.
+    .suffix = { "СССП" }
+ent-ADTClothingHeadHelmetHardsuitMonolithReserch = шлем НИБС-СФЕРА-М
+    .desc = Прочный шлем от передового исследовательского скафандра СССП.
+    .suffix = { "СССП" }

Resources/Locale/ru-RU/job/job-names.ftl

@@ -111,5 +111,5 @@ JobADTSupplyBorg = Киборг Снабжения
 JobADTMedicalBorg = Медицинский Киборг
 JobADTServiseBorg = Сервисный Киборг
 JobADTJanitorBorg = Киборг Уборщик
-JobADTSecurityCyborg = Киборг СБ(В разработке)
+JobADTSecurityCyborg = Киборг СБ
 JobADTRoboticist = Робототехник

Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/Hardsuits/USSP.yml

@@ -360,3 +360,58 @@
         Piercing: 0.9
         Heat: 0.9
 
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ADTClothingOuterHardsuitMonolithReserch
+  name: MoNILIth exocosuit of the SSSP
+  description: The S.A.M. exocosuit, also known as the "Adaptive Camouflage System", is a completely innovative means of protection for operatives of Special units of the USSP. Combining advanced technologies of composite materials, carbon coatings, as well as adaptive camouflage, roughly speaking - "invisibility", these exosuits provide outstanding protective effectiveness and have shown themselves to be at their best in operational conditions. This spacesuit is in the "Tactical" color scheme
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.02
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.6
+        Slash: 0.8
+        Piercing: 0.9
+        Heat: 0.3
+        Radiation: 0.1
+        Caustic: 0.2
+        Stun: 0.5
+  - type: ExplosionResistance
+    damageCoefficient: 0.1
+  - type: ClothingSpeedModifier
+    walkModifier: 0.75
+    sprintModifier: 0.75
+  - type: HeldSpeedModifier
+  - type: Item
+    size: Normal
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: ToggleableClothing
+    clothingPrototype: ADTClothingHeadHelmetHardsuitMonolithReserch
+  - type: StaticPrice
+    price: 750
+
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ADTClothingHeadHelmetHardsuitMonolithReserch
+  name: MONOLITh helmet
+  description: A sturdy special forces helmet with motion, light and sound sensors, the helmet has no cutouts for the eyes, which provides full protection for the wearer's head.
+  components:
+  - type: BreathMask
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Hardsuits/ussp_rd.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Hardsuits/ussp_rd.rsi
+  - type: PointLight
+    color: "#d6adff"
+  - type: PressureProtection
+    highPressureMultiplier: 0.60
+    lowPressureMultiplier: 1000

Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml

@@ -5,10 +5,10 @@
   playTimeTracker: JobSecurityCyborg
   requirements:
     - !type:OverallPlaytimeRequirement
-      time: 216000 #60 hrs    216000
+      time: 324000 #90 hrs
     - !type:DepartmentTimeRequirement
       department: Security
-      time: 46000 #46000
+      time: 324000 #90 hrs
     - !type:RoleTimeRequirement
       role: JobSecurityOfficer
       time: 21600 #6 hrs 21600

Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml

@@ -4,6 +4,11 @@
   name: Security Cyborg
   description: A cyborg designed to quell any unrest. Mechanized heavy power.
   components:
+  - type: InteractionPopup
+    interactSuccessString: petting-success-ipc
+    #interactFailureString: petting-failure-cleanbot
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
   - type: SuitSensor
   - type: DeviceNetwork
     deviceNetId: Wireless

Resources/Textures/ADT/Clothing/Head/Hardsuits/ussp_rd.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made borisoglebsk, Create from Adventure Time team",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/ussp_rd.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made borisoglebsk, Create from Adventure Time team",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}