From 595f8867cc29c5cf248d9da06c03de22ed80eae4 Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Tue, 16 Jul 2024 11:24:50 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D1=83=20=D0=9E=D0=A1=D0=A9=20=D0=BC=D0=B0?= =?UTF-8?q?=D0=B9=D0=BD=D0=B4=D1=89=D0=B8=D0=BB=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: JDtrimble --- .../_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml | 3 +++ .../_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml index 59e30f60df6..b81567a4000 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml @@ -19,6 +19,9 @@ - CentralCommand speciesBlacklist: - Vox + special: + - !type:AddImplantSpecial + implants: [MindShieldImplant] - type: startingGear id: CentCommOfficialGear diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml index 5785611ed49..2867393bb6e 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml @@ -19,6 +19,9 @@ - CentralCommand speciesBlacklist: - Vox + special: + - !type:AddImplantSpecial + implants: [MindShieldImplant] - type: startingGear id: CentCommOperatorGear From e98330b3d6f1df27bf9baaf8444f22a7c02ee1b3 Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Tue, 16 Jul 2024 11:25:50 +0300 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=D1=83=20=D0=9E=D0=A1=D0=A9=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=B9=D0=BD=D0=B4=D1=89=D0=B8=D0=BB=D0=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 595f8867cc29c5cf248d9da06c03de22ed80eae4. --- .../_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml | 3 --- .../_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml | 3 --- 2 files changed, 6 deletions(-) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml index b81567a4000..59e30f60df6 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_official.yml @@ -19,9 +19,6 @@ - CentralCommand speciesBlacklist: - Vox - special: - - !type:AddImplantSpecial - implants: [MindShieldImplant] - type: startingGear id: CentCommOfficialGear diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml index 2867393bb6e..5785611ed49 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/CentralCommand/centcom_operator.yml @@ -19,9 +19,6 @@ - CentralCommand speciesBlacklist: - Vox - special: - - !type:AddImplantSpecial - implants: [MindShieldImplant] - type: startingGear id: CentCommOperatorGear From 1a34f620a98d2fb4830bb60e729a980eb4d2246e Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Thu, 18 Jul 2024 13:15:34 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20?= =?UTF-8?q?=D0=BB=D0=B3=D0=B1=D1=82=20=D0=BF=D0=BE=D0=B2=D0=B5=D1=81=D1=82?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=BE=D1=84=D1=84=D0=BE=D0=B2=20=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=BA=D0=B8=20=D0=BA=D0=BE=D1=80=D0=BF=20(+=D0=BB?= =?UTF-8?q?=D0=BE=D1=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: JDtrimble --- .../Prototypes/Loadouts/loadout_groups.yml | 28 ++++--- .../Loadouts/Miscellaneous/trinkets.yml | 80 +++++++++++++++++++ 2 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 0d6e524fa4e..7252f087ba2 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -15,16 +15,24 @@ - CigPackBlack - CigarCase - CigarGold - - ClothingNeckLGBTPin - - ClothingNeckAromanticPin - - ClothingNeckAsexualPin - - ClothingNeckBisexualPin - - ClothingNeckIntersexPin - - ClothingNeckLesbianPin - - ClothingNeckNonBinaryPin - - ClothingNeckPansexualPin - - ClothingNeckTransPin - - ClothingNeckAutismPin +# - ClothingNeckLGBTPin +# - ClothingNeckAromanticPin +# - ClothingNeckAsexualPin +# - ClothingNeckBisexualPin +# - ClothingNeckIntersexPin +# - ClothingNeckLesbianPin +# - ClothingNeckNonBinaryPin +# - ClothingNeckPansexualPin +# - ClothingNeckTransPin +# - ClothingNeckAutismPin + - ClothingNeckNanoTrasenPin # Sunrise + - ClothingNeckNakamuraPin # Sunrise + - ClothingNeckLogistikaPin # Sunrise + - ClothingNeckDeForestPin # Sunrise + - ClothingNeckDonkPin # Sunrise + - ClothingNeckVitezstviPin # Sunrise + - ClothingNeckEarthPin # Sunrise + - ClothingNeckUSSPPin # Sunrise - ClothingNeckGoldAutismPin - type: loadoutGroup diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml new file mode 100644 index 00000000000..ed138cab1ce --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Miscellaneous/trinkets.yml @@ -0,0 +1,80 @@ +# Pins +- type: loadout + id: ClothingNeckNanoTrasenPin + equipment: ClothingNeckNanoTrasenPin + +- type: startingGear + id: ClothingNeckNanoTrasenPin + storage: + back: + - ClothingNeckNanoTrasenPin + +- type: loadout + id: ClothingNeckNakamuraPin + equipment: ClothingNeckNakamuraPin + +- type: startingGear + id: ClothingNeckNakamuraPin + storage: + back: + - ClothingNeckNakamuraPin + +- type: loadout + id: ClothingNeckLogistikaPin + equipment: ClothingNeckLogistikaPin + +- type: startingGear + id: ClothingNeckLogistikaPin + storage: + back: + - ClothingNeckLogistikaPin + +- type: loadout + id: ClothingNeckDeForestPin + equipment: ClothingNeckDeForestPin + +- type: startingGear + id: ClothingNeckDeForestPin + storage: + back: + - ClothingNeckDeForestPin + +- type: loadout + id: ClothingNeckDonkPin + equipment: ClothingNeckDonkPin + +- type: startingGear + id: ClothingNeckDonkPin + storage: + back: + - ClothingNeckDonkPin + +- type: loadout + id: ClothingNeckVitezstviPin + equipment: ClothingNeckVitezstviPin + +- type: startingGear + id: ClothingNeckVitezstviPin + storage: + back: + - ClothingNeckVitezstviPin + +- type: loadout + id: ClothingNeckEarthPin + equipment: ClothingNeckEarthPin + +- type: startingGear + id: ClothingNeckEarthPin + storage: + back: + - ClothingNeckEarthPin + +- type: loadout + id: ClothingNeckUSSPPin + equipment: ClothingNeckUSSPPin + +- type: startingGear + id: ClothingNeckUSSPPin + storage: + back: + - ClothingNeckUSSPPin From 2b4468843095ffd00afc9ee65721419c24e833a5 Mon Sep 17 00:00:00 2001 From: JDtrimble Date: Thu, 18 Jul 2024 16:07:25 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20?= =?UTF-8?q?=D0=BB=D0=B3=D0=B1=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: JDtrimble --- .../Prototypes/Loadouts/loadout_groups.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 7252f087ba2..bdbdce8fa52 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -15,16 +15,6 @@ - CigPackBlack - CigarCase - CigarGold -# - ClothingNeckLGBTPin -# - ClothingNeckAromanticPin -# - ClothingNeckAsexualPin -# - ClothingNeckBisexualPin -# - ClothingNeckIntersexPin -# - ClothingNeckLesbianPin -# - ClothingNeckNonBinaryPin -# - ClothingNeckPansexualPin -# - ClothingNeckTransPin -# - ClothingNeckAutismPin - ClothingNeckNanoTrasenPin # Sunrise - ClothingNeckNakamuraPin # Sunrise - ClothingNeckLogistikaPin # Sunrise @@ -33,6 +23,16 @@ - ClothingNeckVitezstviPin # Sunrise - ClothingNeckEarthPin # Sunrise - ClothingNeckUSSPPin # Sunrise + - ClothingNeckLGBTPin + - ClothingNeckAromanticPin + - ClothingNeckAsexualPin + - ClothingNeckBisexualPin + - ClothingNeckIntersexPin + - ClothingNeckLesbianPin + - ClothingNeckNonBinaryPin + - ClothingNeckPansexualPin + - ClothingNeckTransPin + - ClothingNeckAutismPin - ClothingNeckGoldAutismPin - type: loadoutGroup