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

heads items update #204

Merged
merged 3 commits into from
Jul 22, 2023
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
Expand Up @@ -25,6 +25,9 @@ ent-ClothingHeadHelmetHardsuitMedical = шлем скафандра главно
ent-ClothingHeadHelmetHardsuitRd = экспериментальный шлем исследовательского скафандра
.desc = Легкий шлем скафандра, не стесняющий движений головы.
.suffix = { "" }
ent-ClothingHeadHelmetHardsuitKm = шлем скафандра квартирмейстера
.desc = Специальный шлем, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций.
.suffix = { "" }
ent-ClothingHeadHelmetHardsuitSalvage = шлем скафандра утилизатора
.desc = Специальный шлем, предназначенный для работы в опасной среде с низким давлением. Имеет усиленную броню, на случай встречи с дикими животными, а так же двойные прожекторы.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ ent-ClothingOuterHardsuitMedical = скафандр главного врача
ent-ClothingOuterHardsuitRd = скафандр научного руководителя
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет дополнительный слой брони.
.suffix = { "" }
ent-ClothingOuterHardsuitKm = скафандр квартирмейстера
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Создан из облегчённых материалов для столкновений с враждебной фауной обломков и экспедиций.
.suffix = { "" }
ent-ClothingOuterHardsuitSalvage = скафандр утилизатора
.desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет усиленное покрытие на случай встречи с дикой фауной.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ent-HandheldCargoMonitor = планшет закупок карго
.desc = Планшет, используемый квартирмейстером, для удаленного заказа грузов.
.suffix = { "" }
ent-HandheldIntercomMonitor = планшет оповещений
.desc = Планшет, испульзуемый капитаном, для удаленного оповещения станции.
.suffix = { "" }
ent-HandheldRndMonitor = планшет изучений
.desc = Планшет, используемый научным руководителем, для удаленного доступа к серверу изучений.
.suffix = { "" }
ent-HandheldSolarMonitor = планшет управления солнечными панелями
.desc = Планшет, используемый старшим инженером, для удаленной настройки солнечными понелями.
.suffix = { "" }
5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
prob: 0.8
- id: CargoRequestComputerCircuitboard
- id: CargoShuttleComputerCircuitboard
- id: ClothingOuterHardsuitKm
- id: HandheldCargoMonitor
- id: CargoShuttleConsoleCircuitboard
- id: SalvageShuttleConsoleCircuitboard
- id: CargoBountyComputerCircuitboard
Expand Down Expand Up @@ -78,6 +80,7 @@
- id: ClothingHandsGlovesCaptain
- id: WeaponDisabler
- id: CommsComputerCircuitboard
- id: HandheldIntercomMonitor
- id: ClothingHeadsetAltCommand
- id: SpaceCash1000
- id: PlushieNuke
Expand Down Expand Up @@ -164,6 +167,7 @@
- id: ClothingEyesGlassesMeson
- id: ClothingBeltChiefEngineerFilled
- id: ClothingHeadHatBeretEngineering
- id: HandheldSolarMonitor
- id: CigarCase
prob: 0.15
- id: DoorRemoteEngineering
Expand Down Expand Up @@ -269,6 +273,7 @@
prob: 0.1
- id: DoorRemoteResearch
- id: ClothingHeadHatBeretRND
- id: HandheldRndMonitor
- id: RubberStampRd
- id: ClothingHeadsetAltScience
- id: BoxEncryptionKeyScience
Expand Down
39 changes: 39 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,45 @@
radius: 7
energy: 3

- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitKm
noSpawn: true
name: km hardsuit helmet
description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/kmsuit.rsi
- type: Clothing
sprite: Clothing/Head/Hardsuits/kmsuit.rsi
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 10000
- type: PointLight
radius: 7
energy: 3
- type: CargoOrderConsole
- type: ActivatableUI
key: enum.CargoConsoleUiKey.Orders
closeOnHandDeselect: false
- type: UserInterface
interfaces:
- key: enum.CargoConsoleUiKey.Orders
type: CargoOrderConsoleBoundUserInterface
- type: AccessReader
access: [["Cargo"]]
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: BasicDevice
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSource
range: 200
ports:
- OrderSender
- type: StaticPrice
price: 500

#Security Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
Expand Down
30 changes: 30 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,36 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSpatio

- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitKm
name: Kvas
description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/kmsuit.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/kmsuit.rsi
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 10000
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: Armor
modifiers:
coefficients:
Blunt: 0.7
Slash: 0.7
Piercing: 0.8
Heat: 0.85
Radiation: 0.50
Caustic: 0.75
- type: ExplosionResistance
damageCoefficient: 0.4
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitKm

#Salvage Hardsuit
- type: entity
parent: ClothingOuterHardsuitBase
Expand Down
127 changes: 127 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Tablets/cargo_pda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
- type: entity
name: handheld cargo monitor
parent:
- BaseItem
id: HandheldCargoMonitor
description: A hand-held crew monitor displaying the status of suit sensors.
components:
- type: Sprite
sprite: Objects/Specific/Tablets/cargo.rsi
state: icon
- type: CargoOrderConsole
- type: ActivatableUI
key: enum.CargoConsoleUiKey.Orders
closeOnHandDeselect: true
- type: UserInterface
interfaces:
- key: enum.CargoConsoleUiKey.Orders
type: CargoOrderConsoleBoundUserInterface
- type: AccessReader
access: [["Cargo"]]
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: BasicDevice
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSource
range: 200
ports:
- OrderSender
- type: StaticPrice
price: 500

- type: entity
name: handheld intercom monitor
parent:
- BaseItem
id: HandheldIntercomMonitor
description: A hand-held crew monitor displaying the status of suit sensors.
components:
- type: Sprite
sprite: Objects/Specific/Tablets/intercom.rsi
state: icon
- type: AccessReader
access: [[ "Command" ]]
- type: CommunicationsConsole
title: comms-console-announcement-title-station
- type: ActivatableUI
key: enum.CommunicationsConsoleUiKey.Key
- type: UserInterface
interfaces:
- key: enum.CommunicationsConsoleUiKey.Key
type: CommunicationsConsoleBoundUserInterface
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: BasicDevice
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSource
range: 200
ports:
- OrderSender
- type: StaticPrice
price: 500

- type: entity
name: handheld research monitor
parent:
- BaseItem
id: HandheldRndMonitor
description: A hand-held crew monitor displaying the status of suit sensors.
components:
- type: Sprite
sprite: Objects/Specific/Tablets/rnd.rsi
state: icon
- type: ResearchClient
- type: ResearchConsole
- type: TechnologyDatabase
- type: ActivatableUI
key: enum.ResearchConsoleUiKey.Key
- type: UserInterface
interfaces:
- key: enum.ResearchConsoleUiKey.Key
type: ResearchConsoleBoundUserInterface
- key: enum.ResearchClientUiKey.Key
type: ResearchClientBoundUserInterface
- type: AccessReader
access: [["Research"]]
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: BasicDevice
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSource
range: 200
ports:
- OrderSender
- type: StaticPrice
price: 500

- type: entity
name: handheld Solar monitor
parent:
- BaseItem
id: HandheldSolarMonitor
description: A hand-held crew monitor displaying the status of suit sensors.
components:
- type: Sprite
sprite: Objects/Specific/Tablets/solar.rsi
state: icon
- type: SolarControlConsole
- type: ActivatableUI
key: enum.SolarControlConsoleUiKey.Key
- type: UserInterface
interfaces:
- key: enum.SolarControlConsoleUiKey.Key
type: SolarControlConsoleBoundUserInterface
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: BasicDevice
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSource
range: 200
ports:
- OrderSender
- type: StaticPrice
price: 500
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.
41 changes: 41 additions & 0 deletions Resources/Textures/Clothing/Head/Hardsuits/kmsuit.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0d34bc7798721c5b45d0600bd18b47709a3f5825",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
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.
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.
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/0d34bc7798721c5b45d0600bd18b47709a3f5825",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions Resources/Textures/Objects/Specific/Tablets/cargo.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by Wizord",
"states": [
{
"name": "icon",
"directions": 1
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions Resources/Textures/Objects/Specific/Tablets/intercom.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by Wizord",
"states": [
{
"name": "icon",
"directions": 1
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions Resources/Textures/Objects/Specific/Tablets/rnd.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by Wizord",
"states": [
{
"name": "icon",
"directions": 1
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading