Maps fix1 #360
Closed
Maps fix1 #360
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Mimic anomaly fixes * Flashable fix
* Brigmedic fixes * Brigmedic ffixes 2 * BrigmeddicSurvivalBoxFix
меняет у смотрителя стандартный МК58 на МК68
Из-за изменения системы инвентаря бандероль стала бесполезной, так как в неё помещалась всего 7 патронов. Данный апдейт увеличивает вместимость бандероли до 36.
* stun tweaks * more tweaks * tweak tweak
This reverts commit 82a4412.
This reverts commit 7b460a6. # Conflicts: # Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs # Content.Server/Salvage/SalvageSystem.Expeditions.cs # Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml # Resources/Prototypes/Procedural/salvage_factions.yml
…pace-station-14 into test-merge # Conflicts: # Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Atmos/Reactions/FrezonCoolantReaction.cs # Content.Server/Atmos/Reactions/MiasmicSubsumationReaction.cs # Content.Server/Atmos/Reactions/TritiumFireReaction.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/Lathe/LatheSystem.cs # Content.Shared/CCVar/CCVars.cs # README.md # Resources/Audio/Announcements/license.txt # Resources/Audio/Effects/Footsteps/attributions.yml # Resources/Audio/Misc/license.txt # Resources/Audio/Voice/Talk/attributions.yml # Resources/Audio/Weapons/licenses.txt # Resources/Locale/en-US/connection-messages.ftl # Resources/Locale/en-US/research/technologies.ftl # Resources/Locale/en-US/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl # Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks.ftl # Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/pda.ftl # Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/fun/toys.ftl # Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl # Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl # Resources/Locale/en-US/store/uplink-catalog.ftl # Resources/Locale/ru-RU/administration/smites.ftl # Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl # Resources/Locale/ru-RU/guidebook/guides.ftl # Resources/Locale/ru-RU/reagents/meta/toxins.ftl # Resources/Locale/ru-RU/research/technologies.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/medical.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/crates/engineering.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/glasses.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/helmets.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/cloaks.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/jumpsuits.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/toys.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/rifles/rifles.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl # Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/windoors/windoor.ftl # Resources/Maps/Shuttles/mining.yml # Resources/Maps/aspid.yml # Resources/Maps/bagel.yml # Resources/Maps/box.yml # Resources/Maps/cluster.yml # Resources/Maps/core.yml # Resources/Maps/driller.yml # Resources/Maps/fland.yml # Resources/Maps/gemini.yml # Resources/Maps/infiltrator.yml # Resources/Maps/marathon.yml # Resources/Maps/metastation.yml # Resources/Maps/nukieplanet.yml # Resources/Maps/omega.yml # Resources/Maps/origin.yml # Resources/Maps/packed.yml # Resources/Maps/saltern.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml # Resources/Prototypes/Catalog/Fills/Boxes/medical.yml # Resources/Prototypes/Catalog/Fills/Crates/cargo.yml # Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Prototypes/Damage/modifier_sets.yml # Resources/Prototypes/Entities/Clothing/Belt/belts.yml # Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/moth.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml # Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml # Resources/Prototypes/Entities/Objects/Fun/toys.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml # Resources/Prototypes/Entities/Objects/Materials/materials.yml # Resources/Prototypes/Entities/Objects/Misc/briefcases.yml # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Entities/Objects/Specific/chemistry.yml # Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/chainsaw.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml # Resources/Prototypes/Maps/Driller.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Maps/core.yml # Resources/Prototypes/Maps/kilostation.yml # Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml # Resources/Prototypes/Reagents/biological.yml # Resources/Prototypes/Reagents/medicine.yml # Resources/Prototypes/Reagents/toxins.yml # Resources/Prototypes/Recipes/Construction/clothing.yml # Resources/Prototypes/Recipes/Cooking/meal_recipes.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/Recipes/Reactions/chemicals.yml # Resources/Prototypes/Research/arsenal.yml # Resources/Prototypes/Research/industrial.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Engineering/senior_engineer.yml # Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml # Resources/Prototypes/Roles/Jobs/Medical/senior_physician.yml # Resources/Prototypes/Roles/Jobs/Science/senior_researcher.yml # Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml # Resources/Prototypes/SoundCollections/footsteps.yml # Resources/Prototypes/SoundCollections/lobby.yml # Resources/Prototypes/tags.yml # Resources/ServerInfo/Guidebook/Cargo/Salvage.xml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/icon-flash.png # Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json # Resources/Textures/Mobs/Customization/Moth/moth_parts.rsi/moonfly_head.png # Resources/Textures/Objects/Devices/pda.rsi/meta.json # Resources/Textures/Objects/Devices/pinpointer.rsi/meta.json # Resources/Textures/Objects/Fun/figurines.rsi/meta.json # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png # Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png # Resources/migration.yml
Related to commit 591f458
This reverts commit 804c995.
…h-Team/space-station-14 into arumoon-server # Conflicts: # Resources/Prototypes/Entities/Objects/Power/lights.yml
* main1 * shitfix1 * shitfix2 * shitfix2.1 * shitfix2.2 * shitfix2.3 * shitfix2.4 * shitfix2.6 * shitfix2.7 * shitfix2.8 * shitfix2.9 * sgitfix3.0 * shitfix3.HZ * shitfix3.1 * shitfix3.2 * final. --------- Co-authored-by: MilenVolf <[email protected]>
…h-Team/space-station-14 into arumoon-server # Conflicts: # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Electrocution/ElectrocutionSystem.cs # Resources/Maps/core.yml # Resources/Maps/saltern.yml # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Reagents/elements.yml
* Drinks-Cartons-Update * Juice Sec remove
* Tehtra update * oh fine....
исправление БЩ
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Были исправлены мелкие баги и ошибки на картах лайтхаус и дриллер!
🆑