diff --git a/Resources/Prototypes/ADT/Damage/modifier_sets.yml b/Resources/Prototypes/ADT/Damage/modifier_sets.yml index 073034054ff..4dae944d471 100644 --- a/Resources/Prototypes/ADT/Damage/modifier_sets.yml +++ b/Resources/Prototypes/ADT/Damage/modifier_sets.yml @@ -173,7 +173,7 @@ Cellular: 0.33 # -# ADT-damage modifier set +# ADT-damage modifier sets # - type: damageModifierSet id: ADTMobCreatureDamageSet @@ -188,3 +188,9 @@ Radiation: 0 # похуй. абсолютно. Asphyxiation: 0 # похуй. абсолютно. Bloodloss: 0 # похуй. абсолютно. + +- type: damageModifierSet + id: ADTDragonDamageSet # пофиг на холод и кровотёк, ибо твёрдая кожа + coefficients: + Cold: 0 + Bloodloss: 0.7 # твёрдая кожа diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index 13b335d2697..1f0f24dbe75 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -56,4 +56,4 @@ MuteToxinChemistryBottle: 3 LeadChemistryBottle: 2 ToxinChemistryBottle: 1 - + diff --git a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml index 3fbdeb6840a..ca4ad68a30d 100644 --- a/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Corvax/Entities/Clothing/OuterClothing/hardsuits.yml @@ -32,3 +32,4 @@ damageCoefficient: 0.7 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURNLeader + - type: DNALocker # ADT-Tweak diff --git a/Resources/Prototypes/Corvax/lobbyscreens.yml b/Resources/Prototypes/Corvax/lobbyscreens.yml index b49dba52c39..55dd882370e 100644 --- a/Resources/Prototypes/Corvax/lobbyscreens.yml +++ b/Resources/Prototypes/Corvax/lobbyscreens.yml @@ -194,6 +194,3 @@ id: SillyIsland background: /Textures/Corvax/LobbyScreens/silly-island.png -- type: lobbyBackground - id: EchoTeam - background: /Textures/Corvax/LobbyScreens/echo-team.png diff --git a/Resources/Prototypes/Datasets/Names/last_female.yml b/Resources/Prototypes/Datasets/Names/last_female.yml index 83ee79c4c70..0d241dd140c 100644 --- a/Resources/Prototypes/Datasets/Names/last_female.yml +++ b/Resources/Prototypes/Datasets/Names/last_female.yml @@ -37,7 +37,7 @@ - Титова - Кузьмина - Кудрявцева - - Баранова + # - Баранова # ADT-Tweak - Куликова - Алексеева - Степанова @@ -73,11 +73,11 @@ - Дорофеева - Егорова - Матвеева - - Боброва + # - Боброва # ADT-Tweak - Дмитриева - Калинина - Анисимова - - Петухова + # - Петухова # ADT-Tweak - Антонова - Тимофеева - Никифорова @@ -87,7 +87,7 @@ - Большакова - Суханова - Миронова - - Ширяева + # - Ширяева # ADT-Tweak - Александрова - Коновалова - Шестакова @@ -122,7 +122,7 @@ - Суворова - Абрамова - Воронова - - Мухина + # - Мухина # ADT-Tweak - Архипова - Трофимова - Мартынова @@ -141,7 +141,7 @@ - Белякова - Потапова - Некрасова - - Хохлова + # - Хохлова # ADT-Tweak - Жданова - Наумова - Шилова @@ -152,7 +152,7 @@ - Савина - Логинова - Сафонова - - Капустина + # - Капустина # ADT-Tweak - Кириллова - Моисеева - Елисеева @@ -163,9 +163,9 @@ - Ефремова - Исаева - Евдокимова - - Калашникова + # - Калашникова # ADT-Tweak - Кабанова - - Носкова + # - Носкова # ADT-Tweak - Юдина - Кулагина - Лапина @@ -177,7 +177,7 @@ - Ларионова - Федосеева - Зимина - - Пахомова + # - Пахомова # ADT-Tweak - Шубина - Игнатова - Филатова @@ -198,7 +198,7 @@ - Мишина - Фадеева - Комиссарова - - Мамонтова + # - Мамонтова # ADT-Tweak - Носова - Гуляева - Шарова @@ -234,7 +234,7 @@ - Мясникова - Лихачёва - Бурова - - Сысоева + # - Сысоева # ADT-Tweak - Фомичёва - Русакова - Стрелкова @@ -243,7 +243,7 @@ - Колобова - Субботина - Фокина - - Блохина + # - Блохина # ADT-Tweak - Селиверстова - Пестова - Кондратьева diff --git a/Resources/Prototypes/Datasets/Names/last_male.yml b/Resources/Prototypes/Datasets/Names/last_male.yml index acf2037f616..f653eb28f06 100644 --- a/Resources/Prototypes/Datasets/Names/last_male.yml +++ b/Resources/Prototypes/Datasets/Names/last_male.yml @@ -5,7 +5,7 @@ - Иванов - Кузнецов - Соколов - - Попов + # - Попов # ADT-Tweak - Лебедев - Козлов - Новиков @@ -37,7 +37,7 @@ - Титов - Кузьмин - Кудрявцев - - Баранов + # - Баранов # ADT-Tweak - Куликов - Алексеев - Степанов @@ -52,7 +52,7 @@ - Пономарёв - Григорьев - Лазарев - - Медведев + # - Медведев # ADT-Tweak - Ершов - Никитин - Соболев @@ -77,7 +77,7 @@ - Дмитриев - Калинин - Анисимов - - Петухов + # - Петухов # ADT-Tweak - Антонов - Тимофеев - Никифоров @@ -87,7 +87,7 @@ - Большаков - Суханов - Миронов - - Ширяев + # - Ширяев # ADT-Tweak - Александров - Коновалов - Шестаков @@ -119,7 +119,7 @@ - Савельев - Панов - Рыбаков - - Суворов + # - Суворов # ADT-Tweak - Абрамов - Воронов - Мухин @@ -134,14 +134,14 @@ - Панфилов - Копылов - Михеев - - Галкин + # - Галкин # ADT-Tweak - Назаров - Лобанов - Лукин - Беляков - Потапов - Некрасов - - Хохлов + # - Хохлов # ADT-Tweak - Жданов - Наумов - Шилов @@ -152,18 +152,18 @@ - Савин - Логинов - Сафонов - - Капустин + # - Капустин # ADT-Tweak - Кириллов - Моисеев - Елисеев - Кошелев - Костин - - Горбачёв + # - Горбачёв # ADT-Tweak - Орехов - Ефремов - Исаев - Евдокимов - - Калашников + # - Калашников # ADT-Tweak - Кабанов - Носков - Юдин @@ -198,7 +198,7 @@ - Мишин - Фадеев - Комиссаров - - Мамонтов + # - Мамонтов # ADT-Tweak - Носов - Гуляев - Шаров @@ -243,8 +243,8 @@ - Колобов - Субботин - Фокин - - Блохин - - Селиверстов + # - Блохин # ADT-Tweak + # - Селиверстов # ADT-Tweak - Пестов - Кондратьев - Силин @@ -324,7 +324,7 @@ - Пучек - Рабинович - Радкевич - - Резун + # - Резун # ADT-Tweak - Рогоза - Роднянский - Ротань @@ -339,7 +339,7 @@ - Седых - Середа - Сидоренко - - Синий + # - Синий # ADT-Tweak - Синицын - Скамейка - Слуцкий @@ -349,7 +349,7 @@ - Стацюра - Степчин - Стычинский - - Сыкула + # - Сыкула # ADT-Tweak - Тарнавский - Татарчук - Тимчук @@ -373,13 +373,13 @@ - Анисьев - Ганзюк - Гарковенко - - Гаркуша + # - Гаркуша # ADT-Tweak - Георгов - Глебовский - Гнатюк - Гончаренко - Гордиенко - - Горлевой + # - Горлевой # ADT-Tweak - Ардашев - Горохин - Горюнов @@ -391,7 +391,7 @@ - Грищук - Губар - Гунько - - Бабич + # - Бабич # ADT-Tweak - Гуревич - Денисенко - Довгалюк @@ -409,13 +409,13 @@ - Жабенко - Жмыев - Жураковский - - Забыйягода + # - Забыйягода # ADT-Tweak - Загороднюк - Замосенчук - Зарубин - Захарин - Звонницкий - - Зозо + # - Зозо # ADT-Tweak - Золотарь - Зубарев - Зубков @@ -424,7 +424,7 @@ - Иженко - Ищук - Казанцев - - Кандыбабко + # - Кандыбабко # ADT-Tweak - Капука - Капустянко - Кац @@ -453,9 +453,9 @@ - Спирин - Балитский - Белый - - Зелёный - - Бессмертный - - Слепой + # - Зелёный # ADT-Tweak + # - Бессмертный # ADT-Tweak + # - Слепой # ADT-Tweak - Смелый - Суровый - Сухой @@ -465,10 +465,10 @@ - Шалый - Горький - Грозный - - Кривоног - - Черный - - Белый + # - Кривоног # ADT-Tweak + # - Черный # ADT-Tweak + # - Белый # ADT-Tweak (повторяется) - Козлов - - Локоть + # - Локоть # ADT-Tweak - Стребков - - Попиначенко + # - Попиначенко # ADT-Tweak diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 7c6f362a417..060c357aa9a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -948,6 +948,7 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURN + - type: DNALocker # ADT-Tweak #MISC. HARDSUITS #Clown Hardsuit diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index bba678ed718..e013c81d8fc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -91,6 +91,7 @@ showRank: true rankName: collective-mind-carp-rank # ADT-CollectiveMind-Tweak-End + - type: entity parent: BaseMobCarp id: MobCarp @@ -181,6 +182,20 @@ - type: HTN rootTask: task: DragonCarpCompound +# ADT-Tweak-start +# the carps must not be combustible because they are the children of the dragon mwahahahaha. only those who come out of the portal. + - type: Flammable + fireSpread: false + canResistFire: true + alwaysCombustible: false + canExtinguish: true + resisting: false + damage: + types: {} + - type: Temperature + heatDamageThreshold: 800 + coldDamageThreshold: -800 +# ADT-Tweak-end - type: entity id: MobCarpDungeon diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 4c9a264a8b1..b4a0513ee21 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -37,8 +37,8 @@ - type: MobMover - type: InputMover - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 5 + baseWalkSpeed: 3.5 # ADT-Tweak 3 -> 3.5 + baseSprintSpeed: 5.5 # ADT-Tweak 5 -> 5.5 weightlessModifier: 1.5 - type: RandomSprite available: @@ -72,7 +72,7 @@ shape: !type:PhysShapeCircle radius: 0.40 - density: 100 + density: 200 # ADT-Tweak mask: - FlyingMobMask layer: @@ -90,25 +90,38 @@ 500: Dead - type: SlowOnDamage speedModifierThresholds: - 250: 0.7 - 400: 0.5 - # disable taking damage from fire, since its a fire breathing dragon + 250: 0.85 # ADT-Tweak (less slow 250: 0.7 ---> 250: 0.85) + 350: 0.7 # ADT-Tweak (add new threshold) + 430: 0.5 # ADT-Tweak (higher threshold 400: 0.5 ---> 430: 0.5) +# ADT-Tweak-start +# disable taking damage from fire, since its a fire breathing dragon. # also it can't be lit on fire - type: Flammable + fireSpread: false + canResistFire: true + alwaysCombustible: false + canExtinguish: true + resisting: false damage: types: {} + - type: Temperature + heatDamageThreshold: 800 + coldDamageThreshold: -800 + - type: FlashImmunity + - type: EyeProtection + - type: Damageable + damageModifierSet: ADTDragonDamageSet +# ADT-Tweak-end - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad allowed: - SlowedDown - Stutter - - Electrocution - - ForcedSleep - - TemporaryBlindness - - Pacified + # - Electrocution # ADT-Tweak - ъуъ + # - ForcedSleep # ADT-Tweak - WHY THE FUCK CAN A DRAGON BE PUT TO SLEEP??? + # - TemporaryBlindness # ADT-Tweak - WHY THE FUCK CAN A DRAGON BE BLINDED??? + # - Pacified # ADT-Tweak - это чудище не обосрется от пакса - RadiationProtection - - Drowsiness + # - Drowsiness # ADT-Tweak - НЕ СПАТЬ - Adrenaline #ADT-Medicine - - type: Temperature - heatDamageThreshold: 800 - type: Metabolizer solutionOnBody: false updateInterval: 0.25 @@ -131,6 +144,7 @@ altDisarm: false soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + range: 2 # ADT-Tweak damage: types: Piercing: 15 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index d11f96d8752..cb0e8f25cdb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -54,9 +54,10 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: FireBomb - totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them - intensitySlope: 1 - maxIntensity: 3 +# low intensity, the point is to burn attackers not to break open walls, dragons can just eat them + totalIntensity: 30 # ADT-Tweak + intensitySlope: 10 # ADT-Tweak + maxIntensity: 30 # ADT-Tweak canCreateVacuum: false deleteAfterExplosion: false repeatable: true diff --git a/Resources/Textures/ADT/LobbyScreens/attributions.yml b/Resources/Textures/ADT/LobbyScreens/attributions.yml index 363807adb4d..91fccf5d88c 100644 --- a/Resources/Textures/ADT/LobbyScreens/attributions.yml +++ b/Resources/Textures/ADT/LobbyScreens/attributions.yml @@ -22,3 +22,8 @@ license: "CC-BY-NC-SA-3.0" copyright: "doner4037 (756430621022224444) on discord" source: "https://github.com/AdventureTimeSS14/space_station_ADT" + +- files: ["pacification.webp"] + license: "CC-BY-NC-SA-3.0" + copyright: "NORKA, _white12 (993840028985868298) on discord" + source: "https://github.com/AdventureTimeSS14/space_station_ADT" diff --git a/Resources/Textures/ADT/LobbyScreens/pacification.webp b/Resources/Textures/ADT/LobbyScreens/pacification.webp new file mode 100644 index 00000000000..496153a69f6 Binary files /dev/null and b/Resources/Textures/ADT/LobbyScreens/pacification.webp differ diff --git a/Resources/Textures/ADT/LobbyScreens/pacification.webp.yml b/Resources/Textures/ADT/LobbyScreens/pacification.webp.yml new file mode 100644 index 00000000000..5c43e233050 --- /dev/null +++ b/Resources/Textures/ADT/LobbyScreens/pacification.webp.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Corvax/LobbyScreens/attributions.yml b/Resources/Textures/Corvax/LobbyScreens/attributions.yml index 1b038bdd555..aff2789bc0d 100644 --- a/Resources/Textures/Corvax/LobbyScreens/attributions.yml +++ b/Resources/Textures/Corvax/LobbyScreens/attributions.yml @@ -192,8 +192,3 @@ license: "CC-BY-NC-SA-4.0" copyright: "alexsandr_the_great2(1165521026579451935) on discord" source: "https://discord.com/channels/919301044784226385/1073603532898435183/1261290085287071914" - -- files: ["echo-team.png"] - license: "CC-BY-NC-SA-4.0" - copyright: "ukrainianlad(852667075059253278) on discord" - source: "https://discord.com/channels/919301044784226385/1073603532898435183/1261290085287071914" diff --git a/Resources/Textures/Corvax/LobbyScreens/echo-team.png b/Resources/Textures/Corvax/LobbyScreens/echo-team.png deleted file mode 100644 index 8839faf4c85..00000000000 Binary files a/Resources/Textures/Corvax/LobbyScreens/echo-team.png and /dev/null differ diff --git a/Resources/Textures/Corvax/LobbyScreens/echo-team.png.yml b/Resources/Textures/Corvax/LobbyScreens/echo-team.png.yml deleted file mode 100644 index 51ff40335ef..00000000000 --- a/Resources/Textures/Corvax/LobbyScreens/echo-team.png.yml +++ /dev/null @@ -1,2 +0,0 @@ -sample: - filter: false