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

Перенос аварийных ламп #389

Merged
merged 3 commits into from
Sep 2, 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
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ ghost-radio-component-shutoff = Радио выключается.
ent-ADTGhostRadioUnpowered = призрачное радио
.desc = Пшшшфшфшшшш... Вы серьёзно в это верите?

ghost-radio-enabled = Призрачное радио включено
ghost-radio-disabled = Призрачное радио выключено

ent-OuijaBoard = доска Уиджи
.desc = Отличная возможность связаться со своим пра-пра-пра-пра-прадедом. Возможно.

Expand Down
131 changes: 131 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Power/base_lightning.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
# licence: cc-by-4.0
# copyright: modern-nm, [email protected]
# summary: Здесь описаны лампы для ивентов. Они не требуют энергии, могут управляться через беспроводной канал связи и светят конусом, как EmergencyLight.
- type: entity
name: emergency light
description: "A light fixture. Draws power and produces light when equipped with a light tube."
id: ADTEmergencyLightRed
suffix: red, do not map
parent: Poweredlight
components:
- type: RotatingLight
- type: PointLight
radius: 12
energy: 4.5
softness: 0.5
offset: "0, 0.2"
color: "#B4FCF0"
mask: /Textures/Effects/LightMasks/cone.png
- type: ApcPowerReceiver
needsPower: false
- type: Sprite
sprite: ADT/Structures/Wallmounts/emergency_light.rsi
state: on
color: "#FF4020"
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: SmartLight
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSink
ports:
- On
- Off
- Toggle
- type: PoweredLight
hasLampOnSpawn: LedLightTubeRed
ejectBulbDelay: 3600
- type: DamageOnInteract
damage:
types:
Heat: 2
popupText: powered-light-component-burn-hand
- type: Appearance
- type: AmbientOnPowered
- type: AmbientSound
volume: -7
range: 5
sound:
path: /Audio/ADT/Ambience/Objects/warning-buzzer-alarm-fascinatedsound.ogg

- type: entity
name: emergency light
description: "A light fixture. Draws power and produces light when equipped with a light tube."
id: ADTemergencyLightGreen
suffix: Green, do not map
parent: ADTEmergencyLightRed
components:
- type: Sprite
sprite: ADT/Structures/Wallmounts/emergency_light.rsi
state: on
color: "#00FF00"
- type: PoweredLight
hasLampOnSpawn: LedLightTubeGreen
ejectBulbDelay: 3600
- type: DamageOnInteract
damage:
types:
Heat: 2
popupText: powered-light-component-burn-hand

- type: entity
name: emergency light
description: "A light fixture. Draws power and produces light when equipped with a light tube."
id: ADTemergencyLightBlue
suffix: Blue, do not map
parent: ADTEmergencyLightRed
components:
- type: Sprite
sprite: ADT/Structures/Wallmounts/emergency_light.rsi
state: on
color: "#0000FF"
- type: PoweredLight
hasLampOnSpawn: LedLightTubeBlue
ejectBulbDelay: 3600
- type: DamageOnInteract
damage:
types:
Heat: 2
popupText: powered-light-component-burn-hand

- type: entity
name: emergency light
description: "A light fixture. Draws power and produces light when equipped with a light tube."
id: ADTemergencyLightViolet
suffix: Violet, do not map
parent: ADTEmergencyLightRed
components:
- type: Sprite
sprite: ADT/Structures/Wallmounts/emergency_light.rsi
state: on
color: "#EE82EE"
- type: PoweredLight
hasLampOnSpawn: LedLightTubeViolet
ejectBulbDelay: 3600
- type: DamageOnInteract
damage:
types:
Heat: 2
popupText: powered-light-component-burn-hand

- type: entity
name: emergency light
description: "A light fixture. Draws power and produces light when equipped with a light tube."
id: ADTemergencyLightYellow
suffix: Yellow, do not map
parent: ADTEmergencyLightRed
components:
- type: Sprite
sprite: ADT/Structures/Wallmounts/emergency_light.rsi
state: on
color: "#FFE400"
- type: PoweredLight
hasLampOnSpawn: LedLightTubeYellow
ejectBulbDelay: 3600
- type: DamageOnInteract
damage:
types:
Heat: 2
popupText: powered-light-component-burn-hand


75 changes: 75 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Power/lights.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# просто цветные LED лампы
- type: entity
parent: BaseLightTube
name: led light tube
description: A high power high energy bulb.
id: LedLightTubeGreen
suffix: green
components:
- type: LightBulb
color: "#00FF00"
lightEnergy: 2
lightRadius: 15
lightSoftness: 0.9
BurningTemperature: 1000
PowerUse: 12

- type: entity
parent: BaseLightTube
name: led light tube
description: A high power high energy bulb.
id: LedLightTubeRed
suffix: red
components:
- type: LightBulb
color: "#FF0000"
lightEnergy: 2
lightRadius: 15
lightSoftness: 0.9
BurningTemperature: 1000
PowerUse: 12

- type: entity
parent: BaseLightTube
name: led light tube
description: A high power high energy bulb.
id: LedLightTubeBlue
suffix: blue
components:
- type: LightBulb
color: "#0000FF"
lightEnergy: 2
lightRadius: 15
lightSoftness: 0.9
BurningTemperature: 1000
PowerUse: 12

- type: entity
parent: BaseLightTube
name: led light tube
description: A high power high energy bulb.
id: LedLightTubeYellow
suffix: yellow
components:
- type: LightBulb
color: "#FFE400"
lightEnergy: 2
lightRadius: 15
lightSoftness: 0.9
BurningTemperature: 1000
PowerUse: 12

- type: entity
parent: BaseLightTube
name: led light tube
description: A high power high energy bulb.
id: LedLightTubeViolet
suffix: violet
components:
- type: LightBulb
color: "#EE82EE"
lightEnergy: 2
lightRadius: 15
lightSoftness: 0.9
BurningTemperature: 1000
PowerUse: 12
4 changes: 2 additions & 2 deletions Resources/Prototypes/Accents/word_replacements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
corvax-accent-cowboy-words-4: corvax-accent-cowboy-replacement-4
corvax-accent-cowboy-words-501: corvax-accent-cowboy-replacement-5
corvax-accent-cowboy-words-502: corvax-accent-cowboy-replacement-5
corvax-accent-cowboy-words-601: corvax-accent-cowboy-replacement-6
# corvax-accent-cowboy-words-601: corvax-accent-cowboy-replacement-6 ADT-Tweak
corvax-accent-cowboy-words-602: corvax-accent-cowboy-replacement-6
corvax-accent-cowboy-words-7: corvax-accent-cowboy-replacement-7
corvax-accent-cowboy-words-8: corvax-accent-cowboy-replacement-8
Expand Down Expand Up @@ -745,4 +745,4 @@
accent-russian-words-3-3: accent-russian-words-replace-3
accent-russian-words-4: accent-russian-words-replace-4
accent-russian-words-5: accent-russian-words-replace-5
accent-russian-words-6: accent-russian-words-replace-6
accent-russian-words-6: accent-russian-words-replace-6
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "juliang, modified by mirrorcult",
"states": [
{
"name": "base",
"directions": 4
},
{
"name": "broken",
"directions": 4
},
{
"name": "empty",
"directions": 4
},
{
"name": "glow",
"directions": 4
},
{
"name": "off",
"directions": 4,
"delays": [
[
1.0
],
[
1.0
],
[
1.0
],
[
1.0
]
]
},
{
"name": "on",
"directions": 4,
"delays": [
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
],
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
],
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
],
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading