From 31f439207f125b9bac45f3690de81cdc0666fccc Mon Sep 17 00:00:00 2001
From: ChappyChokolate-org
 <63551838+ChappyChokolate-org@users.noreply.github.com>
Date: Sat, 12 Oct 2024 12:45:19 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D1=88=D0=B0=D1=82=D0=BB=20=D0=9E=D0=91?=
 =?UTF-8?q?=D0=A0=D0=BE=D0=B2=D1=86=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{mini_ERT_sec.yml => mini_ERT_suc.yml}    | 21 +++++++++++++++++--
 .../Mobs/Player/ShuttleRoles/settings.yml     | 13 +++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)
 rename Resources/Maps/_Sunrise/Shuttles/{mini_ERT_sec.yml => mini_ERT_suc.yml} (99%)

diff --git a/Resources/Maps/_Sunrise/Shuttles/mini_ERT_sec.yml b/Resources/Maps/_Sunrise/Shuttles/mini_ERT_suc.yml
similarity index 99%
rename from Resources/Maps/_Sunrise/Shuttles/mini_ERT_sec.yml
rename to Resources/Maps/_Sunrise/Shuttles/mini_ERT_suc.yml
index 56447dacb7d..5366110ee74 100644
--- a/Resources/Maps/_Sunrise/Shuttles/mini_ERT_sec.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/mini_ERT_suc.yml
@@ -1,3 +1,4 @@
+# by mizeliy
 meta:
   format: 6
   postmapinit: false
@@ -23,7 +24,7 @@ entities:
   - uid: 1
     components:
     - type: MetaData
-      name: Forceps
+      name: NT - Forceps - ОБР
     - type: Transform
       pos: -1.0625,-0.28928185
       parent: invalid
@@ -1620,7 +1621,7 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: DefibrillatorCabinet
+- proto: DefibrillatorCabinetFilled
   entities:
   - uid: 208
     components:
@@ -2669,6 +2670,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 1
+  - uid: 461
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 462
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,10.5
+      parent: 1
 - proto: RailingCorner
   entities:
   - uid: 315
@@ -2769,9 +2782,13 @@ entities:
   entities:
   - uid: 320
     components:
+    - type: MetaData
+      name: печать ОБР
     - type: Transform
       pos: 1.6421438,7.3485546
       parent: 1
+    - type: Stamp
+      stampedName: ОБР
 - proto: SheetGlass
   entities:
   - uid: 29
diff --git a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
index 7e68d7c61dc..cb64d32caed 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
@@ -27,6 +27,17 @@
       prototypes: [ VisitorCaptain, VisitorCaptainAlt ]
       roleLoadout: [ RoleSurvivalStandard ]
 
+- type: randomHumanoidSettings
+  id: VisitorInvestigator
+  parent: VisitorHead
+  components:
+    - type: GhostRole
+      name: job-name-investigator
+      description: ghost-role-information-security-description
+    - type: Loadout
+      prototypes: [ VisitorInvestigator, VisitorInvestigatorAlt ]
+      roleLoadout: [ RoleSurvivalStandard ]
+
 - type: randomHumanoidSettings
   id: VisitorCE
   parent: VisitorHead
@@ -426,7 +437,7 @@
     - type: RandomMetadata
       nameSegments:
       - names_clown
-      
+
 - type: randomHumanoidSettings
   id: VisitorJanitor
   parent: VisitorCivilian

From f7ed709d5dbc5bee661a3d84c8f5dd20bc30a7fc Mon Sep 17 00:00:00 2001
From: ChappyChokolate-org
 <63551838+ChappyChokolate-org@users.noreply.github.com>
Date: Sat, 12 Oct 2024 19:58:48 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Mobs/Player/ShuttleRoles/settings.yml    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
index cb64d32caed..01077fa9055 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/ShuttleRoles/settings.yml
@@ -27,17 +27,6 @@
       prototypes: [ VisitorCaptain, VisitorCaptainAlt ]
       roleLoadout: [ RoleSurvivalStandard ]
 
-- type: randomHumanoidSettings
-  id: VisitorInvestigator
-  parent: VisitorHead
-  components:
-    - type: GhostRole
-      name: job-name-investigator
-      description: ghost-role-information-security-description
-    - type: Loadout
-      prototypes: [ VisitorInvestigator, VisitorInvestigatorAlt ]
-      roleLoadout: [ RoleSurvivalStandard ]
-
 - type: randomHumanoidSettings
   id: VisitorCE
   parent: VisitorHead