From dcd97bea9dfbff2eb181fe7a7e4170635b6358ad Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sat, 2 Mar 2024 23:07:19 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D1=8E=20?= =?UTF-8?q?=D0=BA=D0=B8=D0=B1=D0=BE=D1=80=D0=B3=D1=83=20=D0=A1=D0=B1=20?= =?UTF-8?q?=D1=81=D0=BF=D0=B5=D1=88=D0=B8=D0=BB=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADT/Entities/Mobs/SecurityCyborg/base.yml | 15 ++++++++++++--- .../Entities/Mobs/SecurityCyborg/sec_cyborg.yml | 4 ++-- .../ADT/Entities/Mobs/SecurityCyborg/species.yml | 16 ++++++++-------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml index d18985bc5a6..7f5a92ebf21 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml @@ -185,10 +185,13 @@ - map: ["pocket2"] - map: ["enum.HumanoidVisualLayers.Tail"] #- map: ["enum.HumanoidVisualLayers.Wings"] + - map: ["enum.DamageStateVisualLayers.Base"] + state: full + sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi - map: ["clownedon"] # Dynamically generated sprite: "Effects/creampie.rsi" state: "creampie_human" - visible: false + visible: true #false - type: Repairable #fuelcost: 60 doAfterDelay: 10 # was 18 @@ -311,8 +314,14 @@ proper: true - type: StandingState - type: CanEscapeInventory - - type: HumanoidAppearance - species: ADTCyborgSpecies + # - type: HumanoidAppearance + # species: ADTCyborgSpecies + # - type: Sprite + # drawdepth: Mobs + # layers: + # - map: ["enum.DamageStateVisualLayers.Base"] + # state: crawling + # sprite: Corvax/Mobs/Pets/largo.rsi - type: Body prototype: ADTBodyCyborgSec requiredLegs: 2 diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml index 0b9a8bca7db..122cdf9d8a6 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/sec_cyborg.yml @@ -158,5 +158,5 @@ components: - type: HumanoidAppearance species: ADTCyborgSpecies - - type: Inventory - templateId: ADTCyborgSecInventory + # - type: Inventory + # templateId: ADTCyborgSecInventory diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml index f0262a55491..f36c6dd0317 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml @@ -2,20 +2,20 @@ id: ADTCyborgSpecies name: species-name-cyb-security roundStart: false # - prototype: ADTMobCyborSecurity - sprites: ADTMobCyborgSecSprites + prototype: MobMouse2 #prototype: ADTMobCyborSecurity + #sprites: ADTMobCyborgSecSprites markingLimits: MobIPCMarkingLimits - dollPrototype: ADTMobCyborgSecDummy + dollPrototype: MobMouse2 #ADTMobCyborgSecDummy skinColoration: TintedHues minAge: 1 maxAge: 240 oldAge: 50 youngAge: 50 - maleFirstNames: IpcFirst - femaleFirstNames: IpcFirst - maleLastNames: IpcLast # Corvax-LastnameGender - femaleLastNames: IpcLast # Corvax-LastnameGender - naming: FirstDashLast + # maleFirstNames: IpcFirst + # femaleFirstNames: IpcFirst + # maleLastNames: IpcLast # Corvax-LastnameGender + # femaleLastNames: IpcLast # Corvax-LastnameGender + # naming: FirstDashLast sexes: - Unsexed From f2e3563e3d316746ee09643fbb77780f55fc45cd Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sun, 3 Mar 2024 01:34:13 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml | 8 ++++---- .../Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml index 7f5a92ebf21..225262cd82b 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/base.yml @@ -137,6 +137,9 @@ noRot: true drawdepth: Mobs layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi + state: full - map: ["enum.HumanoidVisualLayers.Chest"] - map: ["enum.HumanoidVisualLayers.Head"] - map: ["enum.HumanoidVisualLayers.Snout"] @@ -185,13 +188,10 @@ - map: ["pocket2"] - map: ["enum.HumanoidVisualLayers.Tail"] #- map: ["enum.HumanoidVisualLayers.Wings"] - - map: ["enum.DamageStateVisualLayers.Base"] - state: full - sprite: ADT/Mobs/Silicon/Cyborg/parts.rsi - map: ["clownedon"] # Dynamically generated sprite: "Effects/creampie.rsi" state: "creampie_human" - visible: true #false + visible: false - type: Repairable #fuelcost: 60 doAfterDelay: 10 # was 18 diff --git a/Resources/Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json index d1f947f8b89..449fa711f07 100644 --- a/Resources/Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json +++ b/Resources/Textures/ADT/Mobs/Silicon/Cyborg/parts.rsi/meta.json @@ -8,7 +8,8 @@ }, "states": [ { - "name": "full" + "name": "full", + "directions": 4 }, { "name": "head_m", From 53093cf596bb10f28af77d7e02f33f94fd87741b Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Sun, 3 Mar 2024 02:16:02 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=BB=D1=8F=D0=BD=D0=BA=D1=83=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B1=D0=B5=D0=B3=D0=B5=D1=80=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Mobs/SecurityCyborg/species.yml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml index f36c6dd0317..b6250ffcc9d 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/species.yml @@ -1,11 +1,11 @@ - type: species id: ADTCyborgSpecies name: species-name-cyb-security - roundStart: false # - prototype: MobMouse2 #prototype: ADTMobCyborSecurity - #sprites: ADTMobCyborgSecSprites + roundStart: false #true # остаил для набегеров с софтом + prototype: ADTMobMouseCyborgSpecies #prototype: ADTMobCyborSecurity + sprites: ADTMobCyborgSecSprites markingLimits: MobIPCMarkingLimits - dollPrototype: MobMouse2 #ADTMobCyborgSecDummy + dollPrototype: ADTMobMouseCyborgSpecies #ADTMobCyborgSecDummy skinColoration: TintedHues minAge: 1 maxAge: 240 @@ -19,6 +19,21 @@ sexes: - Unsexed +- type: entity + parent: MobMouse2 + id: ADTMobMouseCyborgSpecies + name: "Крыска" + components: + - type: HumanoidAppearance + species: ADTCyborgSpecies + - type: RandomMetadata + nameSegments: [names_mouse_cyb] + +- type: dataset + id: names_mouse_cyb + values: + - Крыска + - type: speciesBaseSprites id: ADTMobCyborgSecSprites sprites: