Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes some... #560

Merged
merged 4 commits into from
Apr 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
svs-title = бой флотов
svs-description = В космосе встретились два флагмана враждующих фракций, ваша задача купить готовые корабли на верфи, и также купить оборудование для кораблей! в вашу цель входит уничтожение вражеского ИИ или консоль верфи!
1 change: 1 addition & 0 deletions Resources/Locale/ru-RU/backmen/verbs/items.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
verb-categories-shipwreck-pinpointer = Сменить цель
1,041 changes: 399 additions & 642 deletions Resources/Maps/Backmen/ForSale/shipvsship/blue/gaul_dast.yml

Large diffs are not rendered by default.

197 changes: 160 additions & 37 deletions Resources/Maps/Backmen/ForSale/shipvsship/blue/gemme_perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ entities:
- uid: 1
components:
- type: MetaData
name: grid
name: gemme-B
- type: Transform
pos: -0.5625,1.5057223
parent: invalid
Expand Down Expand Up @@ -44,6 +44,8 @@ entities:
bodyType: Dynamic
- type: Fixtures
fixtures: {}
- type: IFF
color: '#0000FFFF'
- type: OccluderTree
- type: SpreaderGrid
- type: Shuttle
Expand Down Expand Up @@ -473,6 +475,56 @@ entities:
- type: Transform
pos: 1.5,1.5
parent: 1
- proto: CrateGenericSteel
entities:
- uid: 45
components:
- type: Transform
pos: -0.5,0.5
parent: 1
- type: EntityStorage
air:
volume: 200
immutable: False
temperature: 293.14673
moles:
- 1.7459903
- 6.568249
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- type: ContainerContainer
containers:
entity_storage: !type:Container
showEnts: False
occludes: True
ents:
- 46
- 47
- 50
- 86
- 94
- 95
- 96
- 97
- 98
- 99
- 100
- 101
- 102
- 103
- 104
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
- proto: GeneratorWallmountBasic
entities:
- uid: 6
Expand Down Expand Up @@ -533,48 +585,122 @@ entities:
- type: Transform
pos: -0.5,-0.5
parent: 1
- proto: PowerCageMedium
- proto: MagazineGrenadeEMP
entities:
- uid: 44
- uid: 98
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.714715,0.67737365
parent: 1
- uid: 45
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 103
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.589715,0.69299865
parent: 1
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: MagazineGrenadeFrag
entities:
- uid: 46
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.464715,0.7086239
parent: 1
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 47
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.63659,0.69299865
parent: 1
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 50
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 86
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.527215,0.69299865
parent: 1
- proto: PowerCageRecharger
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 94
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 95
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 96
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 97
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 99
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 100
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 101
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 102
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- uid: 104
components:
- type: Transform
parent: 45
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: MedkitFilled
entities:
- uid: 25
- uid: 44
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -0.5,1.5
pos: -0.671875,1.5243154
parent: 1
- type: PointLight
enabled: False
- proto: PoweredSmallLight
entities:
- uid: 87
Expand All @@ -594,24 +720,14 @@ entities:
- type: Transform
pos: 0.5,1.5
parent: 1
- proto: Rack
- proto: ShuttleGunDuster
entities:
- uid: 36
components:
- type: Transform
pos: -0.5,0.5
parent: 1
- proto: ShuttleGunPerforator
entities:
- uid: 50
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,2.5
parent: 1
- type: DeviceLinkSink
links:
- 89
- proto: ShuttleWindow
entities:
- uid: 29
Expand All @@ -635,7 +751,7 @@ entities:
parent: 1
- type: DeviceLinkSource
linkedPorts:
50:
invalid:
- Pressed: Toggle
- proto: SubstationWallBasic
entities:
Expand All @@ -645,6 +761,13 @@ entities:
rot: -1.5707963267948966 rad
pos: 2.5,0.5
parent: 1
- proto: Table
entities:
- uid: 25
components:
- type: Transform
pos: -0.5,1.5
parent: 1
- proto: Thruster
entities:
- uid: 16
Expand Down
Loading
Loading