Merge branch 'arumoon-server' of git.arumoon.ru:Workbench-Team/space-…

…station-14 into mr0maks-server

Resources/Changelog/ChangelogAruMoon.yml

@@ -648,3 +648,22 @@ Entries:
     type: Tweak
   id: 56
   time: '2023-06-17T18:37:49.0000000+00:00'
+- author: DjfjdfofdjfjD
+  changes:
+  - message: "(\u0441\u043D\u043E\u0432\u0430) \u0438\u0437\u043C\u0435\u043D\u0435\
+      \u043D\u044B \u0442\u0435\u043A\u0441\u0442\u0443\u0440\u044B \u0445\u0430\u0440\
+      \u0434\u0441\u044C\u044E\u0442\u043E\u0432 \u041E\u0411\u0420"
+    type: Tweak
+  id: 57
+  time: '2023-07-03T06:14:08.0000000+00:00'
+- author: MilenVolf
+  changes:
+  - message: "\u041F\u043B\u0430\u043D\u0435\u0442\u0430 \u042F\u0434\u0435\u0440\u043D\
+      \u044B\u0445 \u041E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0438\u043A\
+      \u043E\u0432 \u0438 \u0438\u0445 \u0428\u0430\u0442\u0442\u043B \u0431\u044B\
+      \u043B\u0438 \u0437\u0430\u043C\u0435\u043D\u0435\u043D\u044B \u043D\u0430 \u043D\
+      \u043E\u0432\u044B\u0435 \u0432\u0435\u0440\u0441\u0438\u0438 \u043F\u043E \u043F\
+      \u0440\u043E\u0442\u043E\u0442\u0438\u043F\u0443 TG."
+    type: Tweak
+  id: 58
+  time: '2023-07-01T15:57:59.0000000+00:00'

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -226,7 +226,7 @@
 
 #Captain's Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitCap
   noSpawn: true
   name: captain's hardsuit helmet
@@ -347,7 +347,7 @@
 
 #Cybersun Juggernaut Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitCybersun
   noSpawn: true
   name: cybersun juggernaut helmet
@@ -357,6 +357,8 @@
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
   - type: Clothing
     sprite: Clothing/Head/Hardsuits/cybersun.rsi
+  - type: PointLight
+    color: red
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
@@ -599,7 +601,7 @@
 
 #Deathsquad Hardsuit
 - type: entity
-  parent: ClothingHeadHardsuitBase
+  parent: ClothingHeadHardsuitWithLightBase
   id: ClothingHeadHelmetHardsuitDeathsquad
   noSpawn: true
   name: deathsquad hardsuit helmet

Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml

@@ -10,6 +10,7 @@
   startingGear: AtmosphericTechnicianGear
   icon: "AtmosphericTechnician"
   supervisors: job-supervisors-ce
+  canBeAntag: false
   antagAdvantage: 10
   access:
   - Maintenance

Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json

@@ -11,15 +11,30 @@
       "name": "icon"
     },
     {
-      "name": "equipped-HELMET",
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
       "directions": 4
     },
     {
-      "name": "inhand-left",
+      "name": "on-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-right",
+      "name": "on-inhand-right",
       "directions": 4
     }
   ]