Vigers Ray
95b86d7a4b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenu.xaml
# Content.Client/Construction/UI/ConstructionMenu.xaml.cs
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/Warps/WarpPointSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
# Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# Resources/Locale/en-US/_strings/plants/mutations.ftl
# Resources/Locale/en-US/_strings/stack/stacks.ftl
# Resources/Locale/en-US/_strings/teleportation/teleportation-menu-gui.ftl
# Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
# Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
# Resources/Prototypes/Entities/Objects/Power/powercells.yml
# Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/nuke.yml
# Resources/Prototypes/Reagents/toxins.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/clown_banana.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/hamtr_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/honker_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/ripley_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/mechs/vim_construction.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/airlock_clockwork.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/blast_door.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/firelock.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/glassbox.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/secretdoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
# Resources/Prototypes/Recipes/Construction/Graphs/structures/windoor.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/APC.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/air_alarms.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/disposal_machines.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/intercom.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/lighting.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/station_maps.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_generator.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bladed_hats.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/bola.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/improvised_arrow.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_grenade.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/modular_mine.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/shiv.yml
# Resources/Prototypes/Recipes/Construction/Graphs/weapons/spear.yml
# Resources/Prototypes/Recipes/Construction/structures.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/cleanbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/firebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/honkbot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/mimebot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/firebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pipebomb.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/cratefreezer.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/storage/tallbox.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/strawhat.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
# Resources/Prototypes/Recipes/Reactions/medicine.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/cemantle.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/mime.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/mime.rsi/meta.json
2025-05-04 23:13:12 +03:00
metalgearsloth
51bff89b23
Fix AI movement ( #37114 )
...
Don't relay blocking anymore.
2025-05-02 12:07:12 +02:00
VigersRay
0e8d030be2
фикс BlockMovementComponent
2024-08-22 06:51:38 +03:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
Psychpsyo
9a68cf0b0e
Re-add improved random sentience event ( #29123 )
...
* Re-add improved random sentience event
* Make randomly sentient PDA more likely
* Make vending machine sentience less likely
* Make requested changes
* Make randomly sentient captain's gear more likely
* Sentient captain sabre has pirate accent
* Tweak new random sentient object a bit more
* Sentient PDA improvements
* Apply recommended fixes
* Add requested changes
* Fix merge conflict
2024-08-18 17:41:12 -06:00
Vigers Ray
4ee05b0350
Продвинутые борги ( #247 )
...
* Ну типа всё
* InnateItemSystem и фичи для пИИ
2024-07-27 10:23:34 +03:00
Leon Friedrich
ee2c115e5b
Turn interaction related attempt events into structs ( #29168 )
...
* Turn InteractionAttemptEvent into a struct event
* readonly
* GettingInteractedWithAttemptEvent
* ConsciousAttemptEvent
2024-06-19 00:30:41 +10:00
Nemanja
7ddee71379
More borg tweaks ( #19143 )
...
* borg tweaks but i'm gonna go code fun stuff first
* werkin' on it
* a ton of tweaks
* fuck everyone and then myself
2023-08-14 18:34:23 -05:00
Nemanja
98fa00a21f
Borgs ( #18136 )
...
* Laws
* positronic brain and PAI rewrite
* MMI
* MMI pt. 2
* borg brain transfer
* Roleban support, Borg job (WIP), the end of mind shenaniganry
* battery drain, item slot cleanup, alerts
* visuals
* fix this pt1
* fix this pt2
* Modules, Lingering Stacks, Better borg flashlight
* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.
* sprotes
* no zombie borgs
* oh fuck yeah i love a good relay
* charger
* fix the tiniest of sprite issues
* adjustable names
* a functional UI????
* foobar
* more modules
* this shit for some reason
* upstream
* genericize selectable borg modules
* upstream again
* holy fucking shit
* i love christ
* proper construction
* da job
* AA borgs
* and boom more shit
* admin logs
* laws redux
* ok just do this rq
* oh boy that looks like modules
* oh shit research
* testos passo
* so much shit holy fuck
* fuckit we SHIP
* last minute snags
* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
