diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/blue.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/blue.ogg new file mode 100644 index 00000000000..9aac7ef75a9 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/blue.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/delta.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/delta.ogg new file mode 100644 index 00000000000..3eb18f990ed Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/delta.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/epsilon.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/epsilon.ogg new file mode 100644 index 00000000000..76f7dc78f0a Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/epsilon.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/gamma.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/gamma.ogg new file mode 100644 index 00000000000..edda61e5b6b Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/gamma.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/green.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/green.ogg new file mode 100644 index 00000000000..229eb4f31a9 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/green.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/red.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/red.ogg new file mode 100644 index 00000000000..51a4b5fc2d7 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/red.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/violet.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/violet.ogg new file mode 100644 index 00000000000..e39be1c5228 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/violet.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/white.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/white.ogg new file mode 100644 index 00000000000..99ce42c4b75 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/white.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/alerts/yellow.ogg b/Resources/Audio/Announcers/_AFONYA/alerts/yellow.ogg new file mode 100644 index 00000000000..684fb9466d4 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/alerts/yellow.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/comms/announce.ogg b/Resources/Audio/Announcers/_AFONYA/comms/announce.ogg new file mode 100644 index 00000000000..bf6f84d7739 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/comms/announce.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/comms/attention.ogg b/Resources/Audio/Announcers/_AFONYA/comms/attention.ogg new file mode 100644 index 00000000000..0df46fcafab Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/comms/attention.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/comms/command_report.ogg b/Resources/Audio/Announcers/_AFONYA/comms/command_report.ogg new file mode 100644 index 00000000000..3109d4ab235 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/comms/command_report.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/comms/war.ogg b/Resources/Audio/Announcers/_AFONYA/comms/war.ogg new file mode 100644 index 00000000000..4da9bca55ba Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/comms/war.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/anomaly.ogg b/Resources/Audio/Announcers/_AFONYA/events/anomaly.ogg new file mode 100644 index 00000000000..ff9cde17433 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/anomaly.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/bluespace_artifact.ogg b/Resources/Audio/Announcers/_AFONYA/events/bluespace_artifact.ogg new file mode 100644 index 00000000000..b4f3dbc56de Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/bluespace_artifact.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/breaker_flip.ogg b/Resources/Audio/Announcers/_AFONYA/events/breaker_flip.ogg new file mode 100644 index 00000000000..4a5e6aa828c Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/breaker_flip.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/bureaucratic_error.ogg b/Resources/Audio/Announcers/_AFONYA/events/bureaucratic_error.ogg new file mode 100644 index 00000000000..85f61f5fcae Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/bureaucratic_error.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/cargo-gifts-event-announcement.ogg b/Resources/Audio/Announcers/_AFONYA/events/cargo-gifts-event-announcement.ogg new file mode 100644 index 00000000000..71b496dc9eb Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/cargo-gifts-event-announcement.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/clerical_error.ogg b/Resources/Audio/Announcers/_AFONYA/events/clerical_error.ogg new file mode 100644 index 00000000000..95383e0f361 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/clerical_error.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/gas_leak-complete.ogg b/Resources/Audio/Announcers/_AFONYA/events/gas_leak-complete.ogg new file mode 100644 index 00000000000..8d1ed065c0a Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/gas_leak-complete.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/gas_leak.ogg b/Resources/Audio/Announcers/_AFONYA/events/gas_leak.ogg new file mode 100644 index 00000000000..6e0ee336707 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/gas_leak.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/immovable_rod_spawn.ogg b/Resources/Audio/Announcers/_AFONYA/events/immovable_rod_spawn.ogg new file mode 100644 index 00000000000..7a69eb3d955 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/immovable_rod_spawn.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/ion_storm.ogg b/Resources/Audio/Announcers/_AFONYA/events/ion_storm.ogg new file mode 100644 index 00000000000..9d45304f0b9 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/ion_storm.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/kudzu_growth.ogg b/Resources/Audio/Announcers/_AFONYA/events/kudzu_growth.ogg new file mode 100644 index 00000000000..0820a33993a Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/kudzu_growth.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/meteors-complete.ogg b/Resources/Audio/Announcers/_AFONYA/events/meteors-complete.ogg new file mode 100644 index 00000000000..4f3e15b5fe9 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/meteors-complete.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/meteors.ogg b/Resources/Audio/Announcers/_AFONYA/events/meteors.ogg new file mode 100644 index 00000000000..1e93abfeebd Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/meteors.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/migration.ogg b/Resources/Audio/Announcers/_AFONYA/events/migration.ogg new file mode 100644 index 00000000000..e0187996cff Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/migration.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/power_grid_check-complete.ogg b/Resources/Audio/Announcers/_AFONYA/events/power_grid_check-complete.ogg new file mode 100644 index 00000000000..03e5e3f4197 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/power_grid_check-complete.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/power_grid_check.ogg b/Resources/Audio/Announcers/_AFONYA/events/power_grid_check.ogg new file mode 100644 index 00000000000..9d0ef686d14 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/power_grid_check.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/solar_flare-complete.ogg b/Resources/Audio/Announcers/_AFONYA/events/solar_flare-complete.ogg new file mode 100644 index 00000000000..7992ac4630a Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/solar_flare-complete.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/solar_flare.ogg b/Resources/Audio/Announcers/_AFONYA/events/solar_flare.ogg new file mode 100644 index 00000000000..845e23802f7 Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/solar_flare.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/events/vent_clog.ogg b/Resources/Audio/Announcers/_AFONYA/events/vent_clog.ogg new file mode 100644 index 00000000000..4e797b20c6e Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/events/vent_clog.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/fallback.ogg b/Resources/Audio/Announcers/_AFONYA/fallback.ogg new file mode 100644 index 00000000000..0df46fcafab Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/fallback.ogg differ diff --git a/Resources/Audio/Announcers/_AFONYA/shuttle/called.ogg b/Resources/Audio/Announcers/_AFONYA/shuttle/called.ogg new file mode 100644 index 00000000000..cdbcdbdd07f Binary files /dev/null and b/Resources/Audio/Announcers/_AFONYA/shuttle/called.ogg differ diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 8808b1f819a..d6f85d9010a 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2907,3 +2907,68 @@ id: 154 time: '2024-12-21T14:26:43.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/350 +- author: Remuchi + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u044D\u043B\u044C\ + \u0444\u0438\u0439\u0441\u043A\u0438\u0435 \u0443\u0448\u043A\u0438 \u0434\u043B\ + \u044F \u0441\u043B\u0430\u0439\u043C\u043E\u043B\u044E\u0434\u0435\u0439." + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0436\u0438\u0432\ + \u043E\u0442\u043D\u044B\u0435 \u0443\u0448\u043A\u0438 \u0438 \u0445\u0432\u043E\ + \u0441\u0442\u0438\u043A\u0438 \u0434\u043B\u044F \u0441\u043B\u0430\u0439\u043C\ + \u043E\u043B\u044E\u0434\u0435\u0439 \u0434\u043B\u044F \u0441\u043F\u043E\u043D\ + \u0441\u043E\u0440\u043E\u0432." + type: Add + id: 155 + time: '2024-12-22T15:34:20.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/345 +- author: Kest + changes: + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0434\u043B\u044F \u0438\u0433\ + \u0440\u044B \u043D\u0430 \u043E\u0444\u0438\u0446\u0435\u0440\u0435 \u0441\u043D\ + \u043E\u0432\u0430 \u043D\u0443\u0436\u043D\u043E \u043D\u0430\u0438\u0433\u0440\ + \u0430\u0442\u044C 4 \u0447\u0430\u0441\u0430 \u0432 \u0441\u0431! (\u0431\u044B\ + \u043B\u043E 0\u0447)" + type: Tweak + id: 156 + time: '2024-12-22T22:02:35.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/358 +- author: Kest + changes: + - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043F\u0430\u043F\u043A\u0430\ + \ \u0441 \u043A\u043E\u0434\u0430\u043C\u0438 \u044F\u0434\u0435\u0440\u043D\ + \u043E\u0439 \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u0438\ + \ \u0438\u0437 \u0448\u043A\u0430\u0444\u0430 \u043A\u0430\u043F\u0438\u0442\ + \u0430\u043D\u0430" + type: Remove + - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u0432\u043E\u0437\u043C\u043E\u0436\ + \u043D\u043E\u0441\u0442\u044C \u043A\u0443\u043F\u0438\u0442\u044C \u0441\u043A\ + \u0430\u0444\u0430\u043D\u0434\u0440 Guan-Yu \u0432 \u043A\u0430\u0440\u0433\ + \u043E" + type: Remove + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ + \u0439\u0442\u044B \u043A\u0430\u0431\u0435\u043B\u0435\u0439" + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u0441\u0438\u0441\u0442\ + \u0435\u043C\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u043D\u043E\u0436\u0435\ + \u043D \u0443 \u043A\u0430\u0442\u0430\u043D\u044B" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u043D\ + \u0438\u043C\u0430\u0446\u0438\u044F \u043A\u0440\u0438\u043E\u043A\u0430\u043F\ + \u0441\u0443\u043B\u044B" + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u043D\u0435\u043E\ + \u043D\u043E\u0432\u044B\u0439 \u0431\u043E\u0442\u0438\u043D\u043E\u043A \u0443\ + \ \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430 \u042D\u0421" + type: Fix + id: 157 + time: '2024-12-23T10:37:56.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/325 +- author: Evgencheg + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0437\u0432\ + \u0443\u0447\u043A\u0430 \u0430\u0444\u043E\u043D\u0438. CASSIE" + type: Add + id: 158 + time: '2024-12-24T13:08:56.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/362 diff --git a/Resources/Locale/en-US/_LostParadise/update20.ftl b/Resources/Locale/en-US/_LostParadise/update20.ftl index 27f614e16ce..2e79605a84f 100644 --- a/Resources/Locale/en-US/_LostParadise/update20.ftl +++ b/Resources/Locale/en-US/_LostParadise/update20.ftl @@ -4,7 +4,8 @@ trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OO trait-name-DwarfLanguage = Дворфийский trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц changelog-tab-title-ChangelogLPP = Обновления Lost Paradise -announcer-NTH-name = N.T.H +announcer-NTH-name = N.T.H. +announcer-AFONYA-name = C.A.S.S.I.E. chatsan-awoo = воет chatsan-hiss = шипит chatsan-nyaaa = някает diff --git a/Resources/Locale/ru-RU/_LostParadise/update20.ftl b/Resources/Locale/ru-RU/_LostParadise/update20.ftl index 27f614e16ce..2e79605a84f 100644 --- a/Resources/Locale/ru-RU/_LostParadise/update20.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/update20.ftl @@ -4,7 +4,8 @@ trait-desc-ElfLanguage = Вы знаете Эльфийский (Нет, не OO trait-name-DwarfLanguage = Дворфийский trait-desc-DwarfLanguage = Если не вслушиваться похоже на бубнёж русских пьяниц changelog-tab-title-ChangelogLPP = Обновления Lost Paradise -announcer-NTH-name = N.T.H +announcer-NTH-name = N.T.H. +announcer-AFONYA-name = C.A.S.S.I.E. chatsan-awoo = воет chatsan-hiss = шипит chatsan-nyaaa = някает diff --git a/Resources/Prototypes/Announcers/!randomAnnouncers.yml b/Resources/Prototypes/Announcers/!randomAnnouncers.yml index b0b3c670037..8a24c9fc39a 100644 --- a/Resources/Prototypes/Announcers/!randomAnnouncers.yml +++ b/Resources/Prototypes/Announcers/!randomAnnouncers.yml @@ -1,4 +1,5 @@ - type: weightedRandom id: RandomAnnouncers weights: - NTH: 1 + NTH: 0.5 + AFONYA: 0.5 diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml index 5fe9eae1f7f..807e669e570 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_hardsuits.yml @@ -47,10 +47,20 @@ sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi state: icon product: CrateSecurityShanlinTacsuit - cost: 30000 + cost: 17500 category: cargoproduct-category-name-hardsuits group: market +#- type: cargoProduct +# id: SecurityGuanYuTacsuit +# icon: +# sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/juggernaut.rsi +# state: icon +# product: CrateSecurityGuanYuTacsuit +# cost: 30000 +# category: cargoproduct-category-name-hardsuits +# group: market + - type: cargoProduct id: SecurityBaghaturTacsuit icon: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 8c387f5b139..01f1bc870a9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -55,10 +55,6 @@ - id: RubberStampCaptain # - id: WeaponAntiqueLaser # DeltaV - Remove in favor of the glass box - id: JetpackCaptainFilled - # - < DarkSide - - id: LPPBoxFolderSecretCap - - id: LPPBoxFolderCap - # - > - id: MedalCase - id: LunchboxCommandFilledRandom # Delta-V Lunchboxes! prob: 0.3 @@ -82,11 +78,6 @@ - id: WeaponDisabler - id: CommsComputerCircuitboard - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - # - < DarkSide - - id: LPPBoxFolderSecretCap - - id: LPPBoxFolderCap - # - > - id: PlushieNuke prob: 0.1 - id: CigarGoldCase @@ -115,10 +106,6 @@ contents: - id: ClothingOuterArmorCaptainCarapace - id: NukeDisk - # - < DarkSide - - id: LPPBoxFolderSecretCap - - id: LPPBoxFolderCap - # - > - id: PinpointerNuclear # - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat. - id: WeaponDisabler diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml index 141349e827f..70c0f846425 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml @@ -3,10 +3,12 @@ parent: ClothingBeltKatanaSheath suffix: Filled components: - - type: StorageFill - contents: - - id: Wakizashi - - id: Katana + - type: ContainerFill + containers: + katana: + - Katana + wakizashi: + - Wakizashi - type: entity id: ClothingBeltKatanaSheathFilledHoS diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index d064cc187c4..6c02ff008e5 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -69,6 +69,12 @@ - type: Cable cableDroppedOnCutPrototype: CableHVStack1 cableType: HighVoltage + - type: DamageVisuals + thresholds: [4, 8, 12] + damageDivisor: 3.333 + trackAllDamage: true + damageOverlay: + sprite: Structures/Power/Cables/hv_cable_damage.rsi - type: Destructible thresholds: - trigger: @@ -105,11 +111,9 @@ description: A medium voltage power cable. components: - type: Sprite - color: Yellow sprite: Structures/Power/Cables/mv_cable.rsi state: mvcable_0 - type: Icon - color: Yellow sprite: Structures/Power/Cables/mv_cable.rsi state: mvcable_4 - type: NodeContainer @@ -149,11 +153,9 @@ description: A cable used to connect machines to an APC. #APCs aren't area defined anymore so need this cable to connect things to the APC. This description should be dynamic in future. components: - type: Sprite - color: Green sprite: Structures/Power/Cables/lv_cable.rsi state: lvcable_0 - type: Icon - color: Green sprite: Structures/Power/Cables/lv_cable.rsi state: lvcable_4 - type: NodeContainer diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index 8847f8d03a9..293f16f852b 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -37,7 +37,7 @@ sprite: Nyanotrasen/Clothing/Belt/Martial/black.rsi - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltBase, ClothingSlotBase] id: ClothingBeltKatanaSheath name: katana sheaths description: An ornate belt designed to hold a pair of samurai's blades, or daisho. @@ -47,18 +47,42 @@ state: sheath - type: Clothing sprite: Nyanotrasen/Clothing/Belt/katanasheath.rsi - - type: Storage - grid: - - 0,0,3,1 - whitelist: - tags: - - Katana + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + katana: !type:ContainerSlot + wakizashi: !type:ContainerSlot + - type: ItemSlots + slots: + katana: + name: Katana + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg + ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg + whitelist: + tags: + - Katana + wakizashi: + name: Wakizashi + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/SimpleStation14/Items/Handling/sword_sheath.ogg + ejectSound: /Audio/SimpleStation14/Items/Handling/sword_unsheath.ogg + whitelist: + tags: + - Wakizashi - type: ItemMapper mapLayers: - sheath-sabre: + sheath-katana: whitelist: tags: - Katana + sheath-wakizashi: + whitelist: + tags: + - Wakizashi - type: Appearance - type: Tag tags: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml index f2604f044fd..8ec0cb2985f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml @@ -6,7 +6,7 @@ components: - type: Tag tags: - - Katana + - Wakizashi - type: Sharp - type: Utensil types: diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index e38dce107df..80d2be5d07b 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -8,6 +8,7 @@ min: 160 - !type:CharacterDepartmentTimeRequirement department: Security + min: 14400 # DeltaV - 4 hours startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/_LostParadise/Announcers/AFONYA.yml b/Resources/Prototypes/_LostParadise/Announcers/AFONYA.yml new file mode 100644 index 00000000000..e150dacc0a3 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Announcers/AFONYA.yml @@ -0,0 +1,134 @@ +- type: announcer + id: AFONYA # Localized as "announcer--name" in chat + basePath: /Audio/Announcers/_AFONYA # Where to start looking for audio files + baseAudioParams: # Default audio parameters for all announcements, all options explained in the template announcement + volume: -7 # If this announcer is really loud, lower it to match the others' volume #? Default is 3 + announcements: # List of all announcements this announcer has audio for #! Comment out unused announcements, don't remove them + # Communications + - id: announce # Communications console + path: comms/announce.ogg + - id: attention # Generic alert sound # Should be different from fallback but it's very similar + path: comms/attention.ogg + - id: commandReport # Station goal, Central Command messages, etc + path: comms/command_report.ogg +# - id: spawnAnnounce # Captain join # TODO That system is annoyingly not modular +# path: comms/spawn_announce.ogg + - id: war # Nuclear Operative declaration of war + path: comms/war.ogg +# - id: nukeCodes # The station has been send nuclear activation codes +# path: comms/nuke_codes.ogg # Or command_report.ogg if you want +# - id: nukeArm # The nuke is active and ticking +# path: comms/nuke_arm.ogg +# - id: nukeDisarm # The nuke has been disarmed +# path: comms/nuke_disarm.ogg +# - id: welcome # The shift has started +# path: comms/welcome.ogg + + # Alert levels + - id: alertGreen # Everything is fine + path: alerts/green.ogg + - id: alertBlue # Something is amiss + path: alerts/blue.ogg + - id: alertViolet # Viral infection or misc medical emergencies, listen to Medical + path: alerts/violet.ogg + - id: alertWhite # Glimmer is too high, listen to Epistemics + path: alerts/white.ogg + - id: alertYellow # The station is being largely damaged, listen to Engineering + path: alerts/yellow.ogg + - id: alertRed # Generic many things are bad, listen to Security + path: alerts/red.ogg + - id: alertGamma # There is a massive immediate threat to the station, listen to Central Command + path: alerts/gamma.ogg + - id: alertDelta # The station is being or about to be massively destroyed, run for your life + path: alerts/delta.ogg + - id: alertEpsilon # The station has been terminated, good luck survivors! + path: alerts/epsilon.ogg + + # Events + ## Wizard's Den + ### Mid-Round Antagonists + - id: ninjaHacking # A Ninja is hacking something + path: comms/ninja_hacking.ogg + - id: powersinkExplosion # A power sink is about to overcharge and explode + path: comms/powersink_explosion.ogg + ### Events + - id: anomalySpawn # An anomaly has spawned in a random place + path: events/anomaly.ogg + - id: bluespaceArtifact # An artifact has spawned in a random place + path: events/bluespace_artifact.ogg +# - id: bluespaceLocker # Two random lockers now share inventories +# path: events/bluespace_locker.ogg + - id: breakerFlip # A few random APCs have been disabled, ask Engineering to fix them + path: events/breaker_flip.ogg + - id: bureaucraticError # Random jobs have been added, removed, or made infinite + path: events/bureaucratic_error.ogg + - id: clericalError # Random crew are removed from the manifest + path: events/clerical_error.ogg + - id: carpRift # A dragon's carp rift is active + path: events/carp_rift.ogg + - id: revenantSpawn # A revenant has spawned (by a prober?) + path: events/revenant_spawn.ogg + - id: gasLeak # A random gas is coming out of a random vent + path: events/gas_leak.ogg + - id: gasLeakComplete # Gas has stopped coming out of a vent + path: events/gas_leak-complete.ogg + - id: kudzuGrowth # Kudzu is growing in a random place + path: events/kudzu_growth.ogg + - id: meteorSwarm # Meteors are flying at the station, stay away from windows + path: events/meteors.ogg + - id: meteorSwarmComplete # Meteors have stopped flying at the station + path: events/meteors-complete.ogg +# - id: mouseMigration # Several mice have appeared in a random place +# path: events/mouse_migration.ogg + - id: cockroachMigration # Several cockroaches have appeared in a random place + path: events/migration.ogg + - id: powerGridCheck # The station's power is offline for some moments + path: events/power_grid_check.ogg + - id: powerGridCheckComplete # The station's power is online again + path: events/power_grid_check-complete.ogg + - id: randomSentience # A random few animals have become sentient + path: events/random_sentience.ogg + - id: solarFlare # A solar flare is nearby, may mess with comms and electronics + path: events/solar_flare.ogg + - id: solarFlareComplete # The solar flare has passed + path: events/solar_flare-complete.ogg + - id: ventClog # A random reagent is coming out of a scrubber + path: events/vent_clog.ogg + - id: slimesSpawn # Some simple slimes are appearing in vents + path: events/migration.ogg + - id: spiderSpawn # Some simple spiders are appearing in vents + path: events/migration.ogg + - id: immovableRodSpawn # The station is moving into an immovable rod, don't die or something, ask Engineering for help repairing it + path: events/immovable_rod_spawn.ogg + - id: ionStorm # AI-controlled equipment are now weird, check their laws + path: events/ion_storm.ogg + ## Delta-V +# - id: xenoVents # Xenomorphs are coming out of vents +# path: events/aliens.ogg + ## NyanoTrasen +# - id: noosphericStorm # A large amount of glimmer has joined the station and made people psionic +# path: events/noospheric_storm.ogg + + # Shuttle + - id: shuttleCalled # The shuttle is on its way + path: shuttle/called.ogg + - id: shuttleRecalled # The shuttle is going back to Central Command + path: shuttle/recalled.ogg + - id: shuttleDock # The shuttle has arrived at the station + path: shuttle/docked.ogg +# - id: shuttleNearby # The shuttle couldn't dock, it's at a specified location +# path: shuttle/nearby.ogg +# - id: shuttleGoodLuck # The shuttle could not find its way to the station, good luck crew +# path: shuttle/good_luck.ogg +# - id: shuttleAuthAdded # One of few have added their acceptance to early launching +# path: shuttle/auth_added.ogg +# - id: shuttleAuthRevoked # One of few have revoked their acceptance to early launching +# path: shuttle/auth_revoked.ogg +# - id: shuttleAlmostLaunching # The shuttle will leave to FTL in 10 seconds +# path: shuttle/almost_launching.ogg + - id: shuttleLeft # The shuttle has left the station + path: shuttle/left.ogg + + # Fallback # REQUIRED + - id: fallback # Any announcement sent without a valid announcement on this announcer will use this + path: fallback.ogg diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index ba03827ea15..1196804dc0e 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -788,6 +788,9 @@ - type: Tag id: Katana +- type: Tag + id: Wakizashi + - type: Tag id: Kangaroo diff --git a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png index fe3ddb62763..b761026d85e 100644 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json index 640e64c1e0d..ea1c3042f7c 100644 --- a/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json @@ -34,6 +34,10 @@ "name": "equipped-MASK-vox", "directions": 4 }, + { + "name": "up-equipped-MASK-vox", + "directions": 4 + }, { "name": "up-equipped-MASK", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png new file mode 100644 index 00000000000..0778dcc4016 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/gassecurity.rsi/up-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json index 5e96e092744..0a84775e6b8 100644 --- a/Resources/Textures/Clothing/Mask/medical.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/medical.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-MASK", "directions": 4 }, - { - "name": "equipped-MASK-vox", - "directions": 4 - }, { "name": "equipped-MASK-vulpkanin", "directions": 4 @@ -38,6 +34,10 @@ "name": "up-equipped-MASK-vox", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "equipped-MASK-dog", "directions": 4 @@ -65,12 +65,22 @@ { "name": "equipped-MASK-hamster", "directions": 4, - "delays": [[1.0], [1.0], [1.0], [1.0]] + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] }, { "name": "equipped-MASK-kangaroo", "directions": 4, - "delays": [[1.0], [1.0], [1.0], [1.0]] + "delays": [ + [ 1.0 ], + [ 1.0 ], + [ 1.0 ], + [ 1.0 ] + ] }, { "name": "equipped-MASK-possum", diff --git a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/meta.json b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/meta.json index acb1b7fdc63..829c30d8609 100644 --- a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/meta.json @@ -6,20 +6,23 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "sheath-sabre-equipped-BELT", - "directions": 4 - }, - { - "name": "sheath-sabre" - }, - { - "name": "sheath" - } - ] + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-sabre-equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-katana" + }, + { + "name": "sheath-wakizashi" + }, + { + "name": "sheath" + } + ] } diff --git a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-katana.png b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-katana.png new file mode 100644 index 00000000000..ec260cfd2ca Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-katana.png differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre.png b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre.png deleted file mode 100644 index dabb11d36d1..00000000000 Binary files a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-sabre.png and /dev/null differ diff --git a/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-wakizashi.png b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-wakizashi.png new file mode 100644 index 00000000000..fb5df498611 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi/sheath-wakizashi.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png index d7c0c68ea40..0792d043362 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_0.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png index 50273927e48..af7c311e798 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_1.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png index 61961e7940e..f0ab363a038 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_10.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png index d627767f632..424ca2ae7f3 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_11.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png index a43728cb8a4..77d457783e7 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_12.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png index 1f10cb02335..f0eac12b105 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_13.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png index a946e893a93..6a9a613f057 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_14.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png index 5bb5fcb1afe..075317b4310 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_15.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png index 5c260839d94..403a83d5c21 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_2.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png index b2289f89c7d..01c17b9cf81 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_3.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png index 69558c465ac..69f6d7b609f 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_4.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png index 6067423beb6..bfa465cfc0c 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_5.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png index 8d6d82961a3..f58c8388d7e 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_6.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png index 7f158911157..7c5d44c3c52 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_7.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png index 43e7e4f8a7f..73099f00a48 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_8.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png index e727be69647..10e4ad67396 100644 Binary files a/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png and b/Resources/Textures/Structures/Power/Cables/hv_cable.rsi/hvcable_9.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_12.png b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_12.png new file mode 100644 index 00000000000..474e63b92f6 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_12.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_4.png b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_4.png new file mode 100644 index 00000000000..7244b37f5c7 Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_4.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_8.png b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_8.png new file mode 100644 index 00000000000..32caa7228fb Binary files /dev/null and b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/DamageOverlay_8.png differ diff --git a/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/meta.json b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/meta.json new file mode 100644 index 00000000000..5f397794f65 --- /dev/null +++ b/Resources/Textures/Structures/Power/Cables/hv_cable_damage.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Made by PJB3005", + "states": [ + { + "name": "DamageOverlay_4" + + }, + { + "name": "DamageOverlay_8" + + }, + { + "name": "DamageOverlay_12" + + } + ] +} diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png index c3256d9e9d8..826e41ed80a 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_0.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png index 49da9c51ba9..5506cb02c60 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_1.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png index e8fdc982057..2f864e9d484 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_10.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png index 783816cbefa..8f0adf7013d 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_11.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png index f91a58ccd79..56b1a305fb4 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_12.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png index 04297dcfdc5..f4407816174 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_13.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png index 950c10a4991..f82fce5433f 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_14.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png index 6ac3cfbf867..fa4b4c40a26 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_15.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png index c4616294393..f35bfcea79b 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_2.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png index aea0d4df9de..f54953de795 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_3.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png index 3ae195eda04..1293442d4b1 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_4.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png index bd189065302..bfd7605c247 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_5.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png index 7b7bfd270e5..cf07fb4f2d9 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_6.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png index 365817b8fc8..ce70de15590 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_7.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png index e5c1191df3c..50cd4e33c81 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_8.png differ diff --git a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png index 1367288e57f..33dfa8c8b6b 100644 Binary files a/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png and b/Resources/Textures/Structures/Power/Cables/lv_cable.rsi/lvcable_9.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png index 580528df530..15c33e2328c 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_0.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png index fdebed5fa92..d915f75517d 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_1.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png index 17c40b22761..5d72f560333 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_10.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png index 76b20ffa8d1..51dd5e45354 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_11.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png index 8364d695095..48e77080177 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_12.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png index 6f03458fd3a..8e97dd5197a 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_13.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png index 6cdb9d20bcd..1aae3bd6113 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_14.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png index d45a7333240..63637b9063f 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_15.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png index ce3ffea8a4a..b61b0592805 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_2.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png index 2edb689b553..e94a963b45a 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_3.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png index fb782f3cad9..998cad3e5c8 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_4.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png index 6e0ffe9db5c..294f8c77d43 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_5.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png index 2d855fe035e..ebfbbb74741 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_6.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png index e382deeda11..b796b0e7842 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_7.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png index 408fdf51ea0..0b54a078d25 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_8.png differ diff --git a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png index 2b988d3ffe6..4dc364b7060 100644 Binary files a/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png and b/Resources/Textures/Structures/Power/Cables/mv_cable.rsi/mvcable_9.png differ diff --git a/Resources/Textures/Structures/cryostorage.rsi/meta.json b/Resources/Textures/Structures/cryostorage.rsi/meta.json index d361b5f1615..0add2e10604 100644 --- a/Resources/Textures/Structures/cryostorage.rsi/meta.json +++ b/Resources/Textures/Structures/cryostorage.rsi/meta.json @@ -16,30 +16,62 @@ "directions": 4, "delays": [ [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2, 0.2 - ], - [ + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2, 0.2 - ], - [ + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2, 0.2 - ], - [ + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, 0.2, 0.2, 0.2, 0.2 - ] + ] ] } ] - } \ No newline at end of file + } diff --git a/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png b/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png index 881ab5137c1..c9dcb7752a2 100644 Binary files a/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png and b/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png differ