Merge pull request #114 from FrisKisDr/fire

Разблокировка и доработка Новакидов. МЕРДЖИТЬ ТОЛЬКО 14 ЧИСЛА !
AdventureTimeSS14 · Nov 13, 2023 · 53b30b7 · 53b30b7
2 parents 4106866 + 8fc2313
commit 53b30b7
Show file tree

Hide file tree

Showing 25 changed files with 257 additions and 22 deletions.
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -1290,7 +1290,7 @@ public static readonly CVarDef<int>
         /// Is the emergency shuttle allowed to be early launched.
         /// </summary>
         public static readonly CVarDef<bool> EmergencyEarlyLaunchAllowed =
-            CVarDef.Create("shuttle.emergency_early_launch_allowed", false, CVar.SERVERONLY);
+            CVarDef.Create("shuttle.emergency_early_launch_allowed", true, CVar.SERVERONLY);
 
         /// <summary>
         /// How long the emergency shuttle remains docked with the station, in seconds.

diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml
@@ -518,13 +518,12 @@ Entries:
   id: 55601 #костыль отображения в Обновлениях
   time: '2023-11-07T07:40:00.0000000+00:00'
 
-#- author: Friskis
-#  changes:
-#  - {message: Новая мзуыка лобби, type: Add}
-#  - {message: Раса Новакидов, type: Add}
-#  id: 55602 #костыль отображения в Обновлениях
-#  time: '2023-11-14T07:40:00.0000000+00:00'
-# ХихиХАха. До 14 числа
+- author: Friskis
+  changes:
+  - {message: Новая мзуыка лобби, type: Add}
+  - {message: Раса Новакидов, type: Add}
+  id: 55602 #костыль отображения в Обновлениях
+  time: '2023-11-14T07:40:00.0000000+00:00'
 
 - author: Шрёдингер
   changes:
@@ -563,3 +562,9 @@ Entries:
   - {message: Добавлена возможность постройки камина., type: Add}
   id: 55606 #костыль отображения в Обновлениях
   time: '2023-11-13T04:20:00.0000000+00:00'
+
+- author: Friskis
+  changes:
+  - {message: Разблокировка Новакидов, type: Fix}
+  id: 55607 #костыль отображения в Обновлениях
+  time: '2023-11-14T07:40:00.0000000+00:00'
diff --git a/Resources/Locale/ru-RU/ADT/Novakid/species.ftl b/Resources/Locale/ru-RU/ADT/Novakid/species.ftl
@@ -40,5 +40,21 @@ marking-NovakidFace15 = перевёрнутое распятие
 marking-NovakidFace16 = X
 marking-NovakidFace17 = Y
 marking-NovakidFace18 = зета
+marking-NovakidFace19 = конус
+marking-NovakidFace20 = cвязь
+marking-NovakidFace21 = окружность
+marking-NovakidFace22 = косательная
+marking-NovakidFace23 = очи
+marking-NovakidFace24 = G
+marking-NovakidFace25 = домик
+marking-NovakidFace26 = К
+marking-NovakidFace27 = лима
+marking-NovakidFace28 = обратная косательная
+marking-NovakidFace29 = омега
+marking-NovakidFace30 = плюс
+marking-NovakidFace31 = роза
+marking-NovakidFace32 = раскол
+marking-NovakidFace33 = звезда
+marking-NovakidFace34 = продовольные очки
 marking-TorsoNovakidDefolt = белое ядро
 marking-HeadNovakidDefolt = белое ядро
diff --git a/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml
@@ -5,6 +5,9 @@
   components:
   - type: Stomach
     maxVol: 50
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [ Novakid ]
 
 - type: entity
   id: OrganNovakidLungs
@@ -13,3 +16,16 @@
   components:
   - type: Metabolizer
     metabolizerTypes: [ Novakid ]
+
+- type: entity
+  id: OrganNovakidHeart
+  parent: OrganAnimalHeart
+  suffix: "novakid"
+  components:
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [ Novakid ]
+    groups:
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
diff --git a/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml
@@ -13,7 +13,7 @@
     torso:
       part: TorsoNovakid
       organs:
-        heart: OrganAnimalHeart
+        heart: OrganNovakidHeart
         lungs: OrganNovakidLungs
         stomach: OrganNovakidStomach
         liver: OrganAnimalLiver

diff --git a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml
@@ -388,13 +388,147 @@
   sprites:
   - sprite: ADT/Mobs/Novakid/custom.rsi
     state: torso_novakid_defolt
-# - type: marking
-#   id: NovakidOverlay
-#   bodyPart: [ Head, Chest ]
-#   markingCategory: Overlay
-#   speciesRestriction: [NovakidSpecies]
-#   forcedColoring: true
-#   color: ffffff
-#   sprites:
-#     - sprite: ADT/Mobs/Novakid/custom.rsi
-#       state: base_novakid_defolt
+
+- type: marking
+  id: NovakidFace19
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: cone_a
+
+- type: marking
+  id: NovakidFace20
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: connect_a
+
+- type: marking
+  id: NovakidFace21
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: dot_a
+
+- type: marking
+  id: NovakidFace22
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: dotline_a
+
+- type: marking
+  id: NovakidFace23
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: eyes_a
+
+- type: marking
+  id: NovakidFace24
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: G_a
+
+- type: marking
+  id: NovakidFace25
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: house
+
+- type: marking
+  id: NovakidFace26
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: K
+
+- type: marking
+  id: NovakidFace27
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: lima-a
+
+- type: marking
+  id: NovakidFace28
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: linedot_a
+
+- type: marking
+  id: NovakidFace29
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: omega_a
+
+- type: marking
+  id: NovakidFace30
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: plus
+
+- type: marking
+  id: NovakidFace31
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: rose
+
+- type: marking
+  id: NovakidFace32
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: shatter_a
+
+- type: marking
+  id: NovakidFace33
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: star_a
+
+- type: marking
+  id: NovakidFace34
+  bodyPart: Head
+  markingCategory: HeadSide
+  speciesRestriction: [NovakidSpecies]
+  sprites:
+  - sprite: ADT/Mobs/Novakid/custom.rsi
+    state: two-a
diff --git a/Resources/Prototypes/ADT/Novakid/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Species/novakid.yml
@@ -1,7 +1,7 @@
 - type: species
   id: NovakidSpecies
   name: species-name-novakid
-  roundStart: false # изменить потом
+  roundStart: true
   prototype: MobNovakid
   sprites: MobNovakidSprites
   defaultSkinTone: "#34a223"

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -204,13 +204,13 @@
       thresholds:
         - trigger:
             !type:DamageTrigger
-            damage: 501
+            damage: 251
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]
         - trigger:
             !type:DamageTrigger
-            damage: 500 #Very weak shield
+            damage: 250 #Very weak shield
           behaviors:
             - !type:DoActsBehavior
               acts: [ "Destruction" ]

diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cone_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cone_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dotline_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dotline_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/house.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/house.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lima-a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lima-a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/linedot_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/linedot_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meta.json b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/meta.json
@@ -175,6 +175,70 @@
         {
             "name": "torso_novakid_defolt",
             "directions": 4
+        },
+        {
+            "name": "cone_a",
+            "directions": 4
+        },
+        {
+            "name": "connect_a",
+            "directions": 4
+        },
+        {
+            "name": "dot_a",
+            "directions": 4
+        },
+        {
+            "name": "dotline_a",
+            "directions": 4
+        },
+        {
+            "name": "G_a",
+            "directions": 4
+        },
+        {
+            "name": "house",
+            "directions": 4
+        },
+        {
+            "name": "K",
+            "directions": 4
+        },
+        {
+            "name": "lima-a",
+            "directions": 4
+        },
+        {
+            "name": "linedot_a",
+            "directions": 4
+        },
+        {
+            "name": "omega_a",
+            "directions": 4
+        },
+        {
+            "name": "plus",
+            "directions": 4
+        },
+        {
+            "name": "rose",
+            "directions": 4
+        },
+        {
+            "name": "shatter_a",
+            "directions": 4
+        },
+        {
+            "name": "star_a",
+            "directions": 4
+        },
+        {
+            "name": "two-a",
+            "directions": 4
+        },
+        {
+            "name": "eyes_a",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/omega_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/omega_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/plus.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/plus.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rose.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rose.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png
diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png