Vigers Ray
fc453a88c3
Merge remote-tracking branch 'space-sunrise/master'
2026-01-30 06:30:28 +01:00
Vigers Ray
fcc2b10df5
Фотоапарат в КПК
2026-01-30 06:28:52 +01:00
Vigers Ray
416c0ed8bd
Revert "фотоапарат и доработка месенжера"
...
This reverts commit 5f3f836fe5
2026-01-30 06:27:41 +01:00
Vigers Ray
5f3f836fe5
фотоапарат и доработка месенжера
2026-01-30 05:09:10 +01:00
Vigers Ray
ce86bdb8ad
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/species.yml
# Resources/Prototypes/_Sunrise/AssaultOps/ghost_roles.yml
# Resources/Prototypes/_Sunrise/Entities/Customization/Markings/human_tails.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml
2026-01-27 02:54:35 +01:00
KaiserMaus
69fcd0c1f1
Пираты и локаль ( #3693 )
2026-01-14 13:00:14 +00:00
KaiserMaus
e16ec96c5e
Экспедиции Пиратов ( #3659 )
2026-01-07 14:26:01 +03:00
Vigers Ray
7eee898afc
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/_Sunrise/MentorHelp/MentorHelpControl.xaml.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Content.Server.csproj
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
# Content.Server/Fax/FaxSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/_Sunrise/Biocode/Systems/BiocodeDeactivationSystem.cs
# Content.Shared/CCVar/CCVars.Atmos.cs
# Content.Shared/Repairable/RepairableSystem.cs
# Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs
# Resources/Locale/en-US/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
# Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/clothing/belt/belts.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/mech/mechs.ftl
# Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
# Resources/Locale/ru-RU/_strings/_sunrise/markings/vulpkanin.ftl
# Resources/Locale/ru-RU/_strings/_sunrise/mentor-help/mentor-help-ui.ftl
# Resources/Locale/ru-RU/_strings/reagents/meta/medicine.ftl
# Resources/Maps/Nonstations/nukieplanet.yml
# Resources/Maps/_Sunrise/Nonstations/nukieplanet.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
# Resources/Prototypes/Damage/containers.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
# Resources/Prototypes/Reagents/fun.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
# Resources/Prototypes/Roles/Jobs/CentComm/deathsquad.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
# Resources/Prototypes/_Sunrise/Chemistry/medicine.yml
# Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/_Sunrise/Entities/Mobs/Player/eviltwin.yml
# Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/NTUplink.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Robotics/borg_brains.yml
# Resources/Prototypes/_Sunrise/Entities/Objects/Tools/biocode.yml
# Resources/Prototypes/_Sunrise/GameRules/events.yml
# Resources/Prototypes/_Sunrise/Reagents/gases.yml
# Resources/Prototypes/_Sunrise/Reagents/narcotics.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield_officer.yml
# Resources/Prototypes/_Sunrise/Roles/Jobs/Security/senior_officer.yml
# Resources/ServerInfo/Guidebook/Medical/MedicalDoctor.xml
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/meta.json
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalert.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertdirect.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonalertnull.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonclose.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirect.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectlarge.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectsmall.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinondirectxtrlarge.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonfar.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonmedium.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinonnull.png
# Resources/Textures/_Sunrise/BloodCult/pinpointer.rsi/pinpointer_bloodcult.png
# Resources/manifest.yml
2025-12-29 18:37:56 +01:00
KaiserMaus
11cca765b8
Fix "ыыыы" prototype edition ( #3514 )
...
Co-authored-by: iertis <kanopus952@gmail.com>
Co-authored-by: Daniel | Orvex07 <d.b.orvex@gmail.com>
2025-12-27 18:23:10 +00:00
Vigers Ray
2da8b9f545
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Chemistry/UI/ChemMasterWindow.xaml
# Content.Client/Entry/EntryPoint.cs
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Paper/UI/PaperWindow.xaml.cs
# Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.IntegrationTests/Tests/Power/StationPowerTests.cs
# Content.Packaging/ServerPackaging.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
# Content.Server/Atmos/TileAtmosphere.cs
# Content.Server/Bible/BibleSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Content.Server.csproj
# Content.Server/Discord/DiscordLink/DiscordLink.cs
# Content.Server/GameTicking/GameTicker.LobbyBackground.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/Kitchen/Components/MicrowaveComponent.cs
# Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
# Content.Server/Mech/Systems/MechSystem.cs
# Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs
# Content.Server/Medical/DefibrillatorSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Remotes/DoorRemoteSystem.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs
# Content.Server/Silicons/Borgs/BorgSystem.Transponder.cs
# Content.Server/Tips/TipsSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Bed/BedSystem.cs
# Content.Shared/Blocking/BlockingSystem.User.cs
# Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
# Content.Shared/Chat/SharedSuicideSystem.cs
# Content.Shared/Chemistry/Components/HyposprayComponent.cs
# Content.Shared/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs
# Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
# Content.Shared/Chemistry/Events/HyposprayEvents.cs
# Content.Shared/Content.Shared.csproj
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Friction/TileFrictionController.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Content.Shared/Interaction/InteractHand.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Medical/Healing/HealingSystem.cs
# Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Throwing/ThrowingSystem.cs
# Content.Shared/Trigger/Systems/TriggerOnHitscanSystem.cs
# Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/Components/BatteryWeaponFireModesComponent.cs
# Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs
# Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Content.Shared/_Sunrise/Lobby/LobbyBackgroundPrototype.cs
# README.md
# Resources/Locale/en-US/_strings/borg/borg.ftl
# Resources/Locale/en-US/_strings/chemistry/components/hypospray-component.ftl
# Resources/Locale/en-US/_strings/chemistry/components/injector-component.ftl
# Resources/Locale/en-US/_strings/commands/pauseatmos-command.ftl
# Resources/Locale/en-US/_strings/commands/quick-inspect-command.ftl
# Resources/Locale/en-US/_strings/commands/show-wallmounts-command.ftl
# Resources/Locale/en-US/_strings/commands/substepatmos-command.ftl
# Resources/Locale/en-US/_strings/fluids/components/equip-spray-component.ftl
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-revolutionary.ftl
# Resources/Locale/en-US/_strings/job/job-names.ftl
# Resources/Locale/en-US/_strings/lobby/lobby-state-background.ftl
# Resources/Locale/en-US/_strings/reagents/meta/medicine.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/_strings/silicons/borg-module.ftl
# Resources/Locale/en-US/_strings/store/changeling-catalog.ftl
# Resources/Locale/en-US/_strings/store/currency.ftl
# Resources/Locale/en-US/_strings/store/store.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Body/Organs/slime.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/backpack.yml
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/antag.yml
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Crates/botany.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Crates/medical.yml
# Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
# Resources/Prototypes/Catalog/Fills/Crates/security.yml
# Resources/Prototypes/Catalog/Fills/Crates/service.yml
# Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml
# Resources/Prototypes/Catalog/Fills/Items/belt.yml
# Resources/Prototypes/Catalog/Fills/Items/briefcases.yml
# Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
# Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml
# Resources/Prototypes/Entities/Debugging/debug_sweps.yml
# Resources/Prototypes/Entities/Debugging/stress_test.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
# Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
# Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml
# Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
# Resources/Prototypes/Entities/Objects/Fun/snap_pops.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Shields/shields.yml
# Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml
# Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml
# Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/heavy_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
# Resources/Prototypes/Entities/Structures/Walls/walls.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/GameRules/unknown_shuttles.yml
# Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/reach.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml
# Resources/Prototypes/Roles/play_time_trackers.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/Prototypes/Species/species_weights.yml
# Resources/Prototypes/Store/presets.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Prototypes/explosion.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/Prototypes/silicon-laws.yml
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/icon-med.png
# Resources/Textures/Clothing/Back/Duffels/syndicate.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/meta.json
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-broken.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-empty.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley-open.png
# Resources/Textures/Objects/Specific/Mech/mecha.rsi/ripley.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_chassis.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness+o.png
# Resources/Textures/Objects/Specific/Mech/ripley_construction.rsi/ripley_harness.png
# Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
# Resources/Textures/Objects/Specific/Medical/medical.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json
# Resources/Textures/Structures/Storage/canister.rsi/meta.json
# Resources/Textures/Structures/Storage/tanks.rsi/meta.json
# Resources/migration.yml
# RobustToolbox
# SECURITY.md
# SpaceStation14.sln
2025-12-26 04:19:27 +01:00
Vigers Ray
3d383e5377
Уменьшение количества редактирований файлов оффов ( #3365 )
2025-12-26 03:30:36 +03:00
darneya
70df8c098b
modsuit-demo ( #3502 )
...
Co-authored-by: darneya <darneya.git>
Co-authored-by: DerKurait <AlbarKabrt@yandex.ru>
2025-12-25 21:23:14 +03:00
KaiserMaus
33b4dbb91f
NPC Пираты, снаряжение пиратов, консоль-аплинк пиратов. ( #3370 )
...
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-12-25 20:25:55 +03:00
banumbas
71761da9b2
Фиксы резоми ( #3343 )
2025-12-25 20:15:31 +03:00
KaiserMaus
45f1e14090
ОБР аплинк дополнения ( #3456 )
2025-12-20 22:43:37 +00:00
Republic_Cat
2cc7f0ae9b
ШАК-12 и выбор оружия для ОСЩ ( #3457 )
...
Co-authored-by: Xeno4 <republic.cat@gmail.com>
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
2025-12-16 13:17:52 +00:00
A-Mironov
a94a55ddb0
Обнова Плюшки Миши Обороны ( #157 )
...
* Misha plushka
* fix comment
2025-12-15 21:44:52 +02:00
Connor Huffine
3835489af0
Delete license.txt ( #41805 )
2025-12-09 11:39:37 +00:00
halycon
e038b07a40
Hushpup Shotgun ( #41512 )
...
* upstream hushpup
* fixes incorrect filename in attribution
* sprite cleanup
* Make the YAML not ass
* Remove redundant line of code
* Resprite, attributes original sources
* More sourcing fixes
* Last minute sprite touchups
* So... don't accidentally copy paste stuff
* Fixes bolt being on the wrong side while wielded
* adjust rolloffFactor
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
* Resprite
* No more pegs
* Spanky mind controlled me to commit these changes
---------
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
2025-12-08 20:07:32 +00:00
August Sun
9bd27fd245
Adds the sticky grappling hand ( #37551 )
...
* Adds sprites, entity and sounds for sticky grappling hand
* Switched audio to mono
* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
Co-authored-by: āda <ss.adasts@gmail.com>
* Added empty sound, changed yaml to suit conventions, added description
---------
Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-12-06 20:40:37 +00:00
banumbas
98723a72b1
Таяры, свиньи, фелиниды, моли и вульпы научились тяжело кашлять. А ещё таяры научились рычать. ( #3325 )
...
Co-authored-by: KaiserMaus <kaiser.ratte@gmail.com>
2025-12-06 14:55:25 +00:00
KaiserMaus
dc025871d5
Новая или возвращенная музыка Нюки ( #3364 )
2025-11-30 16:17:51 +00:00
A-Mironov
abf39617af
Обнова культа крови ( #128 )
...
* stable
* sprite
* yes!
* LOCATOR TRANSLATION MISSING
* finally
* stable2
* stable
* stable?
* FIS
* Nerfs
* works
* Трек болгарыча и время призыва теперь 3 минуты
* f
* Update modifier_sets.yml
* Барьер больше не даёт 5 рун металла, ибо почему он должен?
2025-11-30 00:06:35 +02:00
Hohenzolaren
f0efa5dc3c
Balloons now float and slide smoothly. ( #41102 )
...
* The balloons became airy
* Attributions + Sound
* Add BaseBalloon
* Proto fixes
---------
Co-authored-by: ReWAFFlution <239567049+brokendot@users.noreply.github.com>
2025-11-23 20:28:53 +00:00
Entvari
3d22d984b8
Mini Energy Crossbow ( #39796 )
...
* draft 1
* mono audio
* missed something
* end the torment
* release me
* let me free
* Submodule fix?
* submodule fix?
* thousand years of suffering
* fix conflicts mehopes
* fuuuhuck
* balance update
* small numbers change
* re-organises the stun values yada yada
* newline
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-11-14 22:18:08 +00:00
Samuka
e5daa54e79
Xenoborgs part 7 ( #40042 )
...
* add mothership module
* option for mothership to open self UI
* fix mothership module
* remove mothership body
* swapp real hands for modules
* action sprite for mothership module
* removed hands from mothership core sprite
* xenoborgs now drop a pinpointer to the mothership core once destroyed
* add pinpointer to space movment module
* add base for XenoborgRule
* add xenoborg antag option
* something was needed
* something else was needed
* add ghost role spawn points
* change name in antag selection to Xenoborg Core
* add random spawnPoint markers that don't do anything
* add spawn points to mothership
* update spawn points
* add xenoborgs rule
* add xenoborgs rule to rotation
* add xenoborgs preset
* update preset with secret version
also added xenoborg mode description
* modify Antag Selection system to allow for custom entities via the AntagSelectionDefinition
* fix ghostroles spawners
* fix rule with new entityPrototype
* add spawnpoints to the mothership
* whitelist system to spawnpoints
* updated xenoborg components
* added xenoborg component to xenoborgs
* updated spawnpoints of xenoborgs in the mothership
* add new tags for xenoborg and mothership core
* add new tags for xenoborgs and mothership core
* update ghostrole spawners for xenoborgs
* message for when you get the xenoborg role
* explode all xenoborgs when mothership core dies
* for real now. explode all xenoborgs when mothership core is destroyed
* round end summary for xenoborgs
* temporary
* add guidebook entry for xenoborgs
* instructions on how to borg players
* removed lock from xenoborg control computer
* announcement when all xenoborgs die
* announcement when mothership core is destroyed
* typos
* fix error
* improve xenoborg mind role
* move sounds to xenoborg and mothership component
* play sounds when turned into xenoborg
* change sprites of mothership core actions
* minor fix
* add custom xenoborg start sound
* carps now attack xenoborgs
* added guide link to xenoborgs
* add guidebook link to xenoborgs
* added guidebook link to mothership core
* add link to source of the sound
* fixed minor issue
* has to be 1
* typo
* add light layer to mothership core sprite
* fixed antag selection system
* update guideboook
* update the guidebook again
* alphabet
* documentation
* simplify documentation
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* make the briefing yml instead of code
* fix bug with sprites
* fix formating
* remove stuff from AntagSelection
* add stuff to AntagSpawner
* fix game rule
* removed secret xenoborg preset
* support for more than one entity for each antag role
* fix gamerule
* fixes
* no xeonborgs
* add xenoborgs to all at once
* engi xenoborg included
* more comments
* more recognizable
* more xenoborgs when more players
* removed unused stuff
* correct access
* removed unnecessary stuff
* use GetAliveHumans and make comments better
* Make the system more robust
* use a constant
* remove overload from the Destroy method
* has to be public to be used in the xenoborg system
* fix the mindrole methods
* not sure, but I was asked to do it
* use a constant for the color
* forgot to make it static
* removed param comments
* removed useless parameters
* fixed stuff
* added event listeneers to xenoborg mind change
* only 4
* unfuck the antagSpawner
* comment
* unfix stuff
* commentary
* removed xenoborg stuff from siliconLawSystem
* move some stuff to the component
* removed space
* removed uncessary stuff
* no need to crate a var
* move stuff from mothership comp to xenoborg comp
* removed XenoborgCoreRoleComponent
* comment on the AntagSelectLocationEvent
* added back empty line
* comment
* make the summary better
* make AntagRoleToPrototypes summary better
* adding useless stuff back cause it was there before
* hascomp instead of trycomp
* again
* LocId instead of string
* make a new logic for the whitelist of the spawnpoint
* added ghostrole tags back
* use hascomp instead of trycomp
* removed whitelist from SpawnPointComponent
* not needed anymore
* no longer subverted
* fixed names
* make it better
* add not
* i'm dumb
* briefing is now handled by the xenoborg system
* call evac if there is too many xenoborgs
* update submodule
* fix division
* Add AutoGenerateComponentPause and AutoPausedField to XenoborgsRuleComponent
* add lines between stuff
* Make the Blocking system more robust
* Make mothership inherit from BaseMob
* remove this stuff cause is bad
* Revert "Make the Blocking system more robust"
This reverts commit 099babfe1daef00e6073e04108920327416e4ca4.
* Mothership core snaps to grid
* stop mothership core from moving
* mothership core is static again
* make guidebook entry on how to xenoborg crew better
* Make mothership core damageable
* If xenoborgs need it, so do zombies i guess
* Start the NextRoundEndCheck
* follow private static readonly naming rule
* Samething
* Fix announcments
* Make it a datafield, no?
* Revert "Make it a datafield, no?"
This reverts commit 62f6255ccccdd583d7f833ae4dbcd09a670f721a.
* remove stuff
* doesn't need to move
* is kinda of a structure
* so it doesn't pry floors as soon as it spawns
* powercell hand to mothership core module
* label for new hand
* core_e -> core-e
* mothership core can pilot the shuttle again
* fix duplicated tag + description to xenoborg tags
* scout xenoborg can now move in space without the jetpack so it can better use the sword module
* improve basic xenoborg module
* remove changes from zombie rule comp
* swap AllEntityQuery for EntityQueryEnumerator
* new line at the end
* change to 15 seconds
* make MothershipCoreDeathAnnouncmentSent into a datafield
---------
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: beck-thompson <beck314159@hotmail.com>
2025-11-14 22:10:09 +00:00
VigersRay
6c158e6f0b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# .github/ISSUE_TEMPLATE/config.yml
# .github/ISSUE_TEMPLATE/issue_report.md
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
# Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeComponent.cs
# Content.Server/Atmos/EntitySystems/FlammableSystem.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Destructible/Thresholds/DamageThreshold.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/GuideGenerator/ReagentEntry.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/VomitSystem.cs
# Content.Server/Radio/EntitySystems/HeadsetSystem.cs
# Content.Server/Revenant/EntitySystems/RevenantSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Armor/SharedArmorSystem.cs
# Content.Shared/Bed/Sleep/SleepingSystem.cs
# Content.Shared/Cabinet/ItemCabinetSystem.cs
# Content.Shared/Chat/SharedChatSystem.Emote.cs
# Content.Shared/Chat/SharedChatSystem.cs
# Content.Shared/Clothing/EntitySystems/MaskSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffect.cs
# Content.Shared/EntityEffects/Effects/Transform/ExplosionEntityEffect.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Content.Shared/IoC/SharedContentIoC.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Ninja/Components/NinjaSuitComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Revenant/Components/RevenantComponent.cs
# Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs
# Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Weapons/Ranged/HitscanPrototype.cs
# Content.Shared/Xenoarchaeology/Artifact/XAT/BaseQueryUpdateXATSystem.cs
# README.md
# Resources/Audio/Weapons/attributions.yml
# Resources/Locale/en-US/_strings/ghost/make-ghost-gui.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/_strings/guidebook/chemistry/statuseffects.ftl
# Resources/Locale/en-US/_strings/job/job-description.ftl
# Resources/Locale/en-US/_strings/medical/components/crew-monitoring-component.ftl
# Resources/Locale/en-US/_strings/npc/hugbot.ftl
# Resources/Locale/en-US/_strings/npc/npc-debug.ftl
# Resources/Locale/en-US/_strings/speech/speech-triggers.ftl
# Resources/Locale/en-US/_strings/ui/stat-values.ftl
# Resources/Locale/en-US/guidebook/chemistry/conditions.ftl
# Resources/Locale/en-US/guidebook/chemistry/effects.ftl
# Resources/Locale/en-US/guidebook/chemistry/healthchange.ftl
# Resources/Locale/en-US/guidebook/entity-effects/conditions.ftl
# Resources/Locale/en-US/guidebook/entity-effects/effects.ftl
# Resources/Locale/en-US/guidebook/entity-effects/healthchange.ftl
# Resources/Maps/Shuttles/cargo_relic.yml
# Resources/Maps/_Sunrise/Station/bagel.yml
# Resources/Maps/_Sunrise/Station/barratry.yml
# Resources/Maps/_Sunrise/Station/fland.yml
# Resources/Maps/_Sunrise/Station/marathon.yml
# Resources/Maps/_Sunrise/Station/oasis.yml
# Resources/Maps/_Sunrise/Station/packed.yml
# Resources/Maps/_Sunrise/Station/plasma.yml
# Resources/Maps/_Sunrise/Station/relic.yml
# Resources/Maps/_Sunrise/event/clon_mine.yml
# Resources/Maps/_Sunrise/event/void.yml
# Resources/Prototypes/Body/Prototypes/vox.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Crates/fun.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/skeleton.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/base_electronics.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Reagents/narcotics.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Lathes/Packs/biogen.yml
# Resources/Prototypes/Recipes/Lathes/Packs/security.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Roles/Antags/nukeops.yml
# Resources/Prototypes/Roles/Antags/revolutionary.yml
# Resources/Prototypes/Roles/Antags/thief.yml
# Resources/Prototypes/Roles/Antags/traitor.yml
# Resources/Prototypes/Roles/Antags/wizard.yml
# Resources/Prototypes/Roles/Antags/zombie.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chef.yml
# Resources/Prototypes/Roles/Jobs/Civilian/mime.yml
# Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
# Resources/Prototypes/Roles/Jobs/Science/scientist.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Stacks/Materials/crystals.yml
# Resources/Prototypes/Stacks/floor_tile_stacks.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/equipped-HAND.png
# Resources/Textures/Clothing/Hands/Gloves/Color/black.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/mime.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody0.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwbloodyo.png
# Resources/Textures/Structures/Machines/microwave.rsi/mwo.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/meta.json
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw0.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_running_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mw_unlit.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwb.png
# Resources/Textures/Structures/Machines/microwave_syndie.rsi/mwo.png
# Resources/migration.yml
# RobustToolbox
2025-10-19 17:38:04 +02:00
Mora
8d47febe1d
Added Vox Chitter and Clicking ( #40878 )
...
Added Vox chitter and clicking
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-10-18 00:17:10 +00:00
Hannah Giovanna Dawson
e9ff240f84
Fix custom MIDI instruments sounding incorrect; add two more microphone instrument options ( #39210 )
...
* Custom instruments update
* Update the soundfont file to bank 100 and add a readme to its comments section
* Update the various instruments to use bank 100.
2025-10-16 16:51:49 +00:00
Myra
ce0ddc92d5
Change GeneralUser-GS soundfont to be full version ( #40888 )
...
Change GeneralUser-GS soundfont to be full
Its only like a few more mb's i dont see the issue
2025-10-13 21:11:09 +00:00
Mora
0a8268c6e4
Remove high pitched buzzing noise from spray2.ogg ( #40877 )
...
Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
2025-10-13 16:45:59 +00:00
Schuyler Duryee
368d4dd273
Add utility knife/box cutter ( #39567 )
...
* add sprites for box cutter
* move box cutter to melee, add yaml
* remove unneeded soundHit yaml
* add opening sound effect to box cutter
* modify sprites to look more like actual box cutters
* add BoxCutter tag and add to belts
* rename box cutter to utility knife
* remove accidental backtick
* move utility knife to correct place in tags
* remove SECOND accidental backtick??
* Fix utility knife arbitrage by reducing steel to 50
* Reduce damage to 4
* Reduce knife bounty reward to $2000
* modify utility knife icon to be larger
* Make utility knife extendable/retractable
* move slicing out of ComponentToggler
* change utility knife extend/retract sound
* Use TiniestShark's larger inhand images for utility knife
* utilty knife is now only Slicing when activated
2025-10-02 08:51:20 +00:00
Mora
c0264406c7
More Vox Sounds ( #39914 )
...
* Added more vox sounds
WHY IS IT ORGANIZED THIS WAY.
* Fix incorrect license fields
* License fix
* move vox_gasp.ogg to gasps
* Update Attributions
* Update attributions.yml
* file path fix
* Update attributions.yml
* Update attributions.yml
* Update attributions.yml
* Update attributions.yml
* Update attributions.yml
* Update attributions.yml
* Standardize Attributions, fixed sources
* Adjusted Vox DeathGasp and sigh to be more auditorily distinct from one-another
* Made vox gasp slightly faster
2025-09-27 12:01:14 -05:00
Vigers Ray
e67f4a6672
Merge remote-tracking branch 'space-wizards/master'
2025-09-27 03:54:27 +03:00
banumbas
03bb5eba20
Фелиниды ( #3262 )
...
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-09-27 01:02:45 +03:00
Sidzaru
5f1e4d604a
Empty Implanter ( #3212 )
...
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-09-27 00:22:52 +03:00
DerKurait
02644be1ad
Производство продвинутых медикоментов. Попытка 2 ( #3205 )
...
Co-authored-by: Vitaliy_Merzun <dunoquas487@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-09-27 00:14:48 +03:00
banumbas
397c2620f2
Резоми ( #2739 )
...
Co-authored-by: pofitlo <kuzminvladislav237@gmail.com>
Co-authored-by: Rinary <rinary.super@gmail.com>
Co-authored-by: Matthew Herber <matthewherber@sbcglobal.net>
Co-authored-by: Cerzix <123toy@web.de>
Co-authored-by: Citrea_Lingua <citrea.lingua@gmx.net>
Co-authored-by: Salem <Enderblaze03@gmail.com>
Co-authored-by: pxc1984 <igor.mamaev1@gmail.com>
2025-09-26 23:37:33 +03:00
Vigers Ray
ed619598f1
Merge remote-tracking branch 'space-sunrise/master'
2025-09-11 19:03:21 +03:00
Copilot
aba00f7e8f
Implement Mentor Help System (MHelp) - Complete Ticket-based Help for Game Questions ( #2915 )
...
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: VigersRay <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-09-09 20:54:52 +03:00
ScarKy0
b2c9106839
Vulpkanin Species ( #37539 )
...
* [April Fools] Elf species (#35353 )
elf
* [April Fools] Juice that makes me go insane (#35370 )
* kill me
* MAKE IT STOP
* is it finally over?
* web edit
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* webedit
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* webedit
* WEBEDIT PLEASE
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
---------
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
* vulpkanin species
the ultimate april fools joke
Co-Authored-By: Kr8art <188977876+kr8art@users.noreply.github.com>
* cant be bothered
* make build and test debug run on the april fools branch (#35396 )
welp
* Revert "[April Fools] Juice that makes me go insane (#35370 )"
This reverts commit fcbdcf8452cb1247733242aa44ea5b9f38dfa3d2.
* Revert "[April Fools] Elf species (#35353 )"
This reverts commit 704293a051033026bfca0c9e161d97796bc0cb81.
* nuh uh
* localized names
* fix survival box
* abilities (Mostly don't work yet, pending PRs)
* wagging loc
* slight heat tweaks
* stuff
* Update Vulpkanin.xml
* vulp screams + quieter howl
* MessyDrinker by Orks
* MessyDrinker guidebook
* animal bones
* fix wagging
* missed
* no loc
* Lower damage, remove butchering
* Revert "animal bones"
This reverts commit 3457cde13e57336678f62a20bf57fb315844c240.
* leap
* collision
* leap desc update
* leap guidebook
* fix leap
* microbalance
* comment
* microbalancing pt 2
* microbalancing pt 3
* test fail fix (i hope)
* fix organs
* no leaping on the ground
* remove SolutionScanner + ling work
* fix clone
* add stuff back
* microbalancing pt yes
* male vulp names
mainly slavic names with some similiar sounding ones mixed in
* Revert "male vulp names"
This reverts commit 1666f81821bfea241262627160a594dd1b0ce050.
* male vulps names pr 2 (slavic, dog names, few puns)
Slavic names, with mixed in typical dog names and some puns
* female names (mainly slavic, other stuff mixed in)
* oops
* Update vulpkanin.yml
* Vulps WIP Work (#1 )
* Modified aesprite tools
* WIP
* wipperoni
* We are done here, wawa
* Revert "Merge branch 'aseprite-tools' into hannah/vulps-wip"
This reverts commit d258645df60a94d0217fecd85a38545f2b951cde, reversing
changes made to 0ae39e862152ef6548533eba0547709594c55e90.
* Resolve merge issue
* Fix Urist McVulp forgetting his fursuit
---------
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
* re-add ears and husk overlay
* revert adding ears to vox
* Crest Markings
* Fade Markings
* Sharp Markings
* microbalance + comments
* censor character nudity option compliance
* Ear Markings
* 1984 wagging animations
* Tail Markings
* tail wag icon
* annoyance
* guidebook
* slight temperature tweak
* seperate out snouts, port over 2 markings for testing
* fix
* seperate snout file
* Snout/Head Markings
* cleanup + locale for ears
* Head and Snout loc
* gray eyes
* crest and husk cleanup
* Tail and Chest loc
* Legs and Arms loc
* most important commit
* mime vulps like rations too
* missing loc
* microbalance
* not needed
* goatee
* white eyes
* harmony feedback tail fixes
* personal changes and fixes after playing
* fix fluffy tail clipping
* Sprite fixes, displacement fixes (#2 )
* Tune head displacement
* Vulps Sprite Tuning
* helmets
* detail
* Urist
* wag
* comban't
* fix attributions
* remove vulp biosuits
* fix vulp beards
* fixed up ears
* comment note
* further ear tweaks
* engi helmets
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kr8art <188977876+kr8art@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
Co-authored-by: Southbridge-fur <southbridgefur@gmail.com>
2025-09-05 12:43:17 +02:00
Perry Fraser
1ecf62e72a
fix: monoify card_drag, card_tube_bonk ( #39511 )
...
Also move an attribution to the right directory.
2025-08-27 23:08:54 +02:00
ReWAFFlution
c5fca9e384
Merge remote-tracking branch 'sunrise'
2025-08-25 05:43:34 +03:00
Vigers Ray
252e81c728
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Shared/Gravity/SharedGravitySystem.cs
# Content.Shared/Implants/SharedSubdermalImplantSystem.cs
# Resources/Locale/en-US/_strings/traits/traits.ftl
# Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
# Resources/Prototypes/Entities/Objects/Misc/implanters.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
Samuka-C
de240e1739
Xenoborgs part 5 ( #37068 )
...
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: WarPigeon <DaedalusTheGamer@gmail.com>
2025-08-19 18:23:47 +02:00
Vigers Ray
533dda3c56
Merge remote-tracking branch 'space-sunrise/master'
2025-08-15 02:08:29 +03:00
Kendrick
baec9b9dfd
Хлопушки! ( #2727 )
2025-08-15 00:23:59 +03:00
Vigers Ray
de3423b687
Merge remote-tracking branch 'space-sunrise/master'
...
# Conflicts:
# Content.Server/RoundEnd/RoundEndSystem.cs
# Resources/Locale/en-US/_strings/seeds/seeds.ftl
# Resources/Prototypes/_Sunrise/Maps/Pools/default.yml
2025-08-14 13:25:17 +03:00
KaiserMaus
48e088ea94
Дебаг Вендор Оружия. Со всем оружием детка! ( #2743 )
2025-08-13 23:56:00 +01:00
Vigers Ray
4a83f024f0
курва
2025-08-13 19:48:07 +03:00
