diff --git a/Resources/Prototypes/Damage/ModifierSets/species.yml b/Resources/Prototypes/Damage/ModifierSets/species.yml index 88ac7e765c..0e002d99af 100644 --- a/Resources/Prototypes/Damage/ModifierSets/species.yml +++ b/Resources/Prototypes/Damage/ModifierSets/species.yml @@ -39,8 +39,8 @@ - type: damageModifierSet id: Vulpkanin coefficients: - Heat: 1.15 - Cold: 0.85 + Heat: 1.30 #1.15 Corvax-CorvaxVulp_Port + Cold: 0.65 #0.85 Corvax-CorvaxVulp_Port #endregion #region Special diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml index 569aae9067..6752c5e984 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ BaseControllable, BaseStructure, StructureHealthMachineStrong ] + parent: [ BaseControllable, BaseStructure, StructureHealthMachineStrong, TTS_speaker] # Corvax-TTS id: MothershipCore name: mothership core description: A sentient machine that can produce Xenoborgs. Without this the Xenoborgs are doomed. diff --git a/Resources/Textures/Effects/text.rsi/meta.json b/Resources/Textures/Effects/text.rsi/meta.json index bb2a5e58b9..f3bae82efd 100644 --- a/Resources/Textures/Effects/text.rsi/meta.json +++ b/Resources/Textures/Effects/text.rsi/meta.json @@ -193,6 +193,105 @@ }, { "name": "underscore" + }, + { + "name": "а" + }, + { + "name": "б" + }, + { + "name": "в" + }, + { + "name": "г" + }, + { + "name": "д" + }, + { + "name": "е" + }, + { + "name": "ё" + }, + { + "name": "ж" + }, + { + "name": "з" + }, + { + "name": "и" + }, + { + "name": "й" + }, + { + "name": "к" + }, + { + "name": "л" + }, + { + "name": "м" + }, + { + "name": "н" + }, + { + "name": "о" + }, + { + "name": "п" + }, + { + "name": "р" + }, + { + "name": "с" + }, + { + "name": "т" + }, + { + "name": "у" + }, + { + "name": "ф" + }, + { + "name": "х" + }, + { + "name": "ц" + }, + { + "name": "ч" + }, + { + "name": "ш" + }, + { + "name": "щ" + }, + { + "name": "ъ" + }, + { + "name": "ы" + }, + { + "name": "ь" + }, + { + "name": "э" + }, + { + "name": "ю" + }, + { + "name": "я" } ] } diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/base.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/base.png index 25bc492f29..2866b65be8 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/broken.png index b1ee54cea1..f06c31767b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-charging.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-charging.png index d5e356d943..8e65e6d317 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-charging.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-charging.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-full.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-full.png index 4a9bd7ed64..e7707880a0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-full.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-full.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-lack.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-lack.png index d1d2df4858..b5de9c07d3 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-lack.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-lack.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-remote.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-remote.png index 07265ab67d..81056868d4 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/display-remote.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/display-remote.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/emag-unlit.png index 77c2518e63..1fee861646 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/emag-unlit.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/emag-unlit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/frame.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/frame.png index 3a66a771c7..95984678e0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/frame.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/frame.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/lock0-locked.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/lock0-locked.png deleted file mode 100644 index e16642502b..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/lock0-locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/lock1-locked.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/lock1-locked.png deleted file mode 100644 index e621693cac..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/lock1-locked.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/apc.rsi/meta.json index 913e7f8076..95cddfc876 100644 --- a/Resources/Textures/Structures/Wallmounts/apc.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/apc.rsi/meta.json @@ -1,97 +1,232 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fca7f2a0f9154c0c6c4efc2f8f58441fb9b34759", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By rye-rice (GitHub), modified by AftrLite (GitHub), *tripped/channel* by whatston3 (GitHub)", + "source": "https://github.com/rye-rice/Shiptest/blob/30760c66503e00e13c20c6cc714e9c7df1a52565/icons/obj/power.dmi", + "size": { + "x": 32, + "y": 32 }, - { - "name": "static" - }, - { - "name": "broken" - }, - { - "name": "frame" - }, - { - "name": "panel" - }, - { - "name": "lock0-locked" - }, - { - "name": "lock1-locked" - }, - { - "name": "display-lack", - "delays": [ - [ - 1, - 2 - ] - ] - }, - { - "name": "display-charging", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.2 - ] - ] - }, - { - "name": "display-full", - "delays": [ - [ - 1, - 1 - ] - ] - }, - { - "name": "display-remote", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "emag-unlit", - "delays": [ - [ - 0.5, - 0.5 - ] - ] - }, - { - "name": "sparks-unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } - ] + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "broken", + "directions": 4 + }, + { + "name": "channel-disconnected", + "directions": 4 + }, + { + "name": "channel-on", + "directions": 4 + }, + { + "name": "channel-tripped", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "display-charging", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "display-full", + "directions": 4 + }, + { + "name": "display-lack", + "directions": 4, + "delays": [ + [ + 0.25, + 0.25 + ], + [ + 0.25, + 0.25 + ], + [ + 0.25, + 0.25 + ], + [ + 0.25, + 0.25 + ] + ] + }, + { + "name": "display-remote", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "display-tripped", + "directions": 4, + "delays": [ + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ], + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "emag-unlit", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "frame", + "directions": 4 + }, + { + "name": "panel", + "directions": 4 + }, + { + "name": "sparks-unlit", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "static" + } + ] } diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/panel.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/panel.png index 4cf8d0381a..5ab1d0acd0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/panel.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/panel.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/sparks-unlit.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/sparks-unlit.png index f442757bea..212fcb78bf 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/sparks-unlit.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/sparks-unlit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/apc.rsi/static.png b/Resources/Textures/Structures/Wallmounts/apc.rsi/static.png index eeb458ab62..cef2ee8736 100644 Binary files a/Resources/Textures/Structures/Wallmounts/apc.rsi/static.png and b/Resources/Textures/Structures/Wallmounts/apc.rsi/static.png differ