From 8c4f974b7a18b6aa0b545434bd9fa9e0ccd4288d Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Sat, 11 Nov 2023 23:57:37 +1000 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A3=D1=80=D0=B5=D0=B7=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D0=B0=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D1=89=D0=B8=D1=82=D0=B0=20=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=B2=D0=BE=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/Entities/Objects/Shields/shields.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index cfdcc58b0f9..9f71e5e80a5 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -204,13 +204,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 501 + damage: 251 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 500 #Very weak shield + damage: 250 #Very weak shield behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] From b038c2ed3cf0adaf862db13fed7a5d15aa9104fa Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Mon, 13 Nov 2023 20:18:56 +1000 Subject: [PATCH 2/4] novakid update --- Content.Shared/CCVar/CCVars.cs | 2 +- .../ADT/Novakid/Body/Organs/novakid.yml | 16 ++++++++++++++++ .../ADT/Novakid/Body/Prototypes/novakid.yml | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index a3e8741ec69..ce5a90ea20b 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1290,7 +1290,7 @@ public static readonly CVarDef /// Is the emergency shuttle allowed to be early launched. /// public static readonly CVarDef EmergencyEarlyLaunchAllowed = - CVarDef.Create("shuttle.emergency_early_launch_allowed", false, CVar.SERVERONLY); + CVarDef.Create("shuttle.emergency_early_launch_allowed", true, CVar.SERVERONLY); /// /// How long the emergency shuttle remains docked with the station, in seconds. diff --git a/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml index 39bad012e7d..b872a952dc6 100644 --- a/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Body/Organs/novakid.yml @@ -5,6 +5,9 @@ components: - type: Stomach maxVol: 50 + - type: Metabolizer + maxReagents: 5 + metabolizerTypes: [ Novakid ] - type: entity id: OrganNovakidLungs @@ -13,3 +16,16 @@ components: - type: Metabolizer metabolizerTypes: [ Novakid ] + +- type: entity + id: OrganNovakidHeart + parent: OrganAnimalHeart + suffix: "novakid" + components: + - type: Metabolizer + maxReagents: 2 + metabolizerTypes: [ Novakid ] + groups: + - id: Medicine + - id: Poison + - id: Narcotic diff --git a/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml b/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml index 84604ee4ec1..7013f312679 100644 --- a/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Body/Prototypes/novakid.yml @@ -13,7 +13,7 @@ torso: part: TorsoNovakid organs: - heart: OrganAnimalHeart + heart: OrganNovakidHeart lungs: OrganNovakidLungs stomach: OrganNovakidStomach liver: OrganAnimalLiver From a9ef7f9c2a2aee85f49c3f098c254660457e6134 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Mon, 13 Nov 2023 20:42:11 +1000 Subject: [PATCH 3/4] update --- .../Locale/ru-RU/ADT/Novakid/species.ftl | 16 ++ .../Customization/Markings/novakid.yml | 154 ++++++++++++++++-- .../ADT/Novakid/Species/novakid.yml | 2 +- .../ADT/Mobs/Novakid/custom.rsi/G_a.png | Bin 0 -> 210 bytes .../ADT/Mobs/Novakid/custom.rsi/K.png | Bin 0 -> 162 bytes .../ADT/Mobs/Novakid/custom.rsi/cone_a.png | Bin 0 -> 207 bytes .../ADT/Mobs/Novakid/custom.rsi/connect_a.png | Bin 0 -> 214 bytes .../ADT/Mobs/Novakid/custom.rsi/dot_a.png | Bin 0 -> 200 bytes .../ADT/Mobs/Novakid/custom.rsi/dotline_a.png | Bin 0 -> 229 bytes .../ADT/Mobs/Novakid/custom.rsi/eyes_a.png | Bin 0 -> 323 bytes .../ADT/Mobs/Novakid/custom.rsi/house.png | Bin 0 -> 171 bytes .../ADT/Mobs/Novakid/custom.rsi/lima-a.png | Bin 0 -> 200 bytes .../ADT/Mobs/Novakid/custom.rsi/linedot_a.png | Bin 0 -> 229 bytes .../ADT/Mobs/Novakid/custom.rsi/meta.json | 64 ++++++++ .../ADT/Mobs/Novakid/custom.rsi/omega_a.png | Bin 0 -> 217 bytes .../ADT/Mobs/Novakid/custom.rsi/plus.png | Bin 0 -> 166 bytes .../ADT/Mobs/Novakid/custom.rsi/rose.png | Bin 0 -> 182 bytes .../ADT/Mobs/Novakid/custom.rsi/shatter_a.png | Bin 0 -> 318 bytes .../ADT/Mobs/Novakid/custom.rsi/star_a.png | Bin 0 -> 226 bytes .../ADT/Mobs/Novakid/custom.rsi/two-a.png | Bin 0 -> 186 bytes 20 files changed, 225 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/cone_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dotline_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/house.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/lima-a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/linedot_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/omega_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/plus.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/rose.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png create mode 100644 Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png diff --git a/Resources/Locale/ru-RU/ADT/Novakid/species.ftl b/Resources/Locale/ru-RU/ADT/Novakid/species.ftl index ae43d64436c..0e5d1d1fcc9 100644 --- a/Resources/Locale/ru-RU/ADT/Novakid/species.ftl +++ b/Resources/Locale/ru-RU/ADT/Novakid/species.ftl @@ -40,5 +40,21 @@ marking-NovakidFace15 = перевёрнутое распятие marking-NovakidFace16 = X marking-NovakidFace17 = Y marking-NovakidFace18 = зета +marking-NovakidFace19 = конус +marking-NovakidFace20 = cвязь +marking-NovakidFace21 = окружность +marking-NovakidFace22 = косательная +marking-NovakidFace23 = очи +marking-NovakidFace24 = G +marking-NovakidFace25 = домик +marking-NovakidFace26 = К +marking-NovakidFace27 = лима +marking-NovakidFace28 = обратная косательная +marking-NovakidFace29 = омега +marking-NovakidFace30 = плюс +marking-NovakidFace31 = роза +marking-NovakidFace32 = раскол +marking-NovakidFace33 = звезда +marking-NovakidFace34 = продовольные очки marking-TorsoNovakidDefolt = белое ядро marking-HeadNovakidDefolt = белое ядро diff --git a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml index 8fff98b08a6..b0fca319d2f 100644 --- a/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Customization/Markings/novakid.yml @@ -388,13 +388,147 @@ sprites: - sprite: ADT/Mobs/Novakid/custom.rsi state: torso_novakid_defolt -# - type: marking -# id: NovakidOverlay -# bodyPart: [ Head, Chest ] -# markingCategory: Overlay -# speciesRestriction: [NovakidSpecies] -# forcedColoring: true -# color: ffffff -# sprites: -# - sprite: ADT/Mobs/Novakid/custom.rsi -# state: base_novakid_defolt + +- type: marking + id: NovakidFace19 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: cone_a + +- type: marking + id: NovakidFace20 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: connect_a + +- type: marking + id: NovakidFace21 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: dot_a + +- type: marking + id: NovakidFace22 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: dotline_a + +- type: marking + id: NovakidFace23 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: eyes_a + +- type: marking + id: NovakidFace24 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: G_a + +- type: marking + id: NovakidFace25 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: house + +- type: marking + id: NovakidFace26 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: K + +- type: marking + id: NovakidFace27 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: lima-a + +- type: marking + id: NovakidFace28 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: linedot_a + +- type: marking + id: NovakidFace29 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: omega_a + +- type: marking + id: NovakidFace30 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: plus + +- type: marking + id: NovakidFace31 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: rose + +- type: marking + id: NovakidFace32 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: shatter_a + +- type: marking + id: NovakidFace33 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: star_a + +- type: marking + id: NovakidFace34 + bodyPart: Head + markingCategory: HeadSide + speciesRestriction: [NovakidSpecies] + sprites: + - sprite: ADT/Mobs/Novakid/custom.rsi + state: two-a diff --git a/Resources/Prototypes/ADT/Novakid/Species/novakid.yml b/Resources/Prototypes/ADT/Novakid/Species/novakid.yml index 039f8312044..c63c68fe31b 100644 --- a/Resources/Prototypes/ADT/Novakid/Species/novakid.yml +++ b/Resources/Prototypes/ADT/Novakid/Species/novakid.yml @@ -1,7 +1,7 @@ - type: species id: NovakidSpecies name: species-name-novakid - roundStart: false # изменить потом + roundStart: true prototype: MobNovakid sprites: MobNovakidSprites defaultSkinTone: "#34a223" diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/G_a.png new file mode 100644 index 0000000000000000000000000000000000000000..0fd11dfbf0359916240b17edb097792ecb072511 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Gd*1#Ln;{G-nz|uK!Jn7;qqVe z_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/K.png new file mode 100644 index 0000000000000000000000000000000000000000..73aaba7c703fdd2fb98e1eeda0da0744d45cc014 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAP%y;P z#WAE}&f8lX1se=_m>pz)=Pz66z@qLn;{G-ZbPopuof6@bZ8C zv&CY63x|M(@Qc0uo6l5lnpYjAdF|w!e|x&O?!UE_vHMUn z10zU*fma_LEy6LUA}E396|+tJmnj6=s));LyY@s$>j-nIc< O$l&Sf=d#Wzp$P!QSU!RP literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/connect_a.png new file mode 100644 index 0000000000000000000000000000000000000000..fea84cbd10010a975bfff2ecc4be3c10611ac79c GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=b3I)gLn;{G-ZJDmpuof6@bZ8C zH219~CoZ^(9BHtf&Lg#WdSJ9Mhk$}ZLY#uqJ9F*FfB4u_<`n#V-C%bmMsfH2jn70@ z2`M-m9bQZJw-cZ4~k8etfap#5KxT^ngr> aZ)9)IQ&p|03Hk?gD1)b~pUXO@geCwFdO=|T literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/dot_a.png new file mode 100644 index 0000000000000000000000000000000000000000..9d4cee00e2b6b78bbda7500e18a0aef6dcd42996 GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC={hlt4Ar*{oZyNG3C~~kk{Qqw% zR~okM*_Hzx$;pWvZvt-3a&BN?WU6Ko{P;FhY=zXrXLn;{G-ZbQEP!M2o_~QTP zKckHox3iOLgNB5WnMl=}w_DmCC^|GSG#WNexnyd#^I(YH{PVn8U&C)K{Btq>_e_n` z$0gd|OP)1%Z(v|#V&M=_04m00G^#Q^J%4Gv_>7rXucRJz(l%NxVJu!{{Cdr{teT(C roO&lFx~9F(+oz0GGb59|=nlr1YMqwZZ#w1!-Ob?X>gTe~DWM4fg(gaa literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/eyes_a.png new file mode 100644 index 0000000000000000000000000000000000000000..16a01c2d04c9909c2ea896eee9748b134dce4431 GIT binary patch literal 323 zcmV-J0lfZ+P)_T#YM7zE@e;MO~C)Fr9fb{Q8D7m;YRJ{?WWz z$|BEB=~N|9GYHtFKATyyd-9*Irft%PE*fn<|BopSBD1HAndg9}(n4wb{~!TRS3j3^ HP626c>Hg+ z;g#r{($0T0(vy{$mdmbXLn;{G-ZbQDFyLVgunl=% z-yr8z$YD{UA*!_SysCoP$@)H9K7K|f7Bex6@Xg=vt+%)x75z@w*6W(N(@BQ-X?-68 z_kYop#zTaoG%4Ql1%Bx9{GTl~`ZnGUd0< zTW)!vP7pXC>aTWGIsL8jtTP=ahJ;kQT)*GoLjK8M3|M#HI-B4F7WpBe6z VD|Y4FWcvZ)d%F6$taD0e0syJ@K8*kX literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/shatter_a.png new file mode 100644 index 0000000000000000000000000000000000000000..96022e17ad4c96fed23037c6632f01c2712656eb GIT binary patch literal 318 zcmV-E0m1%>P)Zp|1|yyDV(EC;sZI9^Y_-cR2Ackcxd0S`~$r@z3y z@A?yTI)JhHv06dedJIlhH<};oq|EZ4MZoe378{s81Q+|p#uoq4znEr zRFwaGNlMN_2p|pJErgoc+u^&3Uww~i<7&qFGiqi8oRfXpJ#q+|Ln{DtdxZB0AW}4I zM1Z+H!g~Y|DVjARz}z0;Jpzan%^DG4ZjbOD0Yr*sjR-KeM|h6_B1N;t2Np0iu445i Q3;+NC07*qoM6N<$g8STiTL1t6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/star_a.png new file mode 100644 index 0000000000000000000000000000000000000000..a5201c7a81c01063d12cc071c9538bc6b9231d4c GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=D?MEtLn;{G-ZbPopdi5FFxmd+ zfA$|MmI$p;ktvdrkmla`=H3>~qlyj<42?4!vfp<4&ND7`UEOo~deq_jozLVA&6Q*V zH8#7%@4G+q<|YmS1)xGkCKjxW4ZaGW)nA@kQ{8&wlvDigHz($loz|H$(=>LM{X2~< k%A4Q6R>Ps&UbKSo&T^d=SNC<_fR1MHboFyt=akR{06=0&)&Kwi literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png b/Resources/Textures/ADT/Mobs/Novakid/custom.rsi/two-a.png new file mode 100644 index 0000000000000000000000000000000000000000..f6092ce9a98cb6248d8622eb1690e543dd4dcd29 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jh-%!Ar*{oZy9niC~&X_y!>bW zIl$GKU7$r~Uiaj$l@?M9IRq3O8XO`OjK9lP?fr9LLZhily95hZl!1{62P0wEfqv=6 nb@q4JeeUc1#HF~=tdZHMowwDXa_e58V;DSL{an^LB{Ts5PaQBs literal 0 HcmV?d00001 From 8fc231361541b7c522d4c793a229e1ff2187ba74 Mon Sep 17 00:00:00 2001 From: FrisKisDr Date: Mon, 13 Nov 2023 20:43:43 +1000 Subject: [PATCH 4/4] Change --- Resources/Changelog/ChangelogADT.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/ChangelogADT.yml b/Resources/Changelog/ChangelogADT.yml index 3745b6faf49..94be1d183c9 100644 --- a/Resources/Changelog/ChangelogADT.yml +++ b/Resources/Changelog/ChangelogADT.yml @@ -518,13 +518,12 @@ Entries: id: 55601 #костыль отображения в Обновлениях time: '2023-11-07T07:40:00.0000000+00:00' -#- author: Friskis -# changes: -# - {message: Новая мзуыка лобби, type: Add} -# - {message: Раса Новакидов, type: Add} -# id: 55602 #костыль отображения в Обновлениях -# time: '2023-11-14T07:40:00.0000000+00:00' -# ХихиХАха. До 14 числа +- author: Friskis + changes: + - {message: Новая мзуыка лобби, type: Add} + - {message: Раса Новакидов, type: Add} + id: 55602 #костыль отображения в Обновлениях + time: '2023-11-14T07:40:00.0000000+00:00' - author: Шрёдингер changes: @@ -563,3 +562,9 @@ Entries: - {message: Добавлена возможность постройки камина., type: Add} id: 55606 #костыль отображения в Обновлениях time: '2023-11-13T04:20:00.0000000+00:00' + +- author: Friskis + changes: + - {message: Разблокировка Новакидов, type: Fix} + id: 55607 #костыль отображения в Обновлениях + time: '2023-11-14T07:40:00.0000000+00:00'