Merge remote-tracking branch 'upstream/master' into ups
This commit is contained in:
Jabak
@@ -7811,3 +7811,29 @@
|
||||
id: 465
|
||||
time: '2024-08-04T13:54:10.0000000+00:00'
|
||||
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/562
|
||||
- author: Aviu
|
||||
changes:
|
||||
- message: "\u0414\u0435\u0444\u0438\u0431\u0430\u043C\u0438 \u043C\u043E\u0436\u043D\
|
||||
\u043E \u0442\u0435\u043F\u0435\u0440\u044C \u0431\u0438\u0442\u044C \u0436\u0438\
|
||||
\u0432\u044B\u0445."
|
||||
type: Add
|
||||
- message: "\u0414\u0435\u0444\u0438\u0431\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
|
||||
\ \u043C\u043E\u0436\u043D\u043E \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044C\
|
||||
, \u044D\u0442\u043E \u0434\u0430\u0441\u0442 \u0438\u043C \u0432\u043E\u0437\
|
||||
\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0431\u0438\u0442\u044C \u0432\
|
||||
\ \u0431\u043E\u0435\u0432\u043E\u043C \u0440\u0435\u0436\u0438\u043C\u0435\
|
||||
\ \u0440\u0430\u0437 \u0432 5 \u0441\u0435\u043A\u0443\u043D\u0434, \u043D\u0430\
|
||||
\u043D\u043E\u0441\u044F 60 \u0441\u0442\u0430\u043C\u0438\u043D\u044B \u0438\
|
||||
\ \u0440\u043E\u043D\u044F\u044F \u043D\u0430 \u043F\u043E\u043B \u043D\u0430\
|
||||
\ 1.5 \u0441\u0435\u043A\u0443\u043D\u0434\u044B. \u0422\u0430\u043A\u0436\u0435\
|
||||
\ \u0443\u0440\u043E\u043D \u043F\u0440\u0438 \u0443\u0434\u0430\u0440\u0435\
|
||||
\ \u0435\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u043C \u0434\u0435\u0444\u0438\
|
||||
\u0431\u043E\u043C \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\
|
||||
\u0442\u0441\u044F \u0434\u043E 55, \u0432\u0440\u0435\u043C\u044F \u0441\u0442\
|
||||
\u0430\u043D\u0430 \u0443\u0432\u0435\u043B\u0438\u0447\u0438\u0432\u0430\u0435\
|
||||
\u0442\u0441\u044F \u0434\u043E 6, \u0430 \u043A\u0434 \u0443\u043C\u0435\u043D\
|
||||
\u044C\u0448\u0430\u0435\u0442\u0441\u044F \u0434\u043E 1."
|
||||
type: Add
|
||||
id: 466
|
||||
time: '2024-08-05T13:39:31.0000000+00:00'
|
||||
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/567
|
||||
|
||||
@@ -3,6 +3,7 @@ device-pda-slot-component-slot-name-cartridge = Cartridge
|
||||
default-program-name = Program
|
||||
notekeeper-program-name = Notekeeper
|
||||
news-read-program-name = Station news
|
||||
messages-program-name = Messages
|
||||
|
||||
crew-manifest-program-name = Crew manifest
|
||||
crew-manifest-cartridge-loading = Loading ...
|
||||
|
||||
9
Resources/Locale/en-US/radio/components/pda-messages.ftl
Normal file
9
Resources/Locale/en-US/radio/components/pda-messages.ftl
Normal file
@@ -0,0 +1,9 @@
|
||||
messages-pda-error-header = ERROR
|
||||
messages-pda-error-message = An error has occured in the messages system, have you tried turning it off and on again?
|
||||
messages-pda-notification-header = A new message from {$name} has arrived on your PDA
|
||||
messages-pda-connection-error = CONNECTION ERROR
|
||||
messages-pda-unknown-name = Unknown
|
||||
messages-pda-unknown-job = Unassigned
|
||||
messages-pda-user-missing = NAME ENTRY MISSING
|
||||
messages-pda-ui-back = Back
|
||||
messages-pda-chat-choice = Select chat
|
||||
@@ -3,6 +3,7 @@ device-pda-slot-component-slot-name-cartridge = Картридж
|
||||
default-program-name = Программа
|
||||
notekeeper-program-name = Заметки
|
||||
news-read-program-name = Новости станции
|
||||
messages-program-name = Сообщения
|
||||
|
||||
crew-manifest-program-name = Манифест персонала
|
||||
crew-manifest-cartridge-loading = Загрузка ...
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# For the PDA screen
|
||||
comp-pda-ui = ID: [color=white]{ $owner }[/color], [color=yellow]{ CAPITALIZE($jobTitle) }[/color]
|
||||
comp-pda-ui-blank = ID:
|
||||
comp-pda-ui-owner = Владелец: [color=white]{ $actualOwnerName }[/color]
|
||||
comp-pda-ui-owner = Владелец: [color=white]{$actualOwnerName}[/color]
|
||||
comp-pda-io-program-list-button = Программы
|
||||
comp-pda-io-settings-button = Настройки
|
||||
comp-pda-io-program-fallback-title = Программа
|
||||
|
||||
9
Resources/Locale/ru-RU/radio/components/pda-messages.ftl
Normal file
9
Resources/Locale/ru-RU/radio/components/pda-messages.ftl
Normal file
@@ -0,0 +1,9 @@
|
||||
messages-pda-error-header = ОШИБКА
|
||||
messages-pda-error-message = В системе сообщений произошла ошибка, вы пробовали отключить и включить ее снова?
|
||||
messages-pda-notification-header = На ваш ПДА поступило новое сообщение от {$name}
|
||||
messages-pda-connection-error = ОШИБКА СОЕДЕНЕНИЯ
|
||||
messages-pda-unknown-name = Неизвестный
|
||||
messages-pda-unknown-job = Неназначен
|
||||
messages-pda-user-missing = ОТСУТСТВУЕТ ЗАПИСЬ ИМЕНИ
|
||||
messages-pda-ui-back = Назад
|
||||
messages-pda-chat-choice = Выберите чат
|
||||
@@ -17,10 +17,10 @@ ent-ClothingOuterArmorHeavyRed = красный тяжелый бронекос
|
||||
.desc = Тяжело бронированный костюм с красными вставками, способный защитить от высокого урона.
|
||||
.suffix = { "" }
|
||||
ent-ClothingOuterArmorMagusblue = синие доспехи магуса
|
||||
.desc = Синий бронекостюм, обеспечивающий хорошую защиту. Не обладает свойствами волшебной мантии.
|
||||
.desc = Синий бронекостюм, обеспечивающий хорошую защиту. Не обладает свойствами волшебной мантии, но позволяет кастовать заклинание электрической дуги.
|
||||
.suffix = { "" }
|
||||
ent-ClothingOuterArmorMagusred = красные доспехи магуса
|
||||
.desc = Красный бронекостюм, обеспечивающий хорошую защиту. Не обладает свойствами волшебной мантии.
|
||||
.desc = Красный бронекостюм, обеспечивающий хорошую защиту. Не обладает свойствами волшебной мантии, но позволяет кастовать заклинание огненного шара.
|
||||
.suffix = { "" }
|
||||
ent-ClothingOuterArmorRiot = противоударный костюм
|
||||
.desc = Бронежилет с тяжелыми накладками для защиты в ближнем бою, идеально подходит для борьбы с правонарушителями на станции.
|
||||
|
||||
@@ -4,3 +4,9 @@ ent-NotekeeperCartridge = картридж Заметки
|
||||
ent-NetProbeCartridge = картридж NetProbe
|
||||
.desc = Программа для получения адресов и частот сетевых устройств
|
||||
.suffix = { "" }
|
||||
ent-MessagesCartridge = картридж Сообщений
|
||||
.desc = Программа для обмена сообщениями с другими членами экипажа
|
||||
.suffix = { "" }
|
||||
ent-MessagesCartridgeSyndicate = картридж Сообщений Синдиката
|
||||
.desc = Программа для обмена сообщениями с другими агентами Синдиката
|
||||
.suffix = { "" }
|
||||
@@ -0,0 +1,4 @@
|
||||
ent-MessagesServer = сервер сообщений ПДА
|
||||
.desc = Сервер, который позволяет передавать сообщения с помощью ПДА
|
||||
ent-SyndicateMessagesServer = сервер сообщений ПДА Синдиката
|
||||
.desc = Сервер, который позволяет обмениваться сообщениями с помощью ПДА между оперативниками Синдиката.
|
||||
@@ -101,3 +101,23 @@
|
||||
id: BasicDevice
|
||||
name: device-frequency-prototype-name-basic-device
|
||||
frequency: 1280
|
||||
|
||||
- type: deviceFrequency
|
||||
id: NTMessagesServer
|
||||
name: device-frequency-prototype-name-nt-messages-server
|
||||
frequency: 2790
|
||||
|
||||
- type: deviceFrequency
|
||||
id: NTMessagesClient
|
||||
name: device-frequency-prototype-name-nt-messages-client
|
||||
frequency: 2791
|
||||
|
||||
- type: deviceFrequency
|
||||
id: SyndicateMessagesServer
|
||||
name: device-frequency-prototype-name-syndicate-messages-server
|
||||
frequency: 2792
|
||||
|
||||
- type: deviceFrequency
|
||||
id: SyndicateMessagesClient
|
||||
name: device-frequency-prototype-name-syndicate-messages-client
|
||||
frequency: 2793
|
||||
@@ -222,6 +222,10 @@
|
||||
- type: ClothingSpeedModifier
|
||||
walkModifier: 1
|
||||
sprintModifier: 1
|
||||
- type: Tag
|
||||
tags:
|
||||
- WhitelistChameleon
|
||||
- BlueMagusArmor
|
||||
|
||||
- type: entity
|
||||
parent: ClothingOuterArmorMagusblue
|
||||
@@ -233,8 +237,10 @@
|
||||
sprite: Clothing/OuterClothing/Armor/magusred.rsi
|
||||
- type: Clothing
|
||||
sprite: Clothing/OuterClothing/Armor/magusred.rsi
|
||||
|
||||
|
||||
- type: Tag
|
||||
tags:
|
||||
- WhitelistChameleon
|
||||
- RedMagusArmor
|
||||
|
||||
- type: entity
|
||||
parent: ClothingOuterBase
|
||||
|
||||
@@ -101,6 +101,7 @@
|
||||
- Biological
|
||||
- Inorganic
|
||||
- type: Invisibility
|
||||
- type: ThermalBlocker
|
||||
|
||||
- type: entity
|
||||
id: ActionAGhostShowSolar
|
||||
|
||||
@@ -34,6 +34,54 @@
|
||||
state: news_read
|
||||
- type: NewsReaderCartridge
|
||||
|
||||
- type: entity
|
||||
parent: BaseItem
|
||||
id: MessagesCartridge
|
||||
name: messages cartridge
|
||||
description: A program for messageing other crew
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Devices/cartridge.rsi
|
||||
state: cart-y
|
||||
- type: UIFragment
|
||||
ui: !type:MessagesUi
|
||||
- type: Cartridge
|
||||
programName: messages-program-name
|
||||
icon:
|
||||
sprite: Objects/Misc/books.rsi
|
||||
state: book_icon
|
||||
- type: MessagesCartridge
|
||||
- type: DeviceNetwork
|
||||
deviceNetId: Wireless
|
||||
transmitFrequencyId: NTMessagesClient
|
||||
receiveFrequencyId: NTMessagesServer
|
||||
autoConnect: false
|
||||
- type: StationLimitedNetwork
|
||||
|
||||
- type: entity
|
||||
parent: BaseItem
|
||||
id: MessagesCartridgeSyndicate
|
||||
name: syndicate messages cartridge
|
||||
description: A program for messageing other syndicate agents
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Devices/cartridge.rsi
|
||||
state: cart-y
|
||||
- type: UIFragment
|
||||
ui: !type:MessagesUi
|
||||
- type: Cartridge
|
||||
programName: messages-program-name
|
||||
icon:
|
||||
sprite: Objects/Misc/books.rsi
|
||||
state: book_icon
|
||||
- type: MessagesCartridge
|
||||
- type: DeviceNetwork
|
||||
deviceNetId: Wireless
|
||||
transmitFrequencyId: SyndicateMessagesClient
|
||||
receiveFrequencyId: SyndicateMessagesServer
|
||||
autoConnect: false
|
||||
- type: StationLimitedNetwork
|
||||
|
||||
- type: entity
|
||||
parent: BaseItem
|
||||
id: CrewManifestCartridge
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- MessagesCartridge
|
||||
- NewsReaderCartridge
|
||||
- BankCartridge
|
||||
cartridgeSlot:
|
||||
@@ -682,6 +683,7 @@
|
||||
preinstalled:
|
||||
- CrewManifestCartridge
|
||||
- NotekeeperCartridge
|
||||
- MessagesCartridge
|
||||
- NewsReaderCartridge
|
||||
- LogProbeCartridge
|
||||
|
||||
@@ -766,6 +768,7 @@
|
||||
uiKey: enum.PdaUiKey.Key
|
||||
preinstalled:
|
||||
- NotekeeperCartridge
|
||||
- MessagesCartridgeSyndicate
|
||||
cartridgeSlot:
|
||||
priority: -1
|
||||
name: Cartridge
|
||||
@@ -1067,6 +1070,7 @@
|
||||
uiKey: enum.PdaUiKey.Key
|
||||
preinstalled:
|
||||
- NotekeeperCartridge
|
||||
- MessagesCartridgeSyndicate
|
||||
cartridgeSlot:
|
||||
priority: -1
|
||||
name: Cartridge
|
||||
|
||||
@@ -35,6 +35,9 @@
|
||||
zapHeal:
|
||||
types:
|
||||
Asphyxiation: -40
|
||||
emaggedAttackWhitelist:
|
||||
components:
|
||||
- Stamina
|
||||
- type: DoAfter
|
||||
- type: UseDelay
|
||||
- type: StaticPrice
|
||||
|
||||
@@ -101,7 +101,7 @@
|
||||
- type: Clothing
|
||||
sprite: White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi
|
||||
- type: Item
|
||||
sprite: White/Objects/Weapons/Guns/Revolvers/inspector-inhand.rsi
|
||||
sprite: White/Objects/Weapons/Guns/Revolvers/inspector-inhands.rsi
|
||||
- type: RevolverAmmoProvider
|
||||
capacity: 6
|
||||
chambers: [ True, True, True, True, True, True ]
|
||||
|
||||
@@ -28,3 +28,5 @@
|
||||
deleteOnDrop: true
|
||||
- type: ToolForcePowered
|
||||
- type: DeleteOnChangelingRefund
|
||||
- type: MeleeBlock
|
||||
delay: 12.1
|
||||
|
||||
@@ -82,6 +82,8 @@
|
||||
- suitStorage
|
||||
- type: DisarmMalus
|
||||
- type: CultItem
|
||||
- type: MeleeBlock
|
||||
delay: 12.1
|
||||
|
||||
- type: entity
|
||||
name: unholy halberd
|
||||
@@ -123,3 +125,5 @@
|
||||
- type: UseDelay
|
||||
delay: 1
|
||||
- type: CultItem
|
||||
- type: MeleeBlock
|
||||
delay: 12.1
|
||||
|
||||
@@ -34,6 +34,9 @@
|
||||
soundGunshot: /Audio/Weapons/plasma_cutter.ogg
|
||||
fireRate: 1
|
||||
useKey: false
|
||||
selectedMode: FullAuto
|
||||
availableModes:
|
||||
- FullAuto
|
||||
- type: RechargeBasicEntityAmmo
|
||||
rechargeCooldown: 0.5
|
||||
rechargeSound:
|
||||
@@ -95,8 +98,6 @@
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Weapons/Melee/crusher_glaive.rsi
|
||||
- type: UseDelay
|
||||
delay: 1.9
|
||||
- type: LeechOnMarker
|
||||
leech:
|
||||
groups:
|
||||
|
||||
@@ -64,6 +64,8 @@
|
||||
- Belt
|
||||
- SuitStorage
|
||||
- type: DisarmMalus
|
||||
- type: MeleeBlock
|
||||
delay: 12.1
|
||||
|
||||
- type: entity
|
||||
name: energy katana
|
||||
@@ -164,6 +166,8 @@
|
||||
deconstructionTarget: null
|
||||
graph: SwordGraph
|
||||
node: sword
|
||||
- type: MeleeBlock
|
||||
delay: 12.1
|
||||
|
||||
- type: entity
|
||||
name: cutlass
|
||||
@@ -189,6 +193,8 @@
|
||||
size: Large
|
||||
sprite: Objects/Weapons/Melee/cutlass.rsi
|
||||
- type: DisarmMalus
|
||||
- type: MeleeBlock
|
||||
delay: 12.1
|
||||
|
||||
- type: entity
|
||||
name: The Throngler
|
||||
|
||||
@@ -80,3 +80,69 @@
|
||||
- EncryptionKeySecurity
|
||||
- EncryptionKeyService
|
||||
- EncryptionKeyCommand
|
||||
|
||||
- type: entity
|
||||
id: MessagesServer
|
||||
parent: BaseMachinePowered
|
||||
name: PDA messaging server
|
||||
description: Server that allows PDA messaging to function on the station.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Structures/Machines/server.rsi
|
||||
layers:
|
||||
- state: server
|
||||
- state: variant-research
|
||||
- type: ApcPowerReceiver
|
||||
powerLoad: 200
|
||||
- type: ExtensionCableReceiver
|
||||
- type: Destructible
|
||||
thresholds:
|
||||
- trigger:
|
||||
!type:DamageTrigger
|
||||
damage: 600
|
||||
behaviors:
|
||||
- !type:DoActsBehavior
|
||||
acts: [ "Destruction" ]
|
||||
- trigger:
|
||||
!type:DamageTrigger
|
||||
damage: 300
|
||||
behaviors:
|
||||
- !type:DoActsBehavior
|
||||
acts: ["Destruction"]
|
||||
- !type:PlaySoundBehavior
|
||||
sound:
|
||||
collection: MetalBreak
|
||||
- !type:SpawnEntitiesBehavior
|
||||
spawn:
|
||||
SheetSteel1:
|
||||
min: 1
|
||||
max: 2
|
||||
- type: Appearance
|
||||
- type: AmbientSound
|
||||
volume: -9
|
||||
range: 5
|
||||
sound:
|
||||
path: /Audio/Ambience/Objects/server_fans.ogg
|
||||
- type: MessagesServer
|
||||
- type: SingletonDeviceNetServer
|
||||
- type: DeviceNetwork
|
||||
deviceNetId: Wireless
|
||||
transmitFrequencyId: NTMessagesServer
|
||||
receiveFrequencyId: NTMessagesClient
|
||||
autoConnect: false
|
||||
- type: StationLimitedNetwork
|
||||
|
||||
- type: entity
|
||||
id: SyndicateMessagesServer
|
||||
parent: MessagesServer
|
||||
name: Syndicate PDA messaging server
|
||||
description: Server that allows PDA messaging between Syndicate operatives to function.
|
||||
components:
|
||||
- type: MessagesServer
|
||||
- type: StationLimitedNetwork
|
||||
- type: SingletonDeviceNetServer
|
||||
- type: DeviceNetwork
|
||||
deviceNetId: Wireless
|
||||
transmitFrequencyId: SyndicateMessagesServer
|
||||
receiveFrequencyId: SyndicateMessagesClient
|
||||
autoConnect: false
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobSalvageSpecialist
|
||||
time: 9999999999 # 15 hours 54000
|
||||
time: 54000 # 15 hours
|
||||
|
||||
# Head
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobClown
|
||||
time: 9999999999 # 30 hours as clown required to ascend 108000
|
||||
time: 108000 # 30 hours as clown required to ascend
|
||||
|
||||
- type: loadoutEffectGroup # WD
|
||||
id: MedalClownTimer
|
||||
@@ -15,7 +15,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobClown
|
||||
time: 9999999999 # 10 hours 36000
|
||||
time: 36000 # 10 hours
|
||||
|
||||
# Head
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobJanitor
|
||||
time: 9999999999 # 10 hours 36000
|
||||
time: 36000 # 10 hours
|
||||
|
||||
# Head
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobPassenger
|
||||
time: 9999999999 #10 hrs, silly reward for people who play passenger a lot 36000
|
||||
time: 36000 #10 hrs, silly reward for people who play passenger a lot
|
||||
|
||||
# Face
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobHeadOfPersonnel
|
||||
time: 9999999999 #15 hrs, special reward for HoP mains 54000
|
||||
time: 54000 #15 hrs, special reward for HoP mains
|
||||
|
||||
# Jumpsuit
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobAtmosphericTechnician
|
||||
time: 9999999999 #6 hrs 21600
|
||||
time: 21600 #6 hrs
|
||||
- !type:JobRequirementLoadoutEffect
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobStationEngineer
|
||||
time: 9999999999 #6 hrs 21600
|
||||
time: 21600 #6 hrs
|
||||
- !type:JobRequirementLoadoutEffect
|
||||
requirement:
|
||||
!type:DepartmentTimeRequirement
|
||||
department: Engineering
|
||||
time: 9999999999 # 60 hrs 216000
|
||||
time: 216000 # 60 hrs
|
||||
|
||||
# Head
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobChemist
|
||||
time: 9999999999 #6 hrs 21600
|
||||
time: 21600 #6 hrs
|
||||
- !type:JobRequirementLoadoutEffect
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobMedicalDoctor
|
||||
time: 9999999999 #6 hrs 21600
|
||||
time: 21600 #6 hrs
|
||||
- !type:JobRequirementLoadoutEffect
|
||||
requirement:
|
||||
!type:DepartmentTimeRequirement
|
||||
department: Medical
|
||||
time: 9999999999 # 60 hrs 216000
|
||||
time: 216000 # 60 hrs
|
||||
|
||||
# Head
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:DepartmentTimeRequirement
|
||||
department: Science
|
||||
time: 9999999999 #60 hrs 216000
|
||||
time: 216000 #60 hrs
|
||||
|
||||
# Head
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobWarden
|
||||
time: 9999999999 #6 hrs 21600
|
||||
time: 21600 #6 hrs
|
||||
- !type:JobRequirementLoadoutEffect
|
||||
requirement:
|
||||
!type:DepartmentTimeRequirement
|
||||
department: Security
|
||||
time: 9999999999 # 60 hrs 216000
|
||||
time: 216000 # 60 hrs
|
||||
|
||||
# Head
|
||||
- type: itemLoadout
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobPassenger
|
||||
time: 9999999999 # 50 hours 180000
|
||||
time: 180000 # 50 hours
|
||||
|
||||
# Bottom
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
requirement:
|
||||
!type:RoleTimeRequirement
|
||||
role: JobLibrarian
|
||||
time: 9999999999 # 1 hour of being the biggest nerd on the station 3600
|
||||
time: 3600 # 1 hour of being the biggest nerd on the station
|
||||
|
||||
- type: loadoutEffectGroup
|
||||
id: JensenTimer
|
||||
@@ -15,7 +15,7 @@
|
||||
requirement:
|
||||
!type:DepartmentTimeRequirement
|
||||
department: Cargo
|
||||
time: 9999999999 #5 hours of being a space trucker 18000
|
||||
time: 18000 #5 hours of being a space trucker
|
||||
|
||||
# Basic options
|
||||
# Glasses
|
||||
|
||||
@@ -5,6 +5,9 @@
|
||||
components:
|
||||
- type: Magic
|
||||
requiresClothes: true
|
||||
clothingWhitelist:
|
||||
tags:
|
||||
- BlueMagusArmor
|
||||
- type: WorldTargetAction
|
||||
itemIconStyle: BigAction
|
||||
useDelay: 60
|
||||
@@ -29,7 +32,7 @@
|
||||
prototype: ProjectileTeslaBall
|
||||
posData: !type:TargetCasterPos
|
||||
- type: VariableUseDelay
|
||||
useDelay: 5
|
||||
useDelay: 10
|
||||
altUseDelay: 5
|
||||
chargeUseDelay: 30
|
||||
|
||||
@@ -63,7 +66,7 @@
|
||||
speech: "EL DRITCH!"
|
||||
- type: VariableUseDelay
|
||||
useDelay: 6
|
||||
altUseDelay: 2
|
||||
altUseDelay: 3
|
||||
chargeUseDelay: 30
|
||||
|
||||
- type: entity
|
||||
@@ -73,6 +76,9 @@
|
||||
components:
|
||||
- type: Magic
|
||||
requiresClothes: true
|
||||
clothingWhitelist:
|
||||
tags:
|
||||
- RedMagusArmor
|
||||
- type: WorldTargetAction
|
||||
itemIconStyle: BigAction
|
||||
useDelay: 60
|
||||
@@ -128,7 +134,7 @@
|
||||
posData: !type:TargetCasterPos
|
||||
speech: "SHIZO NERO!"
|
||||
- type: VariableUseDelay
|
||||
useDelay: 4
|
||||
useDelay: 5
|
||||
altUseDelay: 1
|
||||
chargeUseDelay: 30
|
||||
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
thresholds:
|
||||
- trigger:
|
||||
!type:DamageTrigger
|
||||
damage: 150
|
||||
damage: 100
|
||||
behaviors:
|
||||
- !type:DoActsBehavior
|
||||
acts: [ "Destruction" ]
|
||||
- type: Reflect
|
||||
reflectProb: 0.5
|
||||
reflectProb: 0.25
|
||||
reflects:
|
||||
- Energy
|
||||
- type: ReturnItemOnThrow
|
||||
|
||||
@@ -341,6 +341,7 @@
|
||||
sprite: White/Objects/Weapons/Chaplain/pitchfork.rsi
|
||||
state: icon
|
||||
- type: MeleeWeapon
|
||||
range: 2
|
||||
wideAnimationRotation: -135
|
||||
damage:
|
||||
types:
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
|
||||
- type: MeleeWeapon
|
||||
autoAttack: true
|
||||
attackRate: 4
|
||||
attackRate: 5
|
||||
damage:
|
||||
types:
|
||||
Slash: 10
|
||||
@@ -39,7 +39,7 @@
|
||||
wideAnimationRotation: 135
|
||||
damage:
|
||||
types:
|
||||
Slash: 30
|
||||
Slash: 35
|
||||
- type: Clothing
|
||||
quickEquip: false
|
||||
sprite: White/Objects/Weapons/Chaplain/spellblade.rsi
|
||||
|
||||
@@ -93,3 +93,9 @@
|
||||
|
||||
- type: Tag
|
||||
id: UnoCard
|
||||
|
||||
- type: Tag
|
||||
id: RedMagusArmor
|
||||
|
||||
- type: Tag
|
||||
id: BlueMagusArmor
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 606 B After Width: | Height: | Size: 638 B |
Binary file not shown.
|
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 513 B |
Binary file not shown.
|
Before Width: | Height: | Size: 526 B After Width: | Height: | Size: 499 B |
Binary file not shown.
|
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 461 B |
Binary file not shown.
|
Before Width: | Height: | Size: 412 B After Width: | Height: | Size: 441 B |
Binary file not shown.
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 479 B |
Binary file not shown.
|
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 514 B |
Binary file not shown.
|
Before Width: | Height: | Size: 528 B After Width: | Height: | Size: 485 B |
Binary file not shown.
|
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 485 B |
Binary file not shown.
|
Before Width: | Height: | Size: 304 B After Width: | Height: | Size: 544 B |
Binary file not shown.
|
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 438 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.4 KiB |
@@ -269,3 +269,6 @@ ComfyChairCargo: BrownComfyChair
|
||||
ComfyChairService: GreenComfyChair
|
||||
|
||||
BoxTrashbag: TrashBag
|
||||
|
||||
# 2024-08-05 WD
|
||||
OmntnsHammer: JudgeHammer
|
||||
|
||||
Reference in New Issue
Block a user