Merge branch 'master' into fire

Resources/Changelog/ChangelogADT.yml

@@ -588,5 +588,12 @@ Entries:
   - {message: Новакидов не ослепляет вспышка и сварка, type: Fix}
   - {message: Новакиды теперь наносят урон ожогами в рукопашном, type: Fix}
   - {message: Удален слот очков для Новакидов. Глазок-то нет :c, type: Remove}
-  id: 55607 #костыль отображения в Обновлениях
+  id: 55610 #костыль отображения в Обновлениях
   time: '2023-11-19T07:40:00.0000000+00:00'
+
+- author: Шрёдингер
+  changes:
+  - {message: Респрайты всех вещмешков от Празата., type: Tweak}
+  id: 55609 #костыль отображения в Обновлениях
+  time: '2023-11-20T04:20:00.0000000+00:00'
+

Resources/Locale/ru-RU/ss14-ru/prototypes/body/organs/animal/animal.ftl

@@ -10,3 +10,5 @@ ent-OrganAnimalHeart = сердце
     .desc = { ent-BaseAnimalOrgan.desc }
 ent-OrganAnimalKidneys = почки
     .desc = { ent-BaseAnimalOrgan.desc }
+ent-ADTOrganVulpkaninAnimalLiver = Печень вульпканина
+    .desc = { ent-BaseAnimalOrgan.desc }

Resources/Prototypes/ADT/Entities/Objects/Power/lights.yml

@@ -8,7 +8,7 @@
   components:
   - type: LightBulb
     color: "#00FF00"
-    lightEnergy: 6
+    lightEnergy: 2
     lightRadius: 15
     lightSoftness: 0.9
     BurningTemperature: 1000
@@ -23,7 +23,7 @@
   components:
   - type: LightBulb
     color: "#FF0000"
-    lightEnergy: 6
+    lightEnergy: 2
     lightRadius: 15
     lightSoftness: 0.9
     BurningTemperature: 1000
@@ -38,7 +38,7 @@
   components:
   - type: LightBulb
     color: "#0000FF"
-    lightEnergy: 6
+    lightEnergy: 2
     lightRadius: 15
     lightSoftness: 0.9
     BurningTemperature: 1000
@@ -53,7 +53,7 @@
   components:
   - type: LightBulb
     color: "#FFE400"
-    lightEnergy: 6
+    lightEnergy: 2
     lightRadius: 15
     lightSoftness: 0.9
     BurningTemperature: 1000
@@ -68,7 +68,7 @@
   components:
   - type: LightBulb
     color: "#EE82EE"
-    lightEnergy: 6
+    lightEnergy: 2
     lightRadius: 15
     lightSoftness: 0.9
     BurningTemperature: 1000

Resources/Prototypes/ADT/Vulpkanin/Body/Organs/Vulpkanin.yml

@@ -1,7 +1,23 @@
-- type: entity
+- type: entity
   id: OrganVulpkaninStomach
   parent: OrganAnimalStomach
   noSpawn: true
   components:
     - type: Stomach
       maxVolume: 50
+
+- type: entity
+  id: ADTOrganVulpkaninAnimalLiver
+  parent: BaseAnimalOrgan
+  name: liver
+  noSpawn: true
+  components:
+  - type: Sprite
+    state: liver
+  - type: Organ
+  - type: Metabolizer
+    maxReagents: 1
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Alcohol
+      rateModifier: 0.1

Resources/Prototypes/ADT/Vulpkanin/Body/Prototypes/Vulpkanin.yml

@@ -16,7 +16,7 @@
         heart: OrganAnimalHeart
         lungs: OrganHumanLungs
         stomach: OrganVulpkaninStomach
-        liver: OrganAnimalLiver
+        liver: ADTOrganVulpkaninAnimalLiver  #Печень вульпы
         kidneys: OrganHumanKidneys
       connections:
         - left arm

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2590,7 +2590,7 @@
         Base: splat-0
   - type: Food
   - type: Hunger
-    baseDecayRate: 0.3
+    baseDecayRate: 0.1
   - type: Extractable
     grindableSolutionName: food
   - type: SolutionContainerManager

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -18,6 +18,8 @@
       settings: DeathSquad
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: DeathSquad
   randomizeName: false
   components:
@@ -53,6 +55,8 @@
   #noSpawn: true
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTLeader
   randomizeName: false
   components:
@@ -82,6 +86,8 @@
       settings: ERTLeaderEVA
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTLeaderEVA
   parent: ERTLeader
   components:
@@ -108,6 +114,8 @@
       settings: ERTLeaderREV
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTLeaderREV
   parent: ERTLeader
   components:
@@ -127,6 +135,8 @@
       settings: ERTLeaderEVALecter
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTLeaderEVALecter
   parent: ERTLeaderEVA
   components:
@@ -158,6 +168,8 @@
   #noSpawn: true
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTJanitor
   parent: ERTLeader
   components:
@@ -187,6 +199,8 @@
       settings: ERTJanitorEVA
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTJanitorEVA
   parent: ERTJanitor
   components:
@@ -218,6 +232,8 @@
   #noSpawn: true
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTEngineer
   parent: ERTLeader
   components:
@@ -247,6 +263,8 @@
       settings: ERTEngineerEVA
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTEngineerEVA
   parent: ERTEngineer
   components:
@@ -273,6 +291,8 @@
       settings: ERTEngineerREV
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTEngineerREV
   parent: ERTEngineer
   components:
@@ -334,6 +354,8 @@
       settings: ERTSecurityEVA
 
 - type: randomHumanoidSettings
+  speciesBlacklist:
+    - Diona
   id: ERTSecurityEVA
   parent: ERTSecurity
   components:
@@ -360,6 +382,8 @@
       settings: ERTSecurityREV
 
 - type: randomHumanoidSettings
+  speciesBlacklist:
+    - Diona
   id: ERTSecurityREV
   parent: ERTSecurity
   components:
@@ -379,6 +403,8 @@
       settings: ERTSecurityEVALecter
 
 - type: randomHumanoidSettings
+  speciesBlacklist:
+    - Diona
   id: ERTSecurityEVALecter
   parent: ERTSecurityEVA
   components:
@@ -410,6 +436,8 @@
   #noSpawn: true
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTMedical
   parent: ERTLeader
   components:
@@ -439,6 +467,8 @@
       settings: ERTMedicalEVA
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTMedicalEVA
   parent: ERTMedical
   components:
@@ -465,6 +495,8 @@
       settings: ERTMedicalREV
 
 - type: randomHumanoidSettings
+  speciesBlacklist: 
+    - Diona
   id: ERTMedicalREV
   parent: ERTMedical
   components:
@@ -489,7 +521,7 @@
       settings: CBURNAgent
 
 - type: randomHumanoidSettings
-  speciesBlacklist: # Corvax-MRP
+  speciesBlacklist: 
     - Diona
   id: CBURNAgent
   components:

Resources/Textures/Clothing/Back/Duffels/atmospherics.rsi/meta.json

@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14, and modified for corvax by linkblyat (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14, and modified for Adventure Time by prazat911 (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }

Resources/Textures/Clothing/Back/Duffels/brigmedic.rsi/meta.json

@@ -1,26 +1,26 @@
 {
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited by Hülle#2562 (Discord)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Sprited by Hülle#2562 (Discord), and modified for Adventure Time by prazat911 (Discord)",
+    "size": {
+        "x": 32,
+        "y": 32
     },
-    {
-      "name": "equipped-BACKPACK",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
 }