Vigers Ray
d6c0a011b7
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Clothing/Systems/ChameleonClothingSystem.cs
# Content.Client/Fax/UI/FaxWindow.xaml
# Content.Client/Ghost/GhostSystem.cs
# Content.Client/Holiday/HolidaySystem.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Mech/MechSystem.cs
# Content.Client/Stealth/StealthSystem.cs
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs
# Content.Server/Bed/BedSystem.cs
# Content.Server/Body/Systems/BodySystem.cs
# Content.Server/Body/Systems/RespiratorSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Communications/CommunicationsConsoleComponent.cs
# Content.Server/EntityEffects/Effects/AreaReactionEffect.cs
# Content.Server/EntityEffects/Effects/MakeSentient.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustPests.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustToxins.cs
# Content.Server/EntityEffects/Effects/PlantMetabolism/PlantAdjustWeeds.cs
# Content.Server/EntityEffects/Effects/PlantMutateGases.cs
# Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Preferences/Managers/ServerPreferencesManager.cs
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Bed/Components/HealOnBuckleComponent.cs
# Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
# Content.Shared/EntityEffects/Effects/ExplosionReactionEffect.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Item/ItemToggle/Components/ComponentTogglerComponent.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Content.Shared/Wieldable/SharedWieldableSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/atmos/plaque-component.ftl
# Resources/Locale/en-US/_strings/chat/chat-channel.ftl
# Resources/Locale/en-US/_strings/components/screen-component.ftl
# Resources/Locale/en-US/_strings/inventory/components/slot-block-component.ftl
# Resources/Locale/en-US/_strings/mass-media/news-discord.ftl
# Resources/Locale/en-US/_strings/objectives/commands/stripall.ftl
# Resources/Locale/en-US/_strings/salvage/job-board.ftl
# Resources/Locale/en-US/_strings/ui/spray-painter-window.ftl
# Resources/Locale/en-US/_strings/ui/turret-controls.ftl
# Resources/Maps/_Sunrise/Station/box.yml
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
# Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/service.yml
# Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Clothing/Masks/masks.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
# Resources/Prototypes/Reagents/medicine.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
# Resources/Textures/Clothing/Hands/Gloves/KnuckleDusters/brassknuckleduster.rsi/equipped-OUTERCLOTHING-reptilian.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/alien3.png
# Resources/Textures/Effects/speech.rsi/alienroyal3.png
# Resources/Textures/Effects/speech.rsi/default3.png
# Resources/Textures/Effects/speech.rsi/guardian3.png
# Resources/Textures/Effects/speech.rsi/holo3.png
# Resources/Textures/Effects/speech.rsi/lawyer3.png
# Resources/Textures/Effects/speech.rsi/lizard3.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Effects/speech.rsi/moth3.png
# Resources/Textures/Effects/speech.rsi/robot3.png
# Resources/Textures/Effects/speech.rsi/slime3.png
# Resources/Textures/Effects/speech.rsi/spider3.png
# Resources/Textures/Effects/speech.rsi/syndibot3.png
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_f.png
# Resources/Textures/Mobs/Species/Reptilian/parts.rsi/head_m.png
# Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png
# Resources/Textures/Structures/Piping/disposal.rsi/meta.json
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/steel_dirty.png
# Resources/migration.yml
# runclient-Tools.bat
# runclient.bat
2025-05-27 03:41:41 +03:00
Tayrtahn
fe4d8e2ea9
Cleanup warning in NPCCombatSystem.Ranged ( #37751 )
...
Cleanup 1 warning in NPCCombatSystem.Ranged
2025-05-23 10:56:37 -04:00
Vigers Ray
d0f5e8d361
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/validate-rgas.yml
# .github/workflows/validate-rsis.yml
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Options/UI/OptionsMenu.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Standing/StandingStateSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/Markings/MarkingManager.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/Components/SubdermalImplantComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/VendingMachines/VendingMachineComponent.cs
# Resources/Audio/Lobby/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/forceghost.ftl
# Resources/Locale/en-US/_strings/clothing/components/fire-protection-component.ftl
# Resources/Locale/en-US/_strings/components/storage-voice-control-component.ftl
# Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/lathe/lathe-categories.ftl
# Resources/Prototypes/Access/command.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
# Resources/Prototypes/Catalog/thief_toolbox_sets.yml
# Resources/Prototypes/Datasets/Names/Operation_prefix.yml
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/arachnid_last.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/Names/clown.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/first.yml
# Resources/Prototypes/Datasets/Names/first_female.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/Names/hologram.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Datasets/Names/moth_first_female.yml
# Resources/Prototypes/Datasets/Names/moth_first_male.yml
# Resources/Prototypes/Datasets/Names/moth_last.yml
# Resources/Prototypes/Datasets/Names/mushman_first.yml
# Resources/Prototypes/Datasets/Names/mushman_last.yml
# Resources/Prototypes/Datasets/Names/ninja.yml
# Resources/Prototypes/Datasets/Names/ninja_title.yml
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Prototypes/Datasets/Names/reptilian_female.yml
# Resources/Prototypes/Datasets/Names/reptilian_male.yml
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Datasets/Names/wizard_first.yml
# Resources/Prototypes/Datasets/Names/wizard_last.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/corporations.yml
# Resources/Prototypes/Datasets/criminal_records.yml
# Resources/Prototypes/Datasets/rat_king_commands.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Procedural/salvage_loot.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/game_presets.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/program_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
# Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/migration.yml
# Tools/actions_changelogs_since_last_run.py
2025-03-25 11:30:01 +03:00
chromiumboy
10c868011e
Sentry turrets - Part 3: Turret AI ( #35058 )
...
* Initial commit
* Updated Access/command.yml
* Fix for Access/AccessLevelPrototype.cs
* Added silicon access levels to admin items
* Included self-recharging battery changes
* Revert "Included self-recharging battery changes"
* Addressed reviewers comments
* Additional reviewer comments
2025-03-01 18:42:33 +01:00
haiwwkes
5192d120ea
Новая панель эмоутов. ( #891 )
...
* wacky
* work
* work
* work
* work
* eff
* a
2024-12-24 23:27:09 +03:00
haiwwkes
dc7caa82c3
This is a temporary measure and will be reverted once the DMCA counterclaim process is completed. ( #748 )
...
* Revert "fix (#612 )"
This reverts commit 2bfefd1b10#534 )"
This reverts commit 7efd457a51
2024-12-01 17:40:55 +03:00
haiwwkes
40568a243c
lay down + scope ( #476 )
...
* remove old system
* new scope, new laying
2024-10-11 11:52:39 +03:00
DrSmugleaf
4aba9ec131
Fix NPC line of sight not working if trying to ranged target a blocking entity ( #30055 )
2024-07-20 13:58:33 +10:00
metalgearsloth
868f3298e5
Xeno spitter fixes ( #18573 )
...
* Xeno spitter fixes
- Require hands for pickup compounds
- Ranged combat can force movement to ignore LOS checks if ranged wants better LOS.
* Also spirates
IDK how this worked before but TryGetGun shouldn't care about combatmode.
* 1 more
2023-08-02 15:34:54 -06:00
metalgearsloth
c31c848afd
Shooting NPCs and more ( #18042 )
...
* Add pirate shooting
* Shooting working
* Basics working
* Refactor time
* More conversion
* Update primitives
* Update yml
* weh
* Building again
* Draft
* weh
* b
* Start shutdown
* Starting to take form
* Code side done
* is it worky
* Fix prototypes
* stuff
* Shitty working
* Juke events working
* Even more cleanup
* RTX
* Fix interaction combat mode and compquery
* GetAmmoCount relays
* Fix rotation speed
* Juke fixes
* fixes
* weh
* The collision avoidance never ends
* Fixes
* Pause support
* framework
* lazy
* Fix idling
* Fix drip
* goobed
* Fix takeover shutdown bug
* Merge fixes
* shitter
* Fix carpos
2023-08-01 19:48:56 -05:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
metalgearsloth
cd487b66e4
Content mapmanager query changes ( #16894 )
2023-05-28 23:22:44 +10:00
DrSmugleaf
34bcd042d1
Remove combat mode component reference ( #15206 )
2023-04-08 13:16:48 -07:00
metalgearsloth
330bb7bb14
Remove gun .Owners ( #14585 )
2023-03-11 20:08:22 +11:00
metalgearsloth
3b3963083b
Replace GridEntityId with Owner ( #12743 )
2022-12-12 14:59:02 +11:00
metalgearsloth
7910bd3ff4
Context steering for NPCs ( #12915 )
2022-12-12 14:33:43 +11:00
metalgearsloth
78a4ab6eb2
Update for collision events by-ref ( #10933 )
2022-09-14 17:26:26 +10:00
metalgearsloth
0286b88388
NPC refactor ( #10122 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-06 00:28:23 +10:00
