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

своеборазные фиксы #34

Merged
merged 4 commits into from
Aug 26, 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

This file was deleted.

10 changes: 5 additions & 5 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,7 @@
id: LPPUplinkGlaive
name: Кроваво красная глефа
description: Модифицированная версия глефы, усовершенствованная каким-то больным утилизатором...
icon: { sprite: /Textures/LPP/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon }
icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Melee/syndie_glaive.rsi, state: icon }
productEntity: LPPWeaponSyndieGlaive
cost:
Telecrystal: 8
Expand All @@ -1725,7 +1725,7 @@
id: LPPUplinkupgrwebbing
name: разгрузочный жилет "Хомяк"
description: Комплект из карманов, сумок и прочей лабуды предоставляет кучу места для ваших всевозможных вещей, что вы сюда запихнёте. Выглядит крайне громоздко однако.
icon: { sprite: /Textures/LPP/Clothing/Belt/upgrwebbing.rsi, state: icon }
icon: { sprite: /Textures/_LostParadise/Clothing/Belt/upgrwebbing.rsi, state: icon }
productEntity: LPPClothingBeltMaximumWebbing
cost:
Telecrystal: 2
Expand All @@ -1736,7 +1736,7 @@
id: LPPUplinkAcientHardsuitSyndie
name: древний скафандр Синдиката
description: Очень странная модель скафандра Ядерных Оперативников, явно нестандартной конфигурации
icon: { sprite: /Textures/LPP/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
icon: { sprite: /Textures/_LostParadise/Clothing/OuterClothing/Hardsuits/acientsyndiehardsuit.rsi, state: icon }
productEntity: LPPClothingOuterHardsuitAcientSyndie
cost:
Telecrystal: 11
Expand All @@ -1747,7 +1747,7 @@
id: LPPUplinkEcbow
name: мини арбалет синдиката
description: Любимое оружие агентов из далёких времён. Выстрел сразу же поражает цель, роняя моментально вашу цель на короткое время. Хоть оно и не требуется боеприпасов для стрельбы, однако самому оружию требуется перезарядка для повторного выстрела.
icon: { sprite: /Textures/LPP/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon }
icon: { sprite: /Textures/_LostParadise/Objects/Weapons/Guns/Battery/ecbow.rsi, state: icon }
productEntity: LPPWeaponEnergyCrossbow
cost:
Telecrystal: 10
Expand All @@ -1763,4 +1763,4 @@
cost:
Telecrystal: 2
categories:
- UplinkArmor
- UplinkArmor
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,7 @@
sprite: Objects/Weapons/Guns/Projectiles/projectiles.rsi
layers:
- state: scatterlaser
shader: unshaded
- type: GatheringProjectile
- type: Projectile
DeleteOnCollide: false
Expand Down Expand Up @@ -1133,7 +1134,7 @@
params:
volume: 5
- type: Sprite
sprite: LPP/Objects/Weapons/Guns/Projectiles/battlecutter.rsi
sprite: _LostParadise/Objects/Weapons/Guns/Projectiles/battlecutter.rsi
layers:
- state: ion
shader: unshaded
Expand Down Expand Up @@ -1163,11 +1164,11 @@
types:
Heat: 1
muzzleFlash:
sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
state: AILaser_3
travelFlash:
sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
state: AILaser_2
impactFlash:
sprite: LPP/Objects/Weapons/Guns/projectiles/ailaser.rsi
state: AILaser_1
sprite: _LostParadise/Objects/Weapons/Guns/projectiles/ailaser.rsi
state: AILaser_1
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
parent: BaseLathe
name: protolathe
description: Converts raw materials into useful objects.
noSpawn: false
components:
- type: Sprite
sprite: Structures/Machines/protolathe.rsi
Expand Down Expand Up @@ -1418,4 +1419,4 @@
- type: MaterialStorage
whitelist:
tags:
- PrizeTicket
- PrizeTicket
9 changes: 9 additions & 0 deletions Resources/Prototypes/_LostParadise/Action/ai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
id: AIEyeCamShootAction
name: stun shot
description: destabilizing shot in some point
noSpawn: true
components:
- type: WorldTargetAction
icon: _LostParadise/Actions/AI/camerashoot.png
Expand All @@ -15,6 +16,7 @@
id: AIEyeCamAction
name: AI cameras
description: Can jump on target cameras.
noSpawn: true
components:
- type: InstantAction
icon: _LostParadise/Actions/AI/camera.png
Expand All @@ -27,6 +29,7 @@
id: AIEyeAction
name: AI Eye
description: Puts you in to the AI Eye form, allowing you to float about the station's cameras.
noSpawn: true
components:
- type: InstantAction
icon: _LostParadise/Actions/AI/eye.png
Expand All @@ -52,6 +55,7 @@
id: AIToggleArmNuke
name: Nuke Arm/Disarm
description: Toggles the AI's nuke.
noSpawn: true
components:
- type: InstantAction
icon:
Expand All @@ -67,6 +71,7 @@
id: ActionAIShowCommunications
name: Communications Interface
description: View a communications interface.
noSpawn: true
components:
- type: InstantAction
icon: _LostParadise/Actions/AI/announcement.png
Expand All @@ -77,6 +82,7 @@
id: ActionAiShowCriminalRecords
name: Criminal Records Interface
description: View a criminal records interface.
noSpawn: true
components:
- type: InstantAction
icon: Corvax/Interface/AdminActions/monitoring.png # Corvax-Resprite
Expand All @@ -89,6 +95,7 @@
- type: entity
id: ActionOpenCloseRemote
name: Open targeted door
noSpawn: true
components:
- type: EntityTargetAction
icon: _LostParadise/Actions/AI/door.png
Expand All @@ -101,6 +108,7 @@
- type: entity
id: ActionToggleBolts
name: Toggle bolts on door
noSpawn: true
components:
- type: EntityTargetAction
icon: _LostParadise/Actions/AI/door_bolt.png
Expand All @@ -113,6 +121,7 @@
- type: entity
id: ActionToggleEmergencyAccess
name: Toggle emergency on door
noSpawn: true
components:
- type: EntityTargetAction
icon: _LostParadise/Actions/AI/door_emergency.png
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,67 @@
# - type: entity
# id: LPPProtolatheENGMachineCircuitboard
# parent: BaseMachineCircuitboard
# name: инженерный протолат (машинная плата)
# description: Плата для создания инженерного протолата.
# components:
# - type: MachineBoard
# prototype: LPPprotolatheENG
# stackRequirements:
# MatterBin: 2
# Manipulator: 2
# tagRequirements:
# GlassBeaker:
# amount: 2
# defaultPrototype: Beaker
#
# - type: entity
# id: LPPProtolatheRnDMachineCircuitboard
# parent: BaseMachineCircuitboard
# name: научный протолат (машинная плата)
# description: Плата для создания научного протолата.
# components:
# - type: MachineBoard
# prototype: LPPprotolatheRnD
# stackRequirements:
# MatterBin: 2
# Manipulator: 2
# tagRequirements:
# GlassBeaker:
# amount: 2
# defaultPrototype: Beaker
#
# - type: entity
# id: LPPProtolatheSUPMachineCircuitboard
# parent: BaseMachineCircuitboard
# name: протолат снабжения (машинная плата)
# description: Плата для создания протолата снабжения.
# components:
# - type: MachineBoard
# prototype: LPPSupProtolathe
# stackRequirements:
# MatterBin: 2
# Manipulator: 2
# tagRequirements:
# GlassBeaker:
# amount: 2
# defaultPrototype: Beaker
#
# - type: entity
# id: LPPProtolatheServiceMachineCircuitboard
# parent: BaseMachineCircuitboard
# name: сервисный протолат (машинная плата)
# description: Плата для создания сервисного протолата.
# components:
# - type: MachineBoard
# prototype: LPPServiceProtolathe
# stackRequirements:
# MatterBin: 2
# Manipulator: 2
# tagRequirements:
# GlassBeaker:
# amount: 2
# defaultPrototype: Beaker
#
- type: entity
id: LPPSpaceForgeBoard
parent: BaseMachineCircuitboard
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
{
"name": "icon-flash"
},
{
"name": "icon-unshaded"
},
{
"name": "light-overlay"
},
{
"name": "on-inhand-left",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "equipped-HELMET",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-hapry",
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"name": "equipped-OUTERCLOTHING-vulpkanin",
"directions": 4
},
{
{
"name": "equipped-OUTERCLOTHING-tajaran",
"directions": 4
},
{
{
"name": "equipped-OUTERCLOTHING-reptilian",
"directions": 4
},
Expand All @@ -37,7 +37,7 @@
{
"name": "inhand-right",
"directions": 4
}},
},
{
"name": "equipped-OUTERCLOTHING-harpy",
"directions": 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,15 @@
]
]
},
{
"name": "scatterlaser",
"delays": [
[
0.060000002,
0.060000002
]
]
},
{
"name": "impact_xray",
"delays": [
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Resources/Textures/Structures/Storage/closet.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,12 @@
},
{
"name": "representative_door"
},
{
"name": "sec_engi"
},
{
"name": "sec_eng_door"
}
]
}
Binary file modified Resources/Textures/Structures/Storage/closet.rsi/sec_eng_door.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Structures/Storage/closet.rsi/sec_engi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading