From 87ec87fce7f06bc9e80f4878cc79e3e24a78dd7a Mon Sep 17 00:00:00 2001 From: Babaev Date: Wed, 17 Jul 2024 12:02:00 +0600 Subject: [PATCH 1/2] new --- .../Catalog/Fills/Lockers/heads.yml | 4 +++ .../Catalog/Fills/Lockers/medical.yml | 1 + .../Entities/Objects/Devices/flatpack.yml | 25 ++++++++++++++++++ .../Devices/flatpack.rsi/cloning-console.png | Bin 0 -> 445 bytes .../Devices/flatpack.rsi/cloning-pod.png | Bin 0 -> 419 bytes .../Objects/Devices/flatpack.rsi/meta.json | 17 ++++++++++++ 6 files changed, 47 insertions(+) create mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml create mode 100644 Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-console.png create mode 100644 Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-pod.png create mode 100644 Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index ef861fd82be..992684a140c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -200,6 +200,8 @@ - id: RubberStampCMO - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical + - id: CloningConsoleFlatpack # Sunrise-edit + - id: CloningPodFlatpack # Sunrise-edit - type: entity id: LockerChiefMedicalOfficerFilled @@ -220,6 +222,8 @@ - id: RubberStampCMO - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical + - id: CloningConsoleFlatpack # Sunrise-edit + - id: CloningPodFlatpack # Sunrise-edit - type: entity id: LockerResearchDirectorFilledHardsuit diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 22009e75615..eba61103aee 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -146,3 +146,4 @@ - id: HandheldGPSBasic - id: MedkitFilled prob: 0.3 + - id: HandheldCrewMonitor # Sunrise-edit diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml new file mode 100644 index 00000000000..dd5af9408e8 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml @@ -0,0 +1,25 @@ +- type: entity + parent: BaseFlatpack + id: CloningConsoleFlatpack + name: упаковка консоли клонирования + description: Упаковка, при помощи которой можно создать консоль клонирования. + components: + - type: Flatpack + entity: ComputerCloningConsole + - type: Sprite + sprite: _Sunrise/Entities/Objects/Devices/flatpack.rsi + layers: + - state: cloning-console + +- type: entity + parent: BaseFlatpack + id: CloningPodFlatpack + name: упаковка капсулы клонирования + description: Упаковка, при помощи которой можно создать капсулу клонирования. + components: + - type: Flatpack + entity: CloningPod + - type: Sprite + sprite: _Sunrise/Entities/Objects/Devices/flatpack.rsi + layers: + - state: cloning-pod diff --git a/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-console.png b/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-console.png new file mode 100644 index 0000000000000000000000000000000000000000..683695bc5f3b9f620a84ca8cc1f29d815bc0d52c GIT binary patch literal 445 zcmV;u0Yd(XP)Px$cS%G+R9J=WmAy~GKpci&jbbQgh>OHQnH-LUK#&ku(D*fUB96NDPhw`2E_N}7 z=u8j|#Dt4sZ!HTUmVy%w1VV+BqcpnQv-EO#ukUjm`U3<4f#9E6;|V2G@uAm(`rEr} z#|BS%B(l47v1zu!bIw&DnTiiHnIlLc0@h@x9^N2Kk7sgSRzap!1dUPHJqy+9D-y{B zJ`H0vf$W-bf4?yTmk@43S^NZD%3k|;mh*ZGD?9gGAQ~d z5T?hDTPuo!e!q`kFgSS@3I%7r<)gqfilU%%_5pkWgKq#^z+ii{KP|Bg>z+>e$WmWG z*LCdNAI$D|^uG}plTN26>sqbmxtvR&%PNz#rfHC68Rc@>kdDma@I1d1gdSl@r0yw7O n`Q?eHN%;8i#5HLJ0)gNMkz;`gEPu*_00000NkvXXu0mjf(%-y9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-pod.png b/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-pod.png new file mode 100644 index 0000000000000000000000000000000000000000..8599fcbde3348fc0a1d78821f674ffd7b4029751 GIT binary patch literal 419 zcmV;U0bKrxP)Px$T}ebiR9J=Wl|4(tP!xtAMLVPyT#6-wbaF_cv{VSLt%4teQ*kNif9MbCk0^Ap znOwv{=TeEZ2)%=QV@j4nnzas6A=oz8e&~{C2`9YwzVFF_9EgdDiTP)?R78bhZnCUF z_w{X|$Bv45I=%mEW7i#`a&BROLNPZn%_Fp=K=vh_!yERD;~%<_Y-7GRFtP^0*r(I6 z$rti`IL>MTrX9$>L>krimQEEb8?-j^m)~I<;Eu?*rJjjpum`27{H%VaXAAo)>y Date: Wed, 17 Jul 2024 15:10:48 +0600 Subject: [PATCH 2/2] remove --- .../Catalog/Fills/Lockers/heads.yml | 4 --- .../Entities/Objects/Devices/flatpack.yml | 25 ------------------ .../Devices/flatpack.rsi/cloning-console.png | Bin 445 -> 0 bytes .../Devices/flatpack.rsi/cloning-pod.png | Bin 419 -> 0 bytes .../Objects/Devices/flatpack.rsi/meta.json | 17 ------------ 5 files changed, 46 deletions(-) delete mode 100644 Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml delete mode 100644 Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-console.png delete mode 100644 Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-pod.png delete mode 100644 Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 992684a140c..ef861fd82be 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -200,8 +200,6 @@ - id: RubberStampCMO - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical - - id: CloningConsoleFlatpack # Sunrise-edit - - id: CloningPodFlatpack # Sunrise-edit - type: entity id: LockerChiefMedicalOfficerFilled @@ -222,8 +220,6 @@ - id: RubberStampCMO - id: MedicalTechFabCircuitboard - id: BoxEncryptionKeyMedical - - id: CloningConsoleFlatpack # Sunrise-edit - - id: CloningPodFlatpack # Sunrise-edit - type: entity id: LockerResearchDirectorFilledHardsuit diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml deleted file mode 100644 index dd5af9408e8..00000000000 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/flatpack.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: entity - parent: BaseFlatpack - id: CloningConsoleFlatpack - name: упаковка консоли клонирования - description: Упаковка, при помощи которой можно создать консоль клонирования. - components: - - type: Flatpack - entity: ComputerCloningConsole - - type: Sprite - sprite: _Sunrise/Entities/Objects/Devices/flatpack.rsi - layers: - - state: cloning-console - -- type: entity - parent: BaseFlatpack - id: CloningPodFlatpack - name: упаковка капсулы клонирования - description: Упаковка, при помощи которой можно создать капсулу клонирования. - components: - - type: Flatpack - entity: CloningPod - - type: Sprite - sprite: _Sunrise/Entities/Objects/Devices/flatpack.rsi - layers: - - state: cloning-pod diff --git a/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-console.png b/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-console.png deleted file mode 100644 index 683695bc5f3b9f620a84ca8cc1f29d815bc0d52c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 445 zcmV;u0Yd(XP)Px$cS%G+R9J=WmAy~GKpci&jbbQgh>OHQnH-LUK#&ku(D*fUB96NDPhw`2E_N}7 z=u8j|#Dt4sZ!HTUmVy%w1VV+BqcpnQv-EO#ukUjm`U3<4f#9E6;|V2G@uAm(`rEr} z#|BS%B(l47v1zu!bIw&DnTiiHnIlLc0@h@x9^N2Kk7sgSRzap!1dUPHJqy+9D-y{B zJ`H0vf$W-bf4?yTmk@43S^NZD%3k|;mh*ZGD?9gGAQ~d z5T?hDTPuo!e!q`kFgSS@3I%7r<)gqfilU%%_5pkWgKq#^z+ii{KP|Bg>z+>e$WmWG z*LCdNAI$D|^uG}plTN26>sqbmxtvR&%PNz#rfHC68Rc@>kdDma@I1d1gdSl@r0yw7O n`Q?eHN%;8i#5HLJ0)gNMkz;`gEPu*_00000NkvXXu0mjf(%-y9 diff --git a/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-pod.png b/Resources/Textures/_Sunrise/Entities/Objects/Devices/flatpack.rsi/cloning-pod.png deleted file mode 100644 index 8599fcbde3348fc0a1d78821f674ffd7b4029751..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrxP)Px$T}ebiR9J=Wl|4(tP!xtAMLVPyT#6-wbaF_cv{VSLt%4teQ*kNif9MbCk0^Ap znOwv{=TeEZ2)%=QV@j4nnzas6A=oz8e&~{C2`9YwzVFF_9EgdDiTP)?R78bhZnCUF z_w{X|$Bv45I=%mEW7i#`a&BROLNPZn%_Fp=K=vh_!yERD;~%<_Y-7GRFtP^0*r(I6 z$rti`IL>MTrX9$>L>krimQEEb8?-j^m)~I<;Eu?*rJjjpum`27{H%VaXAAo)>y