From 9007220ec9e2ab4855e6ae0a45b809ba1d24411f Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Mon, 8 Jan 2024 14:55:19 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9C=D0=B8=D0=BD=D0=B8=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl | 2 ++ .../Prototypes/ADT/Entities/Objects/Fun/toys.yml | 10 ++++++++++ .../Textures/ADT/Objects/Fun/toys.rsi/meta.json | 3 +++ .../ADT/Objects/Fun/toys.rsi/plushie_afi.png | Bin 0 -> 896 bytes 4 files changed, 15 insertions(+) create mode 100644 Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_afi.png diff --git a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl index 5472e3ae0b7..ae754663208 100644 --- a/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl +++ b/Resources/Locale/ru-RU/ADT/Fun/ADTtoys.ftl @@ -24,3 +24,5 @@ ent-ADTPlushieTeo = плюшевый Тео ent-ADTPlushieDekus = плюшевый Декус-Га .desc = Это милый, ярко красный унатх в форме Квартирмейстера. Так и хочется его погладить. +ent-ADTPlushieAfi = плюшевая Афи + .desc = Розовенький и слегка прозрачный милый слаймолюд. Почему-бы не обнять её? diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml index 0e068424986..877d0142f5a 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml @@ -514,3 +514,13 @@ - type: Sprite sprite: ADT/Objects/Fun/toys.rsi state: plushie_dekus + +- type: entity + parent: BasePlushie + id: ADTPlushieAfi + name: Djessie plushie + description: It looks like a soft and cute blondie. + components: + - type: Sprite + sprite: ADT/Objects/Fun/toys.rsi + state: plushie_afi diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json index 3e620df017c..8fc57936c2f 100644 --- a/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json @@ -135,6 +135,9 @@ }, { "name": "plushie_dekus" + }, + { + "name": "plushie_afi" } ] } diff --git a/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_afi.png b/Resources/Textures/ADT/Objects/Fun/toys.rsi/plushie_afi.png new file mode 100644 index 0000000000000000000000000000000000000000..68829d45b52cf2f6caa34d8db44a8588001a5d15 GIT binary patch literal 896 zcmV-`1AqL9P)Px&AW1|)R9HvVR?kaRQ4~H`gK}KiI66W$lp+3T4BFJfRZ^{r+V}^wNJ2yck#?hd zAtYS5Y0)m-NVO@Dwzdh<)FFs?899t2wP30qJhud-q+=_nq&Y z@4P4Ih?h8GeENR~?Dwt8hK&J5cx>#oWaVwveV3BDx#^@8AE`x2n`SG1NM(WUkf)s3DpU zSvQO%DcRaeOND|a0iec>fxvwLg9KEwIU!VmO81M57)dHWBOrt23I*Dq&uJ}~9QI4Y zYq}3G11brG&w|Jj@GwE3imVB159}@PXaYFjw2-!9I1ykeZ3F;px`2D2CL6+jdp}A# zqcg=Dl)dyq0hvnp!MXm&&c>+mS+V*afb3`>l%Zd~qEhLR0*}SU=xzGCF2%*Qm+IZ8 z=I443jf?)V*2{4c%HG}?6~`oi=iK%~wV&*`f8gD^xTf|iGecJYF%m@bbSkAX#yS;W zq7PeJ>N&ePLGA6`)N=B!2Ji0dq%XU-)H_}>V%$e{s7$oAQ9M4W6#xiG_!sYk+~(#4 zrBW$%#^#ktd7h^~vo)0f1ooB-8H`i-`sUYrq2MMdxFPCKh)ZZ0#W@LoH!Y-f zxvvfmD(SfdL02^4Ul-Va$COjTeER2SBI9c&vXKBd8gRdF)vzJHhT-!d(gm;~cQZF* z5NQDO0)e`WVx9vW7?y$?{0rb_CLry3o~X+&8AzCb{;u}FXT?Auti0yF(;-_RlYm*S zDEmdaz=gdL#Hvz60{;S4|FbohpjJx10U@fwFof=u@Bjb+4rN$LW=%~1DgXcg2mk;8 W00000(o>TF0000 Date: Mon, 8 Jan 2024 14:56:51 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=BC=D0=B5=D1=80=D1=8B=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=BE=D1=81=D1=82=D0=BE=D1=80=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Mobs/SecurityCyborg/job.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml index 2c4775cbf99..336ec3e25b9 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/job.yml @@ -5,19 +5,19 @@ playTimeTracker: JobSecurityCyborg requirements: - !type:OverallPlaytimeRequirement - time: 216000000 #60 hrs 216000 + time: 2160000000 #60 hrs 216000 - !type:DepartmentTimeRequirement department: Security - time: 460000000 #46000 + time: 4600000000 #46000 - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 21600 #6 hrs + time: 21600000000 #6 hrs 21600 - !type:RoleTimeRequirement role: JobWarden - time: 21600 #6 hrs + time: -100000000 #6 hrs 21600 - !type:RoleTimeRequirement role: JobDetective - time: 7200 #2 hrs + time: 720000000 #2 hrs 7200 icon: "JobADTIconSecurityCyborg" supervisors: job-supervisors-rd jobEntity: ADTMobCyborSecurity From c8f53d0b45b54f03bd7f5f1c5da0d778e08d86e1 Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Mon, 8 Jan 2024 15:04:43 +0300 Subject: [PATCH 3/4] fix --- .../ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml index 558871c4c4b..2675ae6e67f 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml @@ -3,7 +3,7 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.3 + Piercing: 0.4 # fire and lasers burn it good Heat: 1.0 # zap From 0e4faf5a222d941f2a63b032431377fbf591140f Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Mon, 8 Jan 2024 15:14:58 +0300 Subject: [PATCH 4/4] fix --- .../ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml index 2675ae6e67f..f3a58030fac 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml @@ -3,7 +3,7 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.4 + Piercing: 0.6 # fire and lasers burn it good Heat: 1.0 # zap