From 765671d1756852701833985387903dddad012674 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Tue, 31 Dec 2024 10:28:13 +0300 Subject: [PATCH] =?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 --- .../entities/objects/devices/pda.ftl | 3 ++ .../Maps/_Sunrise/Shuttles/assaultops.yml | 44 +++++++++++++++++++ .../_Sunrise/AssaultOps/game_presets.yml | 3 +- .../Prototypes/_Sunrise/AssaultOps/pda.yml | 2 +- .../_Sunrise/AssaultOps/spawners.yml | 11 +++++ .../_Sunrise/AssaultOps/startinggear.yml | 6 +-- 6 files changed, 63 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/pda.ftl index 5e2a9165232..8d6a9e243cc 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/pda.ftl @@ -153,3 +153,6 @@ ent-PiratePDA = КПК с Адамовой головой ent-SyndiAgentPDA = медицинский ало-красный КПК .suffix = КПК оперативника медика Синдиката, Ядерный Оперативник .desc = Смотря на этот КПК, ваше сердцебиение учащается... словно его владелец проводил немыслимые и ужасные медицинские эксперименты. +ent-AssaultOpsPDA = { ent-PassengerPDA } + .desc = { ent-PassengerPDA } + diff --git a/Resources/Maps/_Sunrise/Shuttles/assaultops.yml b/Resources/Maps/_Sunrise/Shuttles/assaultops.yml index 3ae2b2e6050..633a64195cd 100644 --- a/Resources/Maps/_Sunrise/Shuttles/assaultops.yml +++ b/Resources/Maps/_Sunrise/Shuttles/assaultops.yml @@ -6362,6 +6362,50 @@ entities: - type: Transform pos: -6.5,-5.5 parent: 1 +- proto: SpawnPointAssaultOps + entities: + - uid: 202 + components: + - type: Transform + pos: -1.5,10.5 + parent: 1 + - uid: 922 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 923 + components: + - type: Transform + pos: 7.5,3.5 + parent: 1 + - uid: 924 + components: + - type: Transform + pos: -10.5,3.5 + parent: 1 + - uid: 925 + components: + - type: Transform + pos: -10.5,6.5 + parent: 1 + - uid: 926 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,10.5 + parent: 1 + - uid: 927 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,10.5 + parent: 1 + - uid: 929 + components: + - type: Transform + pos: -5.5,10.5 + parent: 1 - proto: StasisBed entities: - uid: 871 diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/game_presets.yml b/Resources/Prototypes/_Sunrise/AssaultOps/game_presets.yml index 4cbc3db4dab..048fe2bfb98 100644 --- a/Resources/Prototypes/_Sunrise/AssaultOps/game_presets.yml +++ b/Resources/Prototypes/_Sunrise/AssaultOps/game_presets.yml @@ -5,11 +5,10 @@ - assops # yeeeeah name: assaultops-title description: assaultops-description - showInVote: false + showInVote: true rules: - AssaultOps - LiteSubGamemodesRule - - MiddleSubGamemodesRule - BasicStationEventScheduler - MeteorSwarmScheduler - SpaceTrafficControlEventScheduler diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/pda.yml b/Resources/Prototypes/_Sunrise/AssaultOps/pda.yml index 48dcafbfabf..f7586be7c50 100644 --- a/Resources/Prototypes/_Sunrise/AssaultOps/pda.yml +++ b/Resources/Prototypes/_Sunrise/AssaultOps/pda.yml @@ -1,6 +1,6 @@ - type: entity parent: PassengerPDA - id: AssaultOpPDA + id: AssaultOpsPDA name: passenger PDA description: Why isn't it gray? components: diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/spawners.yml b/Resources/Prototypes/_Sunrise/AssaultOps/spawners.yml index e69de29bb2d..9937be9e927 100644 --- a/Resources/Prototypes/_Sunrise/AssaultOps/spawners.yml +++ b/Resources/Prototypes/_Sunrise/AssaultOps/spawners.yml @@ -0,0 +1,11 @@ +- type: entity + id: SpawnPointAssaultOps + parent: MarkerBase + name: assaultops + components: + - type: SpawnPoint + - type: Sprite + layers: + - state: green + - sprite: Objects/Fun/toys.rsi + state: base diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/startinggear.yml b/Resources/Prototypes/_Sunrise/AssaultOps/startinggear.yml index 53124183ced..a02f0b4408f 100644 --- a/Resources/Prototypes/_Sunrise/AssaultOps/startinggear.yml +++ b/Resources/Prototypes/_Sunrise/AssaultOps/startinggear.yml @@ -9,7 +9,7 @@ # ears: ClothingHeadsetAltSyndicate # gloves: ClothingHandsGlovesCombat shoes: ClothingShoesColorBlack - id: AssaultOpPDA + id: AssaultOpsPDA # pocket1: PinpointerIcarus # pocket2: BaseUplinkRadioAssautOP innerclothingskirt: ClothingUniformJumpsuitTactical @@ -28,7 +28,7 @@ # ears: ClothingHeadsetAltSyndicate # gloves: ClothingHandsGlovesCombat shoes: ClothingShoesColorBlack - id: AssaultOpPDA + id: AssaultOpsPDA # pocket1: PinpointerIcarus pocket2: UplinkRadioAssaultOperatives40TC innerclothingskirt: ClothingUniformJumpsuitTactical @@ -46,7 +46,7 @@ # ears: ClothingHeadsetAltSyndicate # gloves: ClothingHandsGlovesCombat shoes: ClothingShoesColorBlack - id: AssaultOpPDA + id: AssaultOpsPDA pocket1: RemoteAssaultOpShuttleController pocket2: UplinkRadioAssaultOperatives0TC innerclothingskirt: ClothingUniformJumpsuitTactical