Skip to content

Commit

Permalink
Немного мебели, декалей, вещей и фиксы (#149)
Browse files Browse the repository at this point in the history
* Some furniture

* Doors, Decal Sprite fix

* ой ой ой

* Lygib где лицензия?

* tapes meta fix

* Where my overlay?

* some cleanings in airlock

* Delta Statue

* centcom hatch open unlit texture fix

* siding line add

* add new floor

* У меня плохая память? Или зачем я добавлял фтл...

* glass hitting audio, Noooo my glass door was hitted

* welding glasses

* Delete Resources/Textures/Ligyb/disease.rsi/meta.json

---------

Co-authored-by: Vigers Ray <[email protected]>
  • Loading branch information
Rinary1 and VigersRay authored Jun 26, 2024
1 parent 460afb7 commit 44132dc
Show file tree
Hide file tree
Showing 136 changed files with 1,182 additions and 3 deletions.
Binary file added Resources/Audio/Effects/glass_hit.ogg
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ClothingEyesGlassesWelding = Сварочные Очки
.desc = Это сварочные очки. Это небольшой предмет. Защищает глаза от сварщиков.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-RandomIan = Спавнер случайный иан
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-StatueDelta = Статуя дельты
.desc = Статуя дельты. Большая и сильная.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-DoubleGlassAirlock = Двойной Шлюз
.desc = Он открывается, Он закрывается , и он может вас раздавить, но он больше, чем обычно.
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ent-AirlockHatchCentcommLocked = Шлюз ЦК
.suffix = ЦентКом, Закрыт
.desc = { ent-AirlockHatchCentcomm.desc }
ent-AirlockHatchMaintLocked = Технический Шлюз
.suffix = Обслуживание, Закрыт
.desc = { ent-AirlockHatchMaint.desc }
ent-AirlockHatchSyndicateLocked = Шлюз Синдиката
.suffix = Синдикат, Закрыт
.desc = { ent-AirlockHatchCentcomm.desc }
ent-DoubleGlassAirlockCentcomLocked = Двойной Шлюз ЦК
.suffix = ЦентКом, Закрыт
.desc = { ent-DoubleGlassAirlock.desc }
ent-DoubleGlassAirlockSyndicateLocked = Двойной Шлюз Синдиката
.suffix = Синдикат, Закрыт
.desc = { ent-DoubleGlassAirlock.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-AirlockHatchCentcomm = Шлюз ЦК
.desc = Удерживает плохих снаружи, а хороших внутри.
ent-AirlockHatchMaint = Технический Шлюз ЦК
.desc = Защищает Тех.Тонели в безопасности.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ent-ComfyBrownChair = коричневое удобное кресло
.desc = { ent-ComfyChair.desc }
ent-ChairOfficeGrey = серое офисное кресло
.desc = { ent-ChairOfficeLight.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ent-FloorLightFancyWood = большой деревянный светлый пол
147 changes: 147 additions & 0 deletions Resources/Prototypes/_Sunrise/Decals/markings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
- type: decal
id: LoadingArrow
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: loading_arrow

- type: decal
id: LoadingLine
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: loading_line

- type: decal
id: LoadingArrowGreyscale
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: loading_arrow_greyscale

- type: decal
id: LoadingLineGreyscale
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: loading_line_greyscale

# siding line

- type: decal
id: SidingLineE
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_line_e

- type: decal
id: SidingLineN
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_line_n

- type: decal
id: SidingLineS
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_line_s

- type: decal
id: SidingLineW
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_line_w

# siding end

- type: decal
id: SidingEndE
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_end_e

- type: decal
id: SidingEndN
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_end_n

- type: decal
id: SidingEndS
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_end_s

- type: decal
id: SidingEndW
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_end_w

# siding small corner

- type: decal
id: SidingCornerSmallNE
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_small_ne

- type: decal
id: SidingCornerSmallNW
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_small_nw

- type: decal
id: SidingCornerSmallSE
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_small_se

- type: decal
id: SidingCornerSmallSW
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_small_sw

# siding corner

- type: decal
id: SidingCornerNE
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_ne

- type: decal
id: SidingCornerNW
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_nw

- type: decal
id: SidingCornerSE
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_se

- type: decal
id: SidingCornerSW
tags: ["station", "markings"]
sprite:
sprite: _Sunrise/Decals/markings.rsi
state: siding_corner_sw
17 changes: 17 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,20 @@
- HudMedical
- type: EyeProtection
protectionTime: 5

- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesWelding
name: Welding glasses
description: That's a welding goggles. It is a small item. Protects the eyes from welders.
components:
- type: Sprite
sprite: _Sunrise/Clothing/Eyes/Glasses/weldglasses.rsi
- type: Clothing
sprite: _Sunrise/Clothing/Eyes/Glasses/weldglasses.rsi
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
- type: Tag
tags:
- HamsterWearable
18 changes: 18 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/ian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- type: entity
id: RandomIan
name: random ian spawner
parent: MarkerBase
components:
- type: Sprite
layers:
- state: green
- sprite: Mobs/Pets/corgi.rsi
state: corgi_dead
- type: RandomSpawner
prototypes:
- MobCorgiLisa
- MobCorgiIan
chance: 0.95
rarePrototypes:
- MobCorgiIanOld
rareChance: 0.05
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
id: StatueDelta
parent: BaseStructure
name: delta statue
description: A delta statue. Big and strong.
components:
- type: Sprite
noRot: true
sprite: _Sunrise/Structures/Decoration/statues.rsi
state: delta_statue
drawdepth: Mobs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
- type: entity
id: DoubleGlassAirlock
parent: AirlockGlass
name: Double Glass Airlock
description: It opens, it closes, and maybe crushes you, but it bigger than normal door.
components:
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Effects/glass_hit.ogg"
- type: Sprite
sprite: _Sunrise/Structures/Doors/Airlocks/Glass/double_glass_airlock.rsi
snapCardinals: false
offset: 0.5,0
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.49,-0.49,1.49,0.49" # don't want this colliding with walls or they won't close
density: 100
mask:
- FullTileMask
layer: #removed opaque from the layer, allowing lasers to pass through glass airlocks
- GlassAirlockLayer
- type: Rotatable
rotateWhileAnchored: true
- type: Transform
noRot: false
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
- type: entity
id: AirlockHatchMaint
parent: HighSecDoor
name: Maintenance Hatch
description: Protects maintenance tunnels.
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: _Sunrise/Structures/Doors/Airlocks/Hatches/maintenance_hatch.rsi
- type: Weldable
time: 10

- type: entity
id: AirlockHatchCentcomm
parent: HighSecDoor
name: CentCom Hatch
description: Keeps the bad out and keeps the good in.
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: _Sunrise/Structures/Doors/Airlocks/Hatches/centcom_hatch.rsi
- type: Weldable
time: 10
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,51 @@
- type: ContainerFill
containers:
board: [ DoorElectronicsBlueShield ]

#Hatches
- type: entity
parent: AirlockHatchCentcomm
id: AirlockHatchCentcommLocked
name: CentCom Hatch
suffix: CentCom, Locked
components:
- type: AccessReader
access: [["CentralCommand"]]

- type: entity
parent: AirlockHatchMaint
id: AirlockHatchMaintLocked
name: Maintenance Hatch
suffix: Maint, Locked
components:
- type: AccessReader
access: [["Maintenance"]]

- type: entity
parent: AirlockHatchCentcomm
id: AirlockHatchSyndicateLocked
name: Syndicate Hatch
suffix: Syndicate, Locked
components:
- type: AccessReader
access: [["SyndicateAgent"]]

#DoubleAirlocks

- type: entity
parent: DoubleGlassAirlock
id: DoubleGlassAirlockCentcomLocked
name: Double Glass Airlock
suffix: CentCom, Locked
components:
- type: AccessReader
access: [["CentralCommand"]]

- type: entity
parent: DoubleGlassAirlock
id: DoubleGlassAirlockSyndicateLocked
name: Double Glass Airlock
suffix: Syndicate, Locked
components:
- type: AccessReader
access: [["SyndicateAgent"]]
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,30 @@
- type: Sprite
sprite: _Sunrise/Structures/Furniture/chairs.rsi
state: carp

- type: entity
name: comfy brown chair
id: ComfyBrownChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: _Sunrise/Structures/Furniture/chairs.rsi
state: comfy-brown
# TODO:
# - type: Construction
# graph: Seat
# node: chairComfyBrown

- type: entity
name: grey office chair
id: ChairOfficeGrey
parent: ChairOfficeLight
components:
- type: Sprite
sprite: _Sunrise/Structures/Furniture/chairs.rsi
state: office-grey
# TODO:
# - type: Construction
# graph: Seat
# node: chairOfficeDark
Loading

0 comments on commit 44132dc

Please sign in to comment.