Респрайты и улучшение вида предметов и одежды.

Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml

@@ -9,28 +9,6 @@
   - type: Clothing
     sprite: Clothing/Head/Hats/urs_hat.rsi
 
-- type: entity
-  parent: ClothingHeadBase
-  id: ADTClothingHeadHatBeretBlueshieldBlack
-  name: blueshield officer's beret
-  description: A corporate black beret with a blueshield officer's rank emblem.
-  components:
-  - type: Sprite
-    sprite: ADT/Clothing/Head/Hats/blueshield_beret_black.rsi
-  - type: Clothing
-    sprite: ADT/Clothing/Head/Hats/blueshield_beret_black.rsi
-
-- type: entity
-  parent: ClothingHeadBase
-  id: ADTClothingHeadHatBeretBlueshield
-  name: blueshield officer's beret
-  description: A corporate blue beret with a blueshield officer's rank emblem.
-  components:
-  - type: Sprite
-    sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi
-  - type: Clothing
-    sprite: ADT/Clothing/Head/Hats/blueshield_beret.rsi
-
 #Стильномат
 - type: entity
   parent: ClothingHeadBase
@@ -76,18 +54,6 @@
     - HamsterWearable
     - WhitelistChameleon
 
-# Brigmedic beret
-- type: entity
-  parent: ClothingHeadBase
-  id: ADTClothingHeadHatBeretBrigmedic
-  name: brigmedic beret
-  description: A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.
-  components:
-    - type: Sprite
-      sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi
-    - type: Clothing
-      sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi
-
 - type: entity
   parent: ClothingHeadBase
   id: ADTClothingHeadCapIlisium
@@ -123,9 +89,9 @@
   suffix: New Mekka
   components:
   - type: Sprite
-    sprite: ADT/Clothing/Head/Hats/armyberet.rsi
+    sprite: ADT/Clothing/Head/Hats/beret_army.rsi
   - type: Clothing
-    sprite: ADT/Clothing/Head/Hats/armyberet.rsi
+    sprite: ADT/Clothing/Head/Hats/beret_army.rsi
 
 # Фуражки надзирателя
 - type: entity
@@ -219,6 +185,51 @@
     tags:
       - HamsterWearable
 
+# Brigmedic beret
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHatBeretBrigmedic
+  name: brigmedic beret
+  description: A robust beret with the medical insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.
+  components:
+    - type: Sprite
+      sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi
+    - type: Clothing
+      sprite: ADT/Clothing/Head/Hats/beret_brigmedic.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHatBeretBlueshieldBlack
+  name: blueshield officer's beret
+  description: A corporate black beret with a blueshield officer's rank emblem.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Hats/beret_blueshield_black.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Hats/beret_blueshield_black.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHatBeretBlueshield
+  name: blueshield officer's beret
+  description: A corporate blue beret with a blueshield officer's rank emblem.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Hats/beret_blueshield.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Hats/beret_blueshield.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ADTClothingHeadHatBeretСE
+  name: blueshield officer's beret
+  description: A corporate blue beret with a blueshield officer's rank emblem.
+  components:
+  - type: Sprite
+    sprite: ADT/Clothing/Head/Hats/beret_ce.rsi
+  - type: Clothing
+    sprite: ADT/Clothing/Head/Hats/beret_ce.rsi
+
 #октоберфест
 
 - type: entity

Resources/Prototypes/ADT/Entities/Objects/Misc/pen.yml

@@ -28,7 +28,7 @@
   description: A luxurious fountain pen for the ce of the station.
   components:
   - type: Sprite
-    state: ADTpen_CE
+    state: pen_ce
 
 - type: entity
   name: cmo's fountain pen
@@ -37,7 +37,7 @@
   description: A luxurious fountain pen for the cmo of the station.
   components:
   - type: Sprite
-    state: ADTpen_cmo
+    state: pen_cmo
 
 - type: entity
   name: QM's fountain pen
@@ -46,7 +46,7 @@
   description: A luxurious fountain pen for the QM of the station.
   components:
   - type: Sprite
-    state: ADTpen_QM
+    state: pen_qm
 
 - type: entity
   name: RD's fountain pen
@@ -55,7 +55,7 @@
   description: A luxurious fountain pen for the RD of the station.
   components:
   - type: Sprite
-    state: ADTpen_RD
+    state: pen_rd
 
 - type: entity
   name: Hos's fountain pen
@@ -64,7 +64,16 @@
   description: A luxurious fountain pen for the Hos of the station.
   components:
   - type: Sprite
-    state: ADTpen_hos
+    state: pen_hos
+
+- type: entity
+  name: gorlax's fountain pen
+  parent: ADTPenEmbeddable
+  id: ADTPenGorlax
+  description: A luxurious fountain pen for the gorlax.
+  components:
+  - type: Sprite
+    state: pen_gorlax
 
 - type: entity
   name: DV`s pen
@@ -73,7 +82,7 @@
   suffix: DV
   components:
   - type: Sprite
-    state: ADTpen_dv
+    state: pen_dv
   - type: DamageOtherOnHit
     damage:
       types:
@@ -87,6 +96,6 @@
   components:
   - type: Sprite
     sprite: ADT/Objects/Misc/pens.rsi
-    state: ADTpen_capdv
+    state: pen_capdv
   - type: Item
     sprite: ADT/Objects/Misc/pens.rsi

Resources/Prototypes/ADT/Loadouts/Jobs/Engineering/chief_engineer.yml

@@ -0,0 +1,4 @@
+- type: loadout
+  id: ADTChiefEngineerBeret
+  equipment:
+    head: ADTClothingHeadHatBeretСE

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

@@ -22,7 +22,7 @@
     contents:
       - id: ClothingUniformJumpsuitChiefEngineerTurtle
       - id: ClothingUniformJumpskirtChiefEngineerTurtle
-      - id: ClothingHeadHatBeretEngineering
+      - id: ADTClothingHeadHatBeretСE # ADT tweak
       - id: ClothingOuterWinterCE
       - id: ClothingNeckCloakCe
 

Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml

@@ -56,6 +56,12 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+# ADT tweak start
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+    - MonkeyWearable
+# ADT tweak end
 
 #Prisoner EVA
 - type: entity

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

@@ -294,28 +294,34 @@
   description: Busted.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
-    layers:
-    - state: icon
-      color: "#ff8300"
-    - state: prisoner-icon
+# ADT tweak start
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/prisoner.rsi
+#    layers:
+#    - state: icon
+#      color: "#ff8300"
+#    - state: prisoner-icon
+# ADT tweak end
   - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#ff8300"
-      - state: prisoner-inhand-left
-      right:
-      - state: inhand-right
-        color: "#ff8300"
-      - state: prisoner-inhand-right
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-        color: "#ff8300"
-      - state: prisoner-equipped-INNERCLOTHING
+# ADT tweak start
+#    inhandVisuals: ADT tweak start
+#      left:
+#      - state: inhand-left
+#        color: "#ff8300"
+#      - state: prisoner-inhand-left
+#      right:
+#      - state: inhand-right
+#        color: "#ff8300"
+#      - state: prisoner-inhand-right
+# ADT tweak end
+  - type: Clothing
+# ADT tweak start
+    sprite: ADT/Clothing/Uniforms/Jumpskirt/prisoner.rsi
+#    clothingVisuals: ADT tweak start
+#      jumpsuit:
+#      - state: equipped-INNERCLOTHING
+#        color: "#ff8300"
+#      - state: prisoner-equipped-INNERCLOTHING
+# ADT tweak end
   - type: SuitSensor
     controlsLocked: true
     randomMode: false

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

@@ -480,28 +480,34 @@
   description: Busted.
   components:
   - type: Sprite
-    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
-    layers:
-    - state: icon
-      color: "#ff8300"
-    - state: prisoner-icon
+# ADT tweak start
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/prisoner.rsi
+#    layers:
+#    - state: icon
+#      color: "#ff8300"
+#    - state: prisoner-icon
+# ADT tweak end
   - type: Item
-    inhandVisuals:
-      left:
-      - state: inhand-left
-        color: "#ff8300"
-      - state: prisoner-inhand-left
-      right:
-      - state: inhand-right
-        color: "#ff8300"
-      - state: prisoner-inhand-right
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
-    clothingVisuals:
-      jumpsuit:
-      - state: equipped-INNERCLOTHING
-        color: "#ff8300"
-      - state: prisoner-equipped-INNERCLOTHING
+# ADT tweak start
+#    inhandVisuals: ADT tweak start
+#      left:
+#      - state: inhand-left
+#        color: "#ff8300"
+#      - state: prisoner-inhand-left
+#      right:
+#      - state: inhand-right
+#        color: "#ff8300"
+#      - state: prisoner-inhand-right
+# ADT tweak end
+  - type: Clothing
+# ADT tweak start
+    sprite: ADT/Clothing/Uniforms/Jumpsuit/prisoner.rsi
+#    clothingVisuals: ADT tweak start
+#      jumpsuit:
+#      - state: equipped-INNERCLOTHING
+#        color: "#ff8300"
+#      - state: prisoner-equipped-INNERCLOTHING
+# ADT tweak end
   - type: SuitSensor
     controlsLocked: true
     randomMode: false

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -742,7 +742,7 @@
   minLimit: 0
   loadouts:
   - ChiefEngineerHead
-  - ChiefEngineerBeret
+  - ADTChiefEngineerBeret # ADT tweak
 
 - type: loadoutGroup
   id: ChiefEngineerJumpsuit

Resources/Textures/ADT/Clothing/Back/pathologist_backpack.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by JustKekc",
+    "copyright": "Created by JustKekc, equipped and icon upgraded by discord:prazat911",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/ADT/Clothing/Back/pathologist_duffel.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by JustKekc",
+    "copyright": "Created by JustKekc, upgraded by discord:prazat911",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/ADT/Clothing/Back/pathologist_satchel.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by JustKekc",
+    "copyright": "Created by JustKekc, equipped and icon upgraded by discord:prazat911",
     "size": {
         "x": 32,
         "y": 32

Resources/Textures/ADT/Clothing/Head/Hats/beret_HOP.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Created by discord:prazat.",
+    "copyright": "Created by discord:prazat911.",
     "size": {
         "x": 32,
         "y": 32