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
Verm
47258651a3
Make container draw disableble for mob-affecting Hyposprays ( #30683 )
...
* Seperate container draw from affects mobs
* Spaces
* More spaces
* Fix toggle
* Use better ands
* Reorder checks for Performance™️
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-05-07 16:43:47 -04:00
banumbas
dd3b683a91
Добавлен медицинский гипоспрей с фильтрацией ( #1494 )
2025-03-25 09:41:32 +03:00
Vigers Ray
53711110c3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/administration/commands/announce-command.ftl
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
2025-02-12 18:46:28 +03:00
SpaceManiac
4122310735
Fix 38 non-obsolete warnings ( #33794 )
2025-02-11 20:59:50 +11:00
Vigers Ray
d853b875eb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/CharacterSetupGui.xaml
# Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/GameTicking/GameTicker.Lobby.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Store/Systems/StoreSystem.Ui.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
# Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +03:00
beck-thompson
da4fa9bea9
Clumsy system refactor ( #31147 )
...
* First commit
* Fixes
* Added the noise
* Renames
* Timespan
* Fixed space
* entity -> ent
* This shouldn't work
* opps....
* Datafield name change
* Better comments
* small comment
* Personal skill issue
* Event renames and stuff
* Couple fixes
* Defib ref fixes (Silly me)
* Added clumsy back!
* no hard code clumsy!
* Identity fix
* Event name change
* Comment change
* Function name change
* opp
* Update names
* Damage stuff!
* Fixes!
* Fixes
* opps
* This was hidden away!!
* negative diff feeds me
2024-11-16 00:46:01 +01:00
Rinary
b6920aec99
Рефактор мехов, правки в системе медицины ( #507 )
...
* mech system, fix hands, fix fraction
* fix
* fix fake hypo
* fix triple airlocks big sizing
* fix
* upd clown hulk
* xd fix 2
* bigger exit delay
* mechs reflect changes
* guns changes
* draike up
* mechs in another category
* add equipment
* Revert "upd clown hulk"
This reverts commit b8084967040be5d442b2d4770cf7fdece1daa2a8.
* SPIN MY MECH ASS
* mech no rot
* some resprite
* no injections in hardsuits
* some species can not be injectable
* medipans can ignore armor, admeme hypospray ignore armor
* fix
* fix admeme hypo
* mob fraction fix
* rover + nt gygax add
* fix description
* fix id
* some better dome effects
* если пустая гильза в стволе -> Кнопки "казнь" не будет
* phazon added
* fix server crashes
* full rework mechs on mobstates, coils fix mechs, diagnostic hud show health bar for mechs, mechs fastest repair, add mech analyzer
* some fixes
* configure health of all mechs
* upd
* add rover to uplink
* translate bundle
* change price
* phazon construction
* fix
* fix
* Finish phazon construction
* add phazon research and recipes
* phazon construction translate
* fix
* Mech lights
* fix
* translate light action
* Mech sounds, fix damage
* fix
* fix hello sound
* upd
* fix linter
* change damagePercentage
* fix
* fix hello sound
* temp disable damage sounds
* fix battery needed on construct
* some changes
* add mech painting system as DEBUG(in dev)
* Fix yaml, durand paintings
* mech spray cans textures
* change sprite
* fix
* ripley, clarke new textures
* ripley,clarke paints
* fix
* sec pod texture
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-10-30 10:53:00 +03:00
Cojoke
ef1fadf275
Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem ( #30084 )
...
* Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem
* guap
* More fixes
* Wait you can do that?
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-09-02 13:26:04 +02:00
SlamBamActionman
b9fa941ca6
Turn ReagentEffects into generic EntityEffects ( #28168 )
...
* Oh the possibilities
* Merge fixes
* Forgot to remote LavaSystem oops
* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs
* Throw exception for unimplemented effectargs
* Remove Json and overrideable datafields
* Fix test issues
* Actually fix the compiling issue
* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
2024-06-30 13:43:43 +10:00
blueDev2
3efd7559b0
Fixed hypo and injector entities going into disposal units ( #28317 )
2024-05-30 00:18:07 -04:00
Kara
1596e04d0f
Resolve all non-obsoleting warnings in content ( #27934 )
...
* Resolve all non-obsoleting warnings in content
* Update ClientGameTicker.cs
* Update SkeletonAccentSystem.cs
* Update BwoinkSystem.cs
2024-05-11 20:13:58 -07:00
Plykiya
f192d7901f
Hyposprays Draw from Jugs ( #25544 )
...
* Hyposprays Draw from Jugs
* Fix last onlyMobs usage in yml
* Some Suggested Changes
* Remove unnecessary datafield name declarations
* Remove unnecessary dirtying of component
* Same line parentheses
* Added client-side HypospraySystem
* Cache UI values and only updates if values change
* empty line
* Update label
* Label change
* Reimplement ReactionMixerSystem
* Remove DataField from Hypospray Toggle Mode
* Change ToggleMode from enum to Bool OnlyAffectsMobs
* Add DataField required back since it's required for replays...?
* update EligibleEntity and uses of it
* Add user argument back
* Adds newline
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* Guard for dirty entity
* Adds summary tag
---------
Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-30 14:59:16 +11:00
metalgearsloth
da1007b7f1
Chem injectors ECS ( #6366 )
2022-02-07 00:34:13 +11:00
metalgearsloth
2e5808085d
Set mover velocity via system ( #6288 )
2022-02-02 17:34:25 +11:00
Leon Friedrich
7e49b22a74
Verb predict ( #5638 )
2021-12-16 21:42:02 +11:00
Vera Aguilera Puerto
e3478f894e
Re-do InteractionSystem IEntity -> EntityUid conversion ( #5767 )
2021-12-13 22:17:18 -07:00
Ygg01
b2aca94586
Refactor Solution from Shared -> Server ( #5078 )
...
* Move entity solution entity systems to shared
* Move SolutionComponents to Server
* Fix namespaces
* Remove Networked Component.
* Fixes
* Add components to ignore list
2021-10-29 23:40:15 +11:00
Ygg01
c209e3f29b
Solution refactor ( #4407 )
...
* Rename SolutionContainerCaps -> Capability
* Move IExamine event to Chemistry System.
* ECS the ISolutionChange into SolutionChangeEvent
* Unify SolutionContainer into a single shared component
* Replace ISolutionInteraction with SolutionContainerComponent
* Move all methods from SolutionContainer to ChemistrySystem
* Refactor EntitySystem calls to Dependencies
* Refactor SolutionContainer to SolutionManager
* Fix yamls
* Fix test fails
* Fix post merge issues
* Fix various issues with SolutionManager
* More fixes
* Fix more components
* Fix events not being directed
* Fixes for Hypospray
* Separate removal and iteration on Metabolism
* Fix creampie problems
* Address some of sloth's issues
* Refactors for Systems
* Refactored solution location
* Fix tests
* Address more sloth issues
* Fix dependency
* Fix merge conflicts
* Add xmldocs for Capabilities components
* Remove HasSolution/TryGetDefaultSolution and Add/Remove Drainable/Refillable
* Replace Grindable/Juiceable with Extractable
* Refactor field names
* Fix Drainable
* Fix some issues with spillable and injector
* Fix issues with Grinder
* Fix Beaker having duplicate solutions
* Fix foaming
* Address some MGS issues
* Fix Uid issues
* Fix errors in solution Tranfer
* Fixed some extra values constant values
* Cola is drinkable now
2021-09-06 23:49:44 +10:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
