From 683b31a6ad70db3b658492588886f75e32d500ac Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 4 Jan 2025 21:58:06 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=BA=D1=80=D1=83=D1=82?= =?UTF-8?q?=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implants/Mindslave/Components/UnslavableComponent.cs | 7 +++++++ .../_White/Implants/Mindslave/SharedMindslaveSystem.cs | 1 + .../Prototypes/_White/Entities/Objects/Misc/implanters.yml | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs diff --git a/Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs b/Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs new file mode 100644 index 0000000000..27e9f21560 --- /dev/null +++ b/Content.Shared/_White/Implants/Mindslave/Components/UnslavableComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Shared._White.Implants.Mindslave.Components; + +[RegisterComponent] +public sealed partial class UnslavableComponent : Component +{ + +} diff --git a/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs b/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs index fe1e266cf3..c22d7e07dc 100644 --- a/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs +++ b/Content.Shared/_White/Implants/Mindslave/SharedMindslaveSystem.cs @@ -43,6 +43,7 @@ public abstract class SharedMindslaveSystem : EntitySystem if (HasComp(args.Target) || HasComp(args.Target) || HasComp(args.Target) || + HasComp(args.Target) || HasComp(args.Target)) { message = Loc.GetString("mindslave-cant-insert"); diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml index 12870ddf55..5fac07eb5a 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml @@ -33,6 +33,7 @@ suffix: mindslave components: - type: Implanter + implantTime: 3 implant: MindslaveImplant - type: entity @@ -50,6 +51,7 @@ components: - type: Implanter implant: VoiceActivatedBombImplant + implantTime: 3 - type: TriggerOnVoice - type: Tag tags: From 250ac514bf041f3ea69534bdbb5640a4dffdffb9 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 4 Jan 2025 22:08:12 +0300 Subject: [PATCH 2/5] =?UTF-8?q?=D0=AD=D0=BA=D1=81=D0=BF=D0=B5=D1=80=D0=B8?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 5388fefdc4..aac72af410 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -17,6 +17,7 @@ species: - Human - Felinid + - Moth weight: 10 icon: "JobIconChiefMedicalOfficer" arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification @@ -25,6 +26,7 @@ whitelistedSpecies: - Human - Felinid + - Moth canBeAntag: true access: - Medical From 903bb21db241eed395cd710f54f7fb0b21be9330 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 4 Jan 2025 22:37:43 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=A1=D0=B0=D0=BD=D0=B4=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Shoes/Misc/tourist.rsi/equipped-FEET.png | Bin 601 -> 1655 bytes ...e no idea why original is the way it is.txt | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/i have no idea why original is the way it is.txt diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png index 7f2f880a73696c0e2f31e0d54b3107103adbba70..b168459ba204e5a8cd98ebb4de3b3f6b27f0383d 100644 GIT binary patch literal 1655 zcmbVNTWl0n7@lq9Vw*mIgfxwsVR#TDvvX$lItNyI*+Mrur7W9Jghozh&hC!gnKR5x z+1+ZB+80ryF|qN|6hcDqny3%$gBVnN@X6FFq9KM7)4+oUXbc!DQa!Vm2^a)rl9@Sk z&i8-+{h#N1d$u(h)12x~rs=!QyH_r!&-e8GbM$qu)xFzcn5O%@JHSj#wlK^+ zm-I}Z+owDZRbm8@Mh0-OWLOlug>>z03mjX4xPu9<-BZZ+DZOkb zu`w$LMP3C!WMgy{j!JP^-pEQo3JD-8ND*EF5Qs1mVQUvh)!AAWrjuK1%IH^u%e$@x z1)*3h28*E}v2%hb%d!9@L6Ufi;GMGRq7rX9>+1|j?5MVGxjHdfj}Z-!AveKMQ>#80 zmQQOswK&m;2_<9+Vi0&fRe+l6jS`&WJJ$#~_G40zwdgDpVnwo-O;(2oFRa zgfo%^Lm?Q6-2|mIqahdF5v-{&OKbyChjjzxuwa=vj`hO`J4u1qR57(KRIx%)V9In{ zWU4roOmNiapss5$o{eQgC=};WOpWnjEga=hI2z*-h-zUC#Nz~uEHFWb&JTx?Kv8)JC>6`jTgK=tokAR)5Xf!4Lw_j(?Q@Z{Sibz{2_)-I=O5* zq86GK)-p^$NG01drOAsE-!zYbmgRfq8{Bo-ec#S}-tiYRvN$50Onx+d`qV;y$H3^+ z>qmb&x%zBk^35i`?I<(Fywot;5N>R1n%%(s_l@u7-bnv?amUlfn(6ts#-Hi`;g4s} zUOz7?uU3H<#`~x4JU;5?XLksV|z4X+}lg{4PjtyS={p)ip?&q(T55NEA>|?L2 zJ+gy&VsvXDA81{6WLbXA=xsJ8POW%nu4S?7x20?3OzWoWjlER#!j-`BC&zy5-xGTA z#QfEnGgpkZmZ^rXHcssR^ZV%H$fv93PfRx)9$B}#W96~&RXxv*rysmlyEA98x%aua|cd&s~jGyQhk`uhVxw@O&uww}^Vg|6kIcWy@*Ix(s?8Z; zYj2&c8+ScBV{KxOqrUILDNg#nAAdh&ER<396e?NF@x8o!U42=Z0q4=v`PbPSK0IML zCLxjh@9Oqz*Cqvc9ypuQH2dU}!$0SXi~sM{T)HYJcBTQ3clMO4>zuuRG55)k>}yci zG@N(dUH-|x+jVg*W2%j=*t#|G3-s>A9|-@(@@6rR&F5avq7~o&{?k=kM){97W$rO? z)ylj z__*Yi-tlCSvqDkXPb%N-oqzr7kG$<32h%nm%rVRUqAkJKzV2?`^m9K;mi=M1Ox`0a U^K`Q@Fv&1@y85}Sb4q9e0BlqS5dZ)H diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/i have no idea why original is the way it is.txt b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/i have no idea why original is the way it is.txt new file mode 100644 index 0000000000..e69de29bb2 From cc4012cf8dbb5e360840734f6fefacda48880cbd Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 4 Jan 2025 22:41:47 +0300 Subject: [PATCH 4/5] =?UTF-8?q?4=20=D0=BF=D0=B8=D0=BA=D1=81=D0=B5=D0=BB?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Shoes/Misc/tourist.rsi/equipped-FEET.png | Bin 1655 -> 1860 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Misc/tourist.rsi/equipped-FEET.png index b168459ba204e5a8cd98ebb4de3b3f6b27f0383d..eb2225b3fa34571246de433bafb6331736b48aca 100644 GIT binary patch delta 459 zcmey)bA)e#1rzJ;jaCzwSWFD9j3=LC(u6R6GX<&`C8t@M8Jnl*niv=u=^7@QB4sbuCU%Z>Di}e#7c7+8yq{r)(r^A8bq-4gAnVXtEV delta 327 zcmX@Y_nl{g1ry7=jaCzwSd5LWOeddX(u6R6GX+leV^P~&#GJ@Dc>!yr?Fa4;Vhjw7 z`kpS1Ar*7p&br9kWFWy7{g|mlF)iWJxdTrB8ESvl8Xa`mu=VQY53x>34O^x!et1ym zuI-$e+>@Qz^d={;@z!6tHzVlN+ra8vk*$xHO{s~!{;Tos-=~JYli$y^-evYGLw5bs zf3G{#KdfB-FRO1(am=)(+3$Xwzt1kC`?Yf3>SGtYCx|TwWQb~TW6WTbVqL(RA<}?H zVAf^!755~5x_vxC0Ld+osAn Date: Sat, 4 Jan 2025 22:56:17 +0300 Subject: [PATCH 5/5] =?UTF-8?q?=D0=B1=D0=BE=D0=BC=D0=B6=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml index 58eec8735f..d6e56902a4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bomzh.yml @@ -37,6 +37,6 @@ - type: startingGear id: BomzhGear equipment: - jumpsuit: ClothingUniformJumpsuitCaptain + jumpsuit: ClothingUniformJumpsuitWhiteBomzh outerClothing: ClothingOuterOverCoatBomzh id: BomzhPDA