Skip to content

Mit#19

Merged
aristophanivan merged 16 commits intowl-mainfrom
mit
Apr 1, 2026
Merged

Mit#19
aristophanivan merged 16 commits intowl-mainfrom
mit

Conversation

@aristophanivan
Copy link
Copy Markdown
Collaborator

No description provided.

Siginanto and others added 16 commits March 12, 2026 18:43
* Jet injectors

* Goliath Hide

* Syndies
* bunnysuits

nafsta chlenosos

* half of a turtleneck

* white cow + ya pokakal

* ya nichego ne testil, molites, chtobi rabotalo

* podtyorsya
* Delta+Shitle

Дельта была обновлена!

Полностью переделан спутник ИИ.
Пересмотрена камера сгорания ТЭГа.
ДАМ более не нужно искать по всему отделу.
Матеба была заменена на N1948.
Переделана оружейная комната. Теперь она примерно на уровне с боксом.
Переделаны криоподы в мед. отделе.
Шлюзы в морге РНД/Мед заменены на мед.
РНД добавлены недостающие фабы и силос.
Небольшая переделка тех. корридоров.
КПП СБ были укреплены.
Минимальные изменения в отделах.
Актуализирован шаттл СБ.
Оружейная на КТ была урезана.
Убрана плата перфоратора с КТ.
Добавлено пару единиц оружия где-то в пещерах КТ.
Добавлена возможность расширения атмосии.
Добавлено пару отсылок на ксеноморфов.

Добавлен новый шаттл утилизаторов!

* Avrite new!

Обновлена карта Аврит. Добавлен новый "Секретный обломок" + разрушенный шаттл ЯО.

Добавлено 3 новых моба:
Командир ЯО: Стреляет .45 бронебойный, имеет 500 хп.
Специалист ЯО: Стреляет .30 урановый, имеет 900 хп.
ЯО: Стреляет .35 урановый, имеет 300 хп.

P.S. - Ракетные турели на Зене.

* turrets

* Delete Resources/Maps/_Adventure/mining.yml

* Delete Resources/Maps/_Adventure/Adventuredelta.yml

* Е

* (conflict fix) Restore accidentally changed files

* LastMobFix

Fixed mobs

* Delete adventure_square.yml

---------

Co-authored-by: Zeneganto <fantik8800@gmail.com>
Co-authored-by: c4llv07e <igor@c4llv07e.xyz>
* AtmosModule

* ъ

* Фиксы

Я думал насчет того чтобы попросить спрайтеров, но потом подумал что это слишком маленький таск для них и что меня там изобьют и обоссут и мочёй и моей кровью нарисуют монолизу на том холсте 10 на 10 пикселей и мой позор не будет никогда с того момента смыт и я буду плакать по ночам, вспоминая с ужасом спрайтерский отдел....поэтому я нарисовал иконку сам.
* Новая еда и напитки

Добавлена новая еда, распишу потом

* fixing TW check

* Правочки

* Переправочки...

* Перелевочки

Пришлось вернуть файл ftl. Там вот что происходит, я перепробовал множество вариантов создания нового файла, но игра его отказывается видеть. Файл ftl нужен, так как он автоматически стакан-метаморф на русский переводит, поэтому я не могу создать  другой файл в _Adventure, стакан-метаморф не будет переводиться

* Додеп

Создал новый файл .ftl
* Drask fix

* Поделить надвое
* Новая еда и напитки

Добавлена новая еда, распишу потом

* fixing TW check

* Правочки

* Переправочки...

* Перелевочки

Пришлось вернуть файл ftl. Там вот что происходит, я перепробовал множество вариантов создания нового файла, но игра его отказывается видеть. Файл ftl нужен, так как он автоматически стакан-метаморф на русский переводит, поэтому я не могу создать  другой файл в _Adventure, стакан-метаморф не будет переводиться

* Додеп

Создал новый файл .ftl

* Minor fixes

В loadout старшего инженера возвращены рюкзам старшего инженера, сумка старшего инженера, вещмешок старшего инженера

Исправлены ошибки дублирования иконок ведущих ролей

* fix shields

* Missing comment
* airlocks

* effects

* AI sprites

* electrified by 3 by 2
* CentComm Printer

* Вот говорят мне не торопиться

* Минус 2 цели + фикс

* ъ
Copilot AI review requested due to automatic review settings April 1, 2026 17:03
@aristophanivan aristophanivan merged commit c964f82 into wl-main Apr 1, 2026
1 of 2 checks passed
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces a large set of new “Adventure” content: sponsor-uplink clothing bundles, new food/drink reagents and recipes (including metamorphic drink visuals), Whiskey Outpost hostile mobs/turret prototypes, plus several mapping/asset updates and balance tweaks.

Changes:

  • Add new sponsor-uplink outfit assets and uplink listings (multiple backpack “bundle” entities).
  • Add new food/drink content: pizzas, “dad soup”, job-themed fuel cocktails (reagents + reactions + spawners + sprites).
  • Add new Adventure gameplay prototypes (Whiskey Outpost mobs/turret, borg RPD module, CentComm operator printer + documents) and several config tweaks (map pool, job icons, delta-pressure thresholds, etc.).

Reviewed changes

Copilot reviewed 77 out of 318 changed files in this pull request and generated 8 comments.

Show a summary per file
File Description
Resources/Textures/_Adventure/sponsor_uplink/redsuit/redbunnyears.rsi/meta.json Adds sprite metadata for red bunny ears sponsor item.
Resources/Textures/_Adventure/sponsor_uplink/noface/uniform.rsi/meta.json Adds sprite metadata for “noface” uniform.
Resources/Textures/_Adventure/sponsor_uplink/noface/socks.rsi/meta.json Adds sprite metadata for “noface” socks.
Resources/Textures/_Adventure/sponsor_uplink/noface/pants.rsi/meta.json Adds sprite metadata for “noface” pants.
Resources/Textures/_Adventure/sponsor_uplink/noface/glasses.rsi/meta.json Adds sprite metadata for “noface” glasses.
Resources/Textures/_Adventure/sponsor_uplink/darksuit/dark-highheels.rsi/meta.json Adds sprite metadata for dark high heels.
Resources/Textures/_Adventure/sponsor_uplink/darksuit/dark-bunnysuit.rsi/meta.json Adds sprite metadata for dark bunny suit.
Resources/Textures/_Adventure/sponsor_uplink/darksuit/dark-bunnyears.rsi/meta.json Adds sprite metadata for dark bunny ears.
Resources/Textures/_Adventure/sponsor_uplink/Black-cow/pants.rsi/meta.json Adds sprite metadata for black cow pants.
Resources/Textures/_Adventure/sponsor_uplink/Black-cow/legs.rsi/meta.json Adds sprite metadata for black cow legs.
Resources/Textures/_Adventure/sponsor_uplink/Black-cow/horns.rsi/meta.json Adds sprite metadata for black cow horns.
Resources/Textures/_Adventure/sponsor_uplink/Black-cow/hands.rsi/meta.json Adds sprite metadata for black cow hands.
Resources/Textures/_Adventure/sponsor_uplink/Black-cow/bra.rsi/meta.json Adds sprite metadata for black cow bra.
Resources/Textures/_Adventure/Roles/WhiskeyOutpost/mobs/OPSSMG.rsi/meta.json Adds sprite metadata for Whiskey Outpost hostile SMG mob.
Resources/Textures/_Adventure/Roles/WhiskeyOutpost/mobs/OPSLMG.rsi/meta.json Adds sprite metadata for Whiskey Outpost hostile LMG mob.
Resources/Textures/_Adventure/Roles/WhiskeyOutpost/mobs/OPSCom.rsi/meta.json Adds sprite metadata for Whiskey Outpost hostile commander mob.
Resources/Textures/_Adventure/Objects/Food/pizza.rsi/meta.json Adds sprite metadata for new pizza variants/slices.
Resources/Textures/_Adventure/Objects/Food/dadsoup.rsi/meta.json Adds sprite metadata for “dad soup”.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/synfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/stationblessingglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/srvfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/secfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/rndlightfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/rnddarkfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/medfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/engfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/crgfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Objects/Consumable/Drinks/cmdfuelglass.rsi/meta.json Adds metamorphic drink glass sprite metadata.
Resources/Textures/_Adventure/Interface/ai_huds/3.rsi/meta.json Adds AI HUD animated sprite metadata.
Resources/Textures/_Adventure/Interface/ai_huds/2.rsi/meta.json Adds AI HUD animated sprite metadata.
Resources/Textures/_Adventure/Interface/Actions/actions_borg.rsi/meta.json Adds borg action icon sprite metadata.
Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json Alters mining airlock metadata (states/animation timings/attribution).
Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json Alters mining glass airlock metadata (states/animation timings/attribution).
Resources/Textures/Objects/Weapons/Guns/Turrets/turrets.rsi/meta.json Adds turret base + rocket turret states.
Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json Adds borg module icon state for RPD.
Resources/Textures/Mobs/Silicon/station_ai.rsi/meta.json Adds animation delays for station AI frame.
Resources/Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi/meta.json Adds reptilian equipped state for syndie raid armor.
Resources/Prototypes/borg_types.yml Adds BorgModuleRPD to borg modules list.
Resources/Prototypes/_Corvax/Entities/Structures/Machines/printer.yml Attempts to make printer bullet-impassable via fixture mask tweak.
Resources/Prototypes/_Adventure/sponsor_uplink/sponsor_uplink.yml Adds new sponsor uplink listings for clothing bundles.
Resources/Prototypes/_Adventure/Roles/WhiskeyOutpost/mobs/turrets.yml Adds Whiskey Outpost rocket turret entity.
Resources/Prototypes/_Adventure/Roles/WhiskeyOutpost/mobs/mobs_spawners.yml Adds spawners for Whiskey Outpost hostile mobs.
Resources/Prototypes/_Adventure/Roles/WhiskeyOutpost/mobs/mobs.yml Adds hostile OPS mob prototypes and shared base.
Resources/Prototypes/_Adventure/Roles/LavaLand/mobs/Necro/chests_filled.yml Adjusts loot probability (spellbook) in filled chests.
Resources/Prototypes/_Adventure/Roles/Borgs/atmos_module.yml Adds borg atmospheric module (RPD + gas tools + tank slots).
Resources/Prototypes/_Adventure/Roles/Alian/alian_structures.yml Renames damage modifier set reference from Aliens → Alien.
Resources/Prototypes/_Adventure/Recipes/Reactions/drinks.yml Adds reactions for new job-fuel cocktails and station blessing.
Resources/Prototypes/_Adventure/Recipes/Cooking/meal_recipes.yml Adds microwave recipes for new pizzas and “dad soup”.
Resources/Prototypes/_Adventure/Reagents/Consumable/Drink/alcohol.yml Adds new alcohol reagents with metamorphic sprites and effects.
Resources/Prototypes/_Adventure/Races/Drask/Drask.yml Tweaks Drask cold regen + solution wiring + damage tuning.
Resources/Prototypes/_Adventure/Maps/adventure_avrite.yml Adjusts Avrite map settings (minPlayers, prefix, shuttle, jobs).
Resources/Prototypes/_Adventure/Maps/Pools/Adventure.yml Enables AdventureAvrite in the map pool with updated min players.
Resources/Prototypes/_Adventure/Flavors/flavors.yml Adds flavor descriptors for new job-fuel cocktails.
Resources/Prototypes/_Adventure/Entities/Objects/Weapons/Ammo/PulseAmmo.yml Adds steel/uranium material costs to pulse ammo recipes.
Resources/Prototypes/_Adventure/Entities/Objects/Machines/Printer/printer_documents.yml Updates document templates’ year to 3026.
Resources/Prototypes/_Adventure/Entities/Objects/Machines/Printer/printer.yml Attempts to make Adventure printer bullet-impassable via fixture mask tweak.
Resources/Prototypes/_Adventure/Entities/Objects/Machines/Printer/centcomm_printer_documents.yml Adds CentComm printer recipes + large document set.
Resources/Prototypes/_Adventure/Entities/Objects/Machines/Printer/centcomm_printer.yml Adds a CentComm operator printer + circuitboard.
Resources/Prototypes/_Adventure/Entities/Objects/Food/dadsoup.yml Adds “dad soup” food entity.
Resources/Prototypes/_Adventure/Entities/Objects/Food/Baked/pizza.yml Adds multiple new pizza entities + slices.
Resources/Prototypes/_Adventure/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml Adds drink glass entities for new metamorphic reagents.
Resources/Prototypes/_Adventure/Entities/Objects/Clothing/adventurelink.yml Adds multiple sponsor clothing bundle backpacks and items; adjusts existing bundle.
Resources/Prototypes/StatusIcon/job.yml Changes senior job icon prototypes (sets jobName; removes allowSelection flag).
Resources/Prototypes/Loadouts/role_loadouts.yml Adjusts CE loadout backpack group reference.
Resources/Prototypes/Entities/Structures/Power/chargers.yml Attempts to make charger bullet-impassable via fixture mask tweak.
Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml Attempts to make fax bullet-impassable via fixture mask tweak.
Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_base.yml Adds layered turret base sprite config for rendering.
Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml Moves tools out of eng module; adds AME fuel container slot config.
Resources/Prototypes/Entities/Objects/Shields/shields.yml Forces some toggles to start inactive via ItemToggle config.
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml Adds PresetIdCard entries for new “Senior*Adv” jobs.
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml Adds Adventure pizza variants to random pizza box spawns.
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml Adds FoodDadSoup to random meal spawns.
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml Adds Adventure drinks to random drink spawns (common + rare).
Resources/Prototypes/Atmospherics/Thresholds/deltapressure.yml Multiplies base delta-pressure thresholds by 100 for multiple prototypes.
Resources/Locale/ru-RU/robotics/borg_modules.ftl Adds Russian strings for new borg module empty-slot labels.
Resources/Locale/ru-RU/job/job-names.ftl Adds Russian job names for senior job icon tooltips.
Resources/Locale/ru-RU/Adventure/drinks.ftl Adds Russian localization entries for new drink entities.
Comments suppressed due to low confidence (1)

Resources/Prototypes/StatusIcon/job.yml:1

  • These jobIcon entries previously had allowSelection: false, which prevents selection in contexts like Agent ID icon selection. Replacing it with jobName may unintentionally re-enable selection if the default is true. If the intent is only to add tooltips/localization, keep allowSelection: false and add jobName alongside it (same for SeniorOfficer/SeniorEngineer/SeniorResearcher).
- type: jobIcon

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

factions:
- AllHostile
- type: Temperature
heatDamageThreshold: 100273,15
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YAML numeric literal uses a comma in heatDamageThreshold (100273,15), which will fail parsing or be treated as a string. Use a dot decimal (100273.15) so the prototype loads correctly.

Suggested change
heatDamageThreshold: 100273,15
heatDamageThreshold: 100273.15

Copilot uses AI. Check for mistakes.
Comment on lines +13 to +15
- type: Icon
sprite: _Adventure/Objects/Consumable/Drinks/engfuelglass.rsi
state: icon
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The drink glass .rsi meta files added in this PR define icon_empty (and fill-*) states, but these entities reference state: icon. If icon doesn't exist, the sprite will be missing in-game. Update the Icon state to icon_empty (and apply the same fix to all job-fuel / station blessing / syndie fuel glasses in this file), or add an icon state to each corresponding .rsi.

Copilot uses AI. Check for mistakes.
Comment on lines 9 to +11
- type: DeltaPressure
minPressure: 150000
minPressureDelta: 100000
minPressure: 15000000 # Adventure
minPressureDelta: 10000000 # Adventure
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes increase multiple base delta-pressure thresholds by ~100× (e.g., 150,000 → 15,000,000 Pa), which will affect all reinforced/plasma window behaviors globally (damage scaling, failure thresholds, potentially explosions/atmos gameplay balance). If this is meant to be Adventure-only behavior, create new Adventure-specific threshold prototypes and reference them from Adventure-only entities instead of modifying shared base thresholds.

Copilot uses AI. Check for mistakes.
0.1
]
]
"name": "closing"
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The closing (and later opening_unlit) states had delays removed in this PR. If these states are animated, removing delays will change animation timing (often making it play incorrectly or at an unintended default). Restore the original delays arrays for animated states, or ensure the sprite sheet/state is actually non-animated and the removal is intentional.

Suggested change
"name": "closing"
"name": "closing",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.05,
0.05,
0.1
]
]

Copilot uses AI. Check for mistakes.
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken at https://github.com/ParadiseSS13/Paradise/commit/9312f1fb7dcdf1c195e255a528f31092613fb60d. Modified by Ko4erga (discord)",
"copyright": "By Xaunto",
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This replaces the prior attribution that referenced the upstream source commit. Unless the underlying sprite assets were replaced with original work, removing the original attribution can create licensing/compliance issues. Consider keeping the upstream attribution and appending the modifier/author info, or confirm the sprite source has changed accordingly.

Suggested change
"copyright": "By Xaunto",
"copyright": "Based on upstream Space Station 13 mining airlock sprites (see git history for original authors); modified by Xaunto",

Copilot uses AI. Check for mistakes.
Comment on lines 586 to 590
contents:
- id: ClothingJumpsuitBunnySuit
amount: 1
- id: ClothingHeadBunnyEars
- id: ClothingHeadBunnySuit
amount: 1
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ClothingHeadBunnySuit is referenced in the storage fill, but within this diff there is no prototype definition added for that id (the PR adds ClothingHeadDarkBunnySuit / ClothingHeadRedBunnySuit, etc.). If ClothingHeadBunnySuit doesn't exist elsewhere, this bundle will fail to spawn its head item. Use the correct existing id (likely the bunny ears item) or add a prototype with id ClothingHeadBunnySuit.

Copilot uses AI. Check for mistakes.
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "By Aelout an Xaunto",
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix typo in attribution: 'an' → 'and'.

Suggested change
"copyright": "By Aelout an Xaunto",
"copyright": "By Aelout and Xaunto",

Copilot uses AI. Check for mistakes.
Comment on lines +28 to 30
- BulletImpassable # Adventure
layer:
- TabletopMachineLayer
Copy link

Copilot AI Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make an entity block bullets, it generally needs to be on the collision layer that bullets check against (e.g., BulletImpassable). Adding BulletImpassable to the fixture mask is unlikely to make bullets collide with the fax machine. Consider adding BulletImpassable to the fixture layer list (and applying the same correction to the various printers where this pattern appears).

Suggested change
- BulletImpassable # Adventure
layer:
- TabletopMachineLayer
layer:
- TabletopMachineLayer
- BulletImpassable # Adventure

Copilot uses AI. Check for mistakes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants