From 8fe336c22d4760ba9ee3cdaa8eae36f6c0b9b7ce Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Tue, 21 Jan 2025 22:58:09 +1000 Subject: [PATCH 1/7] =?UTF-8?q?=D0=BD=D0=B5=D1=80=D1=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Objects/Specific/Mech/mech_gun.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Mech/mech_gun.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Mech/mech_gun.yml index 2ce0d2e2356..c1fe4aaa7ae 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Mech/mech_gun.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Mech/mech_gun.yml @@ -345,8 +345,8 @@ path: /Audio/Weapons/Guns/Empty/empty.ogg - type: BallisticMechAmmoProvider proto: ADT40mmGrenadeHEAT - shots: 9 - capacity: 9 + shots: 4 + capacity: 4 ammoType: granade reloadTime: 5 - type: UIFragment From 2d20e8738f929cbbd8e40958b744bf55d6094e73 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Wed, 22 Jan 2025 19:35:55 +1000 Subject: [PATCH 2/7] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=D1=82=20=D0=9F=D0=B5=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Preferences/HumanoidCharacterProfile.cs | 3 +++ .../Prototypes/ADT/Recipes/Lathes/armory.yml | 8 ++++---- .../ADT/Recipes/Lathes/mech_parts.yml | 7 ++++--- .../mecha_equipment.rsi/mecha_missilerack.png | Bin 785 -> 723 bytes 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 3fbad0dc2ea..9e21fddc730 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -79,6 +79,9 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile [DataField] public ProtoId Species { get; set; } = SharedHumanoidAppearanceSystem.DefaultSpecies; + [DataField] + public string Species { get; set; } = SharedHumanoidAppearanceSystem.DefaultSpecies; + [DataField] public string Voice { get; set; } = SharedHumanoidAppearanceSystem.DefaultVoice; diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml b/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml index 36d921d1dae..11e9b4ea131 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/armory.yml @@ -78,11 +78,11 @@ - type: latheRecipe id: ADT40mmGrenadeHEATRecipe result: ADT40mmGrenadeHEAT - completetime: 5 + completetime: 15 materials: - Steel: 300 - Plastic: 100 - Plasma: 100 + Steel: 1000 + Plastic: 1000 + Plasma: 500 - type: latheRecipe id: ADT40mmGrenadeBatonRecipe diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml index 917aedce255..3a1125c1b10 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml @@ -658,9 +658,10 @@ category: Mech completetime: 4 materials: - Steel: 9000 - Plastic: 3000 - Gold: 1000 + Steel: 15000 + Plastic: 10000 + Gold: 6000 + Plasma: 5000 - type: latheRecipe id: ADTBoxAmmoAC2Ultra diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_missilerack.png b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_missilerack.png index d01da19be343a4b5823eb5247183204abfdbded9..a7c1ef260c5fc047df57aebfe038fddc4bf5dced 100644 GIT binary patch delta 699 zcmV;s0!00h2Ga$QB!2;OQb$4nuFf3k0007wNklJ;*?aUQF?&r-HrpD1;3EfP8QS68FKP9@<9RO_8y3 zp++{4rKbly$NS@4-NL81pO<^@=X}oh^Eu!9y&K@bfddEs8-E6d#%MG8^Jg8v|EtuL z{>%fc?jDv51Y-?#;+)-rEJ;nZvJq%oTNXcI09lggvs6l0WKq*FD$D;A;OX+RC4}LD zow^b8a=p%Zbz=hnFxcH~%lQZqhOo?l*}Pn@8_XEzBLwMO89qWVD$95rk8=|{;!2eYKRGiiRVrMknra9G-0=H_q8_hT$QKF)9uzo! zMLt3dCuX`+1AJItw-uT(+aG|csu(=#5;JGUjMM7?;GpA*p^jk)1Hl-b?GIp4(}boW zj|Tt{X>GNv^?1GfHLx&x4gfyaYM3u>V(rT+_q7Cwxql8&i{2In$gM0P93RHb?;imG z^Tkcv>+KY3^17hb+!Q%MWOAXBm#+Xw1<+|&S!C1?zL<%oUSX%Z?7d1yc40T z*ZEbiGj|5i4WXhaG>{m_-CHrF(+j8+Ug7tj2s$73qUYs0-tCKj$u4=1KdT>=ucz|* z0W^b-Oia;%p)oo#F-2ubq7;-y_Gak9{RfTyGc;OiG`Q~&spLi47jB__;T8%2k-ZsS hpwSTK8V($shQG|}HdopNOy~dr002ovPDHLkV1f`rO(FmQ delta 761 zcmV-&$k?4VQU8&`-jK*#ODRgN+<%@OeVf5f{l22EgeM>%VukUm;ku& zzSGIfKOKvK%Vuke?QS5z%OPq2>NWpbDpmF1>M9v0`}!2MUcDYLuN*=Gz%r*sm_V%I z{Pu?gc#iZFsDD9=1)`~xqIP4XSCT`q0&;WKB5MBV-c9iP{ooQbYNVy90vxkinIQB{ zso7R{B?~=*78w|_*JQxJ0P>pF}zj2+G2Ey-8=Kw%9%LZsPE_Za0QM})38Y}(@ zfHqt+8WR9}U@4!6e6dL86Go$|dCQv+Kcg-zm#Ab)4S$Hy@+M>jHOI<`quC~`3jn`( ztgxHS1msYqLX9?|{3VzGXr3QC%LI5aKLaBtP6MPD%k#(@TpBu1P9BYFYHxeS03tK$ z0CMw8ECL3T8T5udRSgp@3ox{~@_UDguBEX;wFl7r{G1;q9S6Z{sO{mFH=(&x58qd2 z$+gjbihqo`$FIQq@jZbN2W~}BXf6<{QTnk(Dx{^U0yrEF9!>Xm^+0YtO+dOU5aOVT zNmP>J+gHjpK0`8 r1ZICq7N9x3uEU&}qalEH#5TZRv{1ZJ`g*-o00000NkvXXu0mjfCct9X From cd620566b1d97cae0e3db4a3fc02ad17e78e1185 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Wed, 22 Jan 2025 19:41:28 +1000 Subject: [PATCH 3/7] fix --- Content.Shared/Preferences/HumanoidCharacterProfile.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs index 9e21fddc730..3fbad0dc2ea 100644 --- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs +++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs @@ -79,9 +79,6 @@ public sealed partial class HumanoidCharacterProfile : ICharacterProfile [DataField] public ProtoId Species { get; set; } = SharedHumanoidAppearanceSystem.DefaultSpecies; - [DataField] - public string Species { get; set; } = SharedHumanoidAppearanceSystem.DefaultSpecies; - [DataField] public string Voice { get; set; } = SharedHumanoidAppearanceSystem.DefaultVoice; From 0a74ac03993633646906801e85955c071fddfa62 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Wed, 22 Jan 2025 19:57:14 +1000 Subject: [PATCH 4/7] =?UTF-8?q?c=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B9=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mecha_equipment.rsi/mecha_missilerack.png | Bin 723 -> 649 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_missilerack.png b/Resources/Textures/Objects/Specific/Mech/mecha_equipment.rsi/mecha_missilerack.png index a7c1ef260c5fc047df57aebfe038fddc4bf5dced..84ea4e1d1919ae84121248046c1684fbc22d6ebd 100644 GIT binary patch delta 611 zcmV-p0-XKR1&IZaF@HlzL_t(oh3!>OOWR-^em3?VEMv}CmzE-Raf7ykWvEyXq&>JH z>?E?wHt@1fFb~4m#W}oq^3ZP}3>p0ZdQb+k<)E8m)0Sn?B4uiwS}Xwx+q*-P*t{lb zQap`3m*n~Vd7tO~#|!xI;p2Zm|L{0%w)gr~7>J(zY`XVK41cUwYr}Ni@AJG8*W45d z9M|*`%g4u#8VwBy97o?|GM2fVEMrU%9Q$9dtT>vmP3W_BBVJNfBQEakVX(6k01zRh zp$W$`z>1et)g-3JB7`8jT|$Hqj0u9l*;>yAtc3Jg>4*@5S6_EAJ3Wb<7Sp-N)Os@T zAR4udcZb84@qa?0U>L3EO&j=JEV>#10N(a?K@>#{YO7Sw0pM@@UEAIpb_u;HC(Gu9 z#$%xnwiE@4KmY*nO#AB4`Ie$MnzuEeiz~@TmbrzsWyFU@fP>8%mk#mt-kpoQ#y9vR zAT8T!I37Y)yevylPphWb2A{-&bcosMN#p~8OS}j+7?TrHOQlKbbyom zDmpY1^-xc%Ah&PU2rH&>cFSBD0D#sYk0%fNkj*aQtg?yyH5I=HcF_H)i0wbM>m_~v zXzB@uFI=wM(XSojfA`0_t4FUMbaY~h_79KK(TOQ4a2%zeG;uyd7oWdiU&c$dUd1et xN#CM9@fO+>Z=nE?IG-^FW=*iQK79D_f`2lx@~|oK#G3#B002ovPDHLkV1h+eDGdMs delta 686 zcmV;f0#W^m1=9tPF@KFoL_t(oh3!?}OH)xC{}i1EWyZXgZVcJFI@o5pYJwLwWP7j> zdJ@Tp2z=>1$Uul*O!1|sg1z-9gbe?Hd~gI3_ranb+D6+=k+E{2MmCV8rw2X9`{P{Q z!l$^OmwWH$e9rgtIp6!e8{oi!0|);b28PCHGy3yq9l-yq)PI!z%mb|M9+nIQV-0oU zoZW&fNlmq~5olXm7C&JCS(50pR7zN6QPVIg%l{PM>GHBAgyDgmx)Jkoz0P@cV*>y% z*xhZ*`3Mn)u*`tjyj-sv%oyh*1nFEEK0+`m%Xl1*a}zU{&Xp}SYy*glSYZYqA$am> z4Rh0zSUloNm46C9IWsF&DqN?UY6t_|@cV_L9IAAqW=7(D6{GiSz()9V1>pyP_6j$sG`!5E$G4`5N#gr*^n2LKRhZMCfRc)k2J zurPWK06y1hm@jT(?aM0nwFHQ{4p58U76! zkQm3^TQQ{53#b%c;rE{iIv@6;=jA%y?TdfOE_shXs~?rGr}Fv%G=q*zOwoa%F*-6a zMP*5%6qH8xX6VBG2aWzST52@7?+~fvMcNl`p(lOe77757y%}Dh(Gcbu4ji0@zs%}3 USK0(j=l}o!07*qoM6N<$g1Ku+M*si- From 94f8a5bf5315336513d2707361701c79cab8d34d Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Wed, 22 Jan 2025 20:30:58 +1000 Subject: [PATCH 5/7] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=87=D0=B5?= =?UTF-8?q?=D0=BB=D1=8E=D1=81=D1=82=D0=B5=D0=B9=20=D0=BF=D0=B0=D1=80=D0=B0?= =?UTF-8?q?=D0=BC=D0=B5=D0=B4=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Clothing/Back/backpacks.yml | 10 +++++++++- .../Prototypes/ADT/Entities/Clothing/Back/duffel.yml | 11 +++++++++++ .../Prototypes/ADT/Entities/Clothing/Back/satchel.yml | 11 +++++++++++ .../ADT/Loadouts/Jobs/Medical/paramedic.yml | 6 +++--- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index 7f5d841f500..233de231fb0 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -70,6 +70,14 @@ components: - type: Sprite sprite: ADT/Clothing/Back/paramedic_backpack.rsi + +- type: entity + parent: ClothingBackpackMedical + id: ADTClothingBackpackParamedicFilled + name: paramedical backpack + suffix: Paramedic,Filled + description: Backpack to store some paramedical equipment. + components: - type: StorageFill contents: - - id: JawsOfLife \ No newline at end of file + - id: JawsOfLife diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml index 25079531bf9..abd6e6970c3 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml @@ -46,3 +46,14 @@ components: - type: Sprite sprite: ADT/Clothing/Back/paramedic_duffel.rsi + +- type: entity + parent: ClothingBackpackDuffelMedical + id: ADTClothingBackpackDuffelParamedicFilled + name: parsmedical duffel bag + suffix: Paramedic,Filled + description: A large duffel bag to hold paramedical equipment + components: + - type: StorageFill + contents: + - id: JawsOfLife diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml index ff5b0b73522..cd7652c60de 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml @@ -35,3 +35,14 @@ components: - type: Sprite sprite: ADT/Clothing/Back/paramedic_satchel.rsi + +- type: entity + parent: ClothingBackpackSatchelMedical + id: ADTClothingBackpackSatchelParamedicFilled + name: paramedical satchel + suffix: Paramedic,Filled + description: A satchel to store some paramedical equipment. + components: + - type: StorageFill + contents: + - id: JawsOfLife diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml index 04758e6d02b..9c757633aca 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Medical/paramedic.yml @@ -6,17 +6,17 @@ - type: loadout id: ADTParamedicBackpack equipment: - back: ADTClothingBackpackParamedic + back: ADTClothingBackpackParamedicFilled - type: loadout id: ADTParamedicSatchel equipment: - back: ADTClothingBackpackSatchelParamedic + back: ADTClothingBackpackSatchelParamedicFilled - type: loadout id: ADTParamedicDuffel equipment: - back: ADTClothingBackpackDuffelParamedic + back: ADTClothingBackpackDuffelParamedicFilled - type: loadout id: ADTParamedicBeltEMT From c499fb6520700cfb79347e5096226e41aa88d98f Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Wed, 22 Jan 2025 20:40:45 +1000 Subject: [PATCH 6/7] =?UTF-8?q?=D0=A0=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Recipes/Lathes/mech_parts.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml b/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml index 3a1125c1b10..e2f829e88e9 100644 --- a/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml +++ b/Resources/Prototypes/ADT/Recipes/Lathes/mech_parts.yml @@ -658,10 +658,10 @@ category: Mech completetime: 4 materials: - Steel: 15000 - Plastic: 10000 - Gold: 6000 - Plasma: 5000 + Steel: 27000 + Plastic: 9000 + Gold: 3000 + Plasma: 2000 - type: latheRecipe id: ADTBoxAmmoAC2Ultra @@ -706,10 +706,10 @@ category: Mech completetime: 1 materials: - Steel: 550 - Plastic: 150 - Plasma: 100 - Glass: 100 + Steel: 1100 + Plastic: 450 + Plasma: 300 + Glass: 300 - type: latheRecipe id: ADTBoxPlasmaBox From 700f8d1dae7f2aa69b4305eaa1e33ef416d5d9e3 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Wed, 22 Jan 2025 20:50:54 +1000 Subject: [PATCH 7/7] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml | 2 +- Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml | 2 +- Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index 233de231fb0..12d885458b9 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -72,7 +72,7 @@ sprite: ADT/Clothing/Back/paramedic_backpack.rsi - type: entity - parent: ClothingBackpackMedical + parent: ADTClothingBackpackParamedic id: ADTClothingBackpackParamedicFilled name: paramedical backpack suffix: Paramedic,Filled diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml index abd6e6970c3..0e59144cc65 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/duffel.yml @@ -48,7 +48,7 @@ sprite: ADT/Clothing/Back/paramedic_duffel.rsi - type: entity - parent: ClothingBackpackDuffelMedical + parent: ADTClothingBackpackDuffelParamedic id: ADTClothingBackpackDuffelParamedicFilled name: parsmedical duffel bag suffix: Paramedic,Filled diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml index cd7652c60de..7949d5b6afb 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/satchel.yml @@ -37,7 +37,7 @@ sprite: ADT/Clothing/Back/paramedic_satchel.rsi - type: entity - parent: ClothingBackpackSatchelMedical + parent: ADTClothingBackpackSatchelParamedic id: ADTClothingBackpackSatchelParamedicFilled name: paramedical satchel suffix: Paramedic,Filled