Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
74c935d
init
XsenonDash May 31, 2026
34105e3
Merge branch 'space-sunrise:master' into Fix5
XsenonDash Jun 1, 2026
f2590f0
Merge branch 'space-sunrise:master' into Fix5
XsenonDash Jun 1, 2026
e29896f
Merge branch 'Fix5' of https://github.com/XsenonDash/fish-station-14 …
XsenonDash Jun 3, 2026
a12ace8
updCentcomm
XsenonDash Jun 3, 2026
41052d1
evacdelta
XsenonDash Jun 3, 2026
8120c4d
2131231312313
XsenonDash Jun 3, 2026
157d1b2
22222
XsenonDash Jun 3, 2026
3661796
test
XsenonDash Jun 4, 2026
0789fd9
fix_mar
XsenonDash Jun 4, 2026
415e4f4
fix_infltr
XsenonDash Jun 4, 2026
ba512e6
планета_нюкеров_моя
XsenonDash Jun 4, 2026
d1ded72
12
XsenonDash Jun 6, 2026
9507859
для_перезапуска_тестов
XsenonDash Jun 6, 2026
32509ca
13
XsenonDash Jun 6, 2026
7376017
Merge branch 'space-sunrise:master' into Fix5
XsenonDash Jun 7, 2026
054ef30
del_cburn_id_fish
XsenonDash Jun 7, 2026
d76d810
try2
XsenonDash Jun 7, 2026
93d2956
куда блядь
XsenonDash Jun 7, 2026
e33c1e0
откатвожиданиификсакайтена
XsenonDash Jun 7, 2026
2776944
Merge branch 'space-sunrise:master' into Fix5
XsenonDash Jun 7, 2026
d4a4b05
чертовыдети
XsenonDash Jun 7, 2026
b6d1eac
telecom_upd
XsenonDash Jun 8, 2026
0b899e5
удаление_кнопок_от_цкшников
XsenonDash Jun 8, 2026
2486921
try2
XsenonDash Jun 8, 2026
cb8c12a
большой шаттл для ерт
XsenonDash Jun 8, 2026
bd011bd
wtf
XsenonDash Jun 8, 2026
e41ef21
123123
XsenonDash Jun 8, 2026
132319f
Merge branch 'space-sunrise:master' into Fix5
XsenonDash Jun 8, 2026
51ecb9a
назад хуйню
XsenonDash Jun 8, 2026
e404117
Merge branch 'Fix5' of https://github.com/XsenonDash/fish-station-14 …
XsenonDash Jun 8, 2026
237e9a0
снова здарова
XsenonDash Jun 9, 2026
3dbf90f
дубликат обратно
XsenonDash Jun 9, 2026
236cad5
suka
XsenonDash Jun 9, 2026
b51594f
Merge branch 'space-sunrise:master' into Fix5
XsenonDash Jun 10, 2026
dc57dd2
рамки_турели_телекомы
XsenonDash Jun 11, 2026
e594ee4
попросили
XsenonDash Jun 11, 2026
7765bdb
try 3
XsenonDash Jun 12, 2026
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
Expand Up @@ -20,10 +20,4 @@ ent-JugDyloveneSunrise = { ent-Jug }
.desc = { ent-Jug.desc }
ent-JugSalineSunrise = { ent-Jug }
.suffix = saline
.desc = { ent-Jug.desc }
ent-ChemistryBottleBicaridine = bicaridine bottle
.desc = A bottle filled with bicaridine, used to treat brute damage.
ent-ChemistryBottleDermaline = dermaline bottle
.desc = A bottle filled with dermaline, used to treat burn damage.
ent-ChemistryBottleStimulants = stimulants bottle
.desc = A bottle filled with stimulants, used to increase movement speed and treat stun damage.
.desc = { ent-Jug.desc }
885 changes: 532 additions & 353 deletions Resources/Maps/_Fish/Shuttles/Antag/infiltrator.yml

Large diffs are not rendered by default.

122 changes: 55 additions & 67 deletions Resources/Maps/_Fish/Shuttles/DSO/CentCommOfficial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ meta:
engineVersion: 271.1.0
forkId: ""
forkVersion: ""
time: 05/09/2026 17:36:47
entityCount: 610
time: 06/09/2026 11:17:41
entityCount: 607
maps: []
grids:
- 1
Expand Down Expand Up @@ -48,7 +48,7 @@ entities:
- uid: 1
components:
- type: MetaData
name: NT-ASH «Кварцевая пыль»
name: NT-INS «Инспектор»
- type: Transform
pos: -0.5,-0.515625
parent: invalid
Expand Down Expand Up @@ -543,48 +543,48 @@ entities:
-1,0:
0: 23790
0,1:
0: 14141
0: 14109
-1,1:
0: 35975
1: 4352
2: 4352
0,2:
0: 19
2: 72
1: 72
-1,2:
0: 8
2: 66
1: 66
1,0:
0: 12288
1: 102
2: 102
1,1:
0: 3
1: 13056
2: 16384
2: 13056
1: 16384
0,-2:
0: 45858
2: 8
1: 128
1: 8
2: 128
-1,-2:
0: 47240
2: 3
1: 48
1: 3
2: 48
-1,-1:
0: 53147
1,-2:
2: 1091
1: 16
1: 1091
2: 16
0: 12288
1,-1:
0: 819
-2,0:
1: 204
2: 204
0: 32768
-2,1:
0: 8
2: 16384
1: 34816
1: 16384
2: 34816
-2,-2:
2: 1096
1: 1096
0: 32768
-2,-1:
0: 2056
Expand All @@ -595,16 +595,18 @@ entities:
Oxygen: 21.824879
Nitrogen: 82.10312
- volume: 2500
temperature: 293.15
immutable: True
moles: {}
- volume: 2500
immutable: True
temperature: 293.15
moles: {}
chunkSize: 4
- type: GasTileOverlay
- type: RadiationGridResistance
- type: ImplicitRoof
- type: ExplosionAirtightGrid
- type: TileHistory
chunkHistory: {}
- proto: ActionToggleInternals
entities:
- uid: 146
Expand Down Expand Up @@ -3779,31 +3781,6 @@ entities:
canCollide: False
- type: InsideEntityStorage
storage: 299
- proto: PlasmaWindoorSecureCentralCommandLocked
entities:
- uid: 10
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 0.5,0.5
parent: 1
- uid: 86
components:
- type: Transform
pos: 0.5,0.5
parent: 1
- uid: 190
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 0.5,0.5
parent: 1
- uid: 377
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,0.5
parent: 1
- proto: PosterLegitNanomichiAd
entities:
- uid: 365
Expand Down Expand Up @@ -4334,6 +4311,12 @@ entities:
parent: 1
- proto: WallShuttle
entities:
- uid: 10
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.5,5.5
parent: 1
- uid: 11
components:
- type: Transform
Expand Down Expand Up @@ -4846,11 +4829,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -5.5,-5.5
parent: 1
- uid: 524
components:
- type: Transform
pos: 1.5,5.5
parent: 1
- uid: 525
components:
- type: Transform
Expand All @@ -4867,6 +4845,31 @@ entities:
parent: 1
- type: Physics
bodyType: Static
- proto: WeaponEnergyTurretCentralCommand
entities:
- uid: 86
components:
- type: Transform
pos: 0.5,0.5
parent: 1
- type: DeviceNetwork
deviceLists:
- 8
- type: BatteryAmmoProvider
fireCost: 1
- type: Gun
fireRate: 6
- proto: WeaponEnergyTurretCentralCommandControlPanel
entities:
- uid: 8
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 1.5,5.5
parent: 1
- type: DeviceList
devices:
- 86
- proto: WeaponRifleAsh12
entities:
- uid: 51
Expand Down Expand Up @@ -4895,21 +4898,6 @@ entities:
canCollide: False
- proto: WeaponTurretAllHostile
entities:
- uid: 8
components:
- type: MetaData
name: Враждебная турель
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,0.5
parent: 1
- type: Gun
spread: 0 rad
fireRate: 16
- type: BallisticAmmoProvider
capacity: 5000
- type: Godmode
oldDamage: {}
- uid: 87
components:
- type: Transform
Expand Down
Loading
Loading