Vigers Ray
b378fdc706
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/Stylesheets/StyleNano.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/Nutrition/EntitySystems/FoodSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/PAI/SharedPAISystem.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Locale/en-US/_strings/access/components/genpop.ftl
# Resources/Locale/en-US/_strings/doors/components/turnstile.ftl
# Resources/Locale/en-US/_strings/power/battery.ftl
# Resources/Locale/en-US/_strings/store/pai-catalog.ftl
# Resources/Locale/en-US/_strings/tools/simple-tool-usage.ftl
# Resources/Locale/en-US/_strings/ui/controls.ftl
# Resources/Locale/en-US/_strings/weapons/ranged/upgrades.ftl
# Resources/Prototypes/Access/misc.yml
# Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Objects/Fun/toys.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Recipes/Lathes/Packs/science.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Species/vox.yml
# Resources/Prototypes/Store/currency.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/borg_types.yml
# Resources/Textures/Clothing/Head/Hats/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/capformaldress.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/capformal.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/captain_sabre.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/energykatana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/katana.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/machete.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png
# Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png
# Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png
# Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png
# Resources/migration.yml
2025-04-28 01:29:55 +03:00
Łukasz Lindert
04ea0b5e5a
Solution drag and drop now checks if container is closed and drainable ( #34683 )
...
drainable fix
2025-04-21 17:50:07 +02:00
Vigers Ray
5d2cdd3f44
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.cs
# Content.Server/Roles/Jobs/JobSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Tools/lighters.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Recipes/Lathes/machine_boards.yml
# Resources/Prototypes/Species/vox.yml
2025-04-21 08:56:50 +03:00
Vigers Ray
aaae7cbb9c
Фиксы и улучшение следов
2025-04-21 07:35:26 +03:00
Princess Cheeseballs
251cfbd8be
Puddle Code Slipping Cleanup ( #35845 )
...
* Init Commit
* windows yelling at me to update commit
* working commit, need prediciton and more dehardcoding
* Project 0 warnings
* Working Commit (Near Final)
* ryder got confused commit
* I love Merge Conflicts :)
* Working commit, no prediction
* Forgot the yaml changes
* Comments and typos
* Apparently while the reduced launch mult of lube was initialized it was never used so I revered back to default
* Fixed an incorrect divisor
* bit of cleanup
* Prediciton fixed, and puddles now affect all entities
* FORGOT TO RENAME A VERY IMPORTANT VARIABLE OOPS
* Really big I forgor moment
* Even bigger I forgor moment
* four more merge conflicts to fix four more oopsies
* fixed actual divide by zero moment and also im very dumb
* Even bigger I forgor moment
* four more merge conflicts to fix four more oopsies
* fixed actual divide by zero moment and also im very dumb
* Fix all test fails
* code cleanup
* Webedit whitespace
* Code cleaup
* whitespace webedit
* whitespace webedit
* whitespace webedit
* whitespace removal
* Comments and cleanup
* Re-Added 20 warnings as per Ork's request
* Cleanups
* Spacing fix
* bugfixes and cleanup
* Small bugfix
* Actually dirty the slipComp for real
* Added Friction field to Reagent Prototype per design discussion
* Sliding system is kill
2025-04-20 17:27:12 -04:00
Vigers Ray
e2aab392db
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/PDA/PdaSystem.cs
# 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/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/borg_types.yml
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png
# Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png
2025-04-20 02:52:59 +03:00
MilenVolf
6f475741b2
[ #30096 Fix] Dumping a RefillableSolution into a DumpableSolution now requires CanComplexInteract ( #33350 )
...
* dumping containers now require having at least one hand
* Cleanup
* Better
* Apply suggested changes
* Cleanup
---------
Co-authored-by: Luiz Costa <luiz@mavromati.com>
2025-04-19 16:32:17 -04:00
Vigers Ray
10f69d2e82
фикс апстрима
2025-04-19 04:11:52 +03:00
Vigers Ray
c9eb6bd25e
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Resources/Locale/en-US/_strings/materials/silo.ftl
# 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
2025-04-19 03:51:31 +03:00
Jajsha
a6741e42c1
Un-Hardcode water evaporation & mopping behavior ( #33399 )
...
* Un-harcode slipperiness
* Make it actually work
* Prettyfy
* Cleanup GetEvaporatingReagents
* Fix mopping with space lube + wrong solutions in absorbance
* Remove LINQ and rename parameters
* Change evaporation speed to fixedpoint2
* Add evaporating speed functionality
* Remove unused imports
* Swap around reagent evaporation speed and puddle evaporation speed.
---------
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2025-04-18 20:11:28 -04:00
Vigers Ray
0e350ab6d3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Actions/ActionsSystem.cs
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
# Content.Server/GameTicking/GameTicker.GamePreset.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Shared/Actions/BaseActionComponent.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Weapons/Reflect/ReflectComponent.cs
# Content.Shared/Weapons/Reflect/ReflectSystem.cs
# README.md
# Resources/Prototypes/Actions/types.yml
# Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/ai_factions.yml
2025-04-19 00:46:30 +03:00
slarticodefast
e1a1150257
Allow fire extinguishers and sprays to push grids you are standing on ( #31754 )
...
* allow fire extinguishers and sprays to push grids
* add cvar and reduce pushback
* EmoGarbage Review - Resolve Conflicts
* Ensure grid parenting
---------
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-04-18 13:41:27 +10:00
Vigers Ray
6020a6fd5b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Zombies/SharedZombieSystem.cs
# Content.Shared/Zombies/ZombieComponent.cs
# Resources/Locale/en-US/_strings/research/technologies.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/bio.yml
# Resources/Prototypes/Polymorphs/polymorph.yml
# Resources/Prototypes/Recipes/Lathes/security.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/Prototypes/Research/experimental.yml
2025-04-17 00:07:59 +03:00
J
b1c08582d5
Various system spring cleaning ( #36206 )
...
* Various systems warnings cleanup
* Last changes before submitting PR
* Add guard for transform component, fix failing test
* Small corrections
* Audio params to specifiers datafields
* Using audio params on components and configs
2025-04-16 13:08:22 +02:00
Vigers Ray
10888fd269
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/GameTicking/Managers/ClientGameTicker.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Cargo/Systems/CargoSystem.Orders.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Power/EntitySystems/PowerNetSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Station/Systems/StationSpawningSystem.cs
# Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
# Content.Server/StationEvents/Events/PowerGridCheckRule.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Shared/CCVar/CCVars.Game.cs
# Content.Shared/GameTicking/SharedGameTicker.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
# Resources/Locale/en-US/_strings/guidebook/cooking.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/GameRules/midround.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Guidebook/antagonist.yml
# Resources/ServerInfo/Guidebook/Jobs.xml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
# Resources/migration.yml
2025-02-26 22:01:48 +03:00
themias
30f673793b
Fix sink draining sound ( #34173 )
2025-02-22 20:20:44 +11:00
Vigers Ray
ed0a30bb64
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
2025-02-19 13:16:37 +03:00
Zachary Higgs
241d0e12e2
Fix SuperSlippery And StepTriggers persisting when UpdateSlip is called ( #34525 )
...
* Fix superSlippery and stepTrigger values persist
- made values in SpillTileReaction's public so we can query the
prototype
- made the default values for slippery component and
StepTriggerComponent based on default constants
for easier resetting
- added a calculation and check in UpdateSlips to check
if a super slip is present as well as Update
relevant steptrigger and slip values based on the contents of the
solution
* The worlds biggest change
---------
Co-authored-by: Myra <vascreeper@yahoo.com>
2025-02-17 21:53:23 +01:00
Milon
e97d6870cc
remove usages of obsolete EntityUid method variants ( #35106 )
...
eughhhhh
2025-02-16 03:06:23 +01:00
Vigers Ray
2df568010b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
# Resources/Locale/en-US/_strings/nutrition/components/examineable-hunger-component.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
2025-02-15 23:27:53 +03:00
Winkarst
0227afec4c
Fix: showfluids command activates for everyone ( #35155 )
...
Fix
2025-02-14 13:23:27 +01:00
Vigers Ray
1b61551b4d
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Server/Implants/SubdermalImplantSystem.cs
# Content.Server/Silicons/Borgs/BorgSystem.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Locale/en-US/_strings/advertisements/vending/smite.ftl
# Resources/Maps/_Sunrise/Shuttles/wrecklaimer.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml
2025-01-16 20:00:41 +03:00
Zachary Higgs
c92c52fded
Fix Mixed puddles not updating slips when evap ( #34303 )
...
* Fix Mixed puddles not updating slips when evap
* Remove Comment that isn't needed
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
* CR - use SolutionContainerSystem.UpdateChemicals
* CR - cleanup unused imports
---------
Co-authored-by: Centronias <charlie.t.santos@gmail.com>
2025-01-15 22:21:20 +01:00
Vigers Ray
96a2e04bd9
фикс липких следов
2024-12-12 01:03:02 +03:00
pacable
1c0704281c
Фикс следов ( #818 )
...
* fix следов
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* asdfvzxcvz
Signed-off-by: pacable <igor.mamaev1@gmail.com>
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-12-09 22:16:16 +03:00
Vigers Ray
da303de374
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-12-04 07:34:54 +03:00
Partmedia
cf202e805d
Fix sinks and toilets not draining ( #33691 )
...
* Fix AutoDrain
Per the system comments, AutoDrain is designed to automatically move
puddles into the drain (like a floor drain). Drains without AutoDrain
are still supposed to gradually empty the buffer, but not remove puddles
(like sinks and toilets).
However, a logic error in the original implementation causes drains with
AutoDrain set to false to simply not work. Hence sinks never emptied.
* Update documentation
2024-12-04 03:42:16 +01:00
VigersRay
b1cac7e781
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Chat/Managers/IChatManager.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/custom-vote-command.ftl
# Resources/Locale/en-US/_strings/discord/vote-notifications.ftl
# Resources/Locale/en-US/_strings/npc/firebot.ftl
# Resources/Locale/en-US/_strings/paper/syndicate-business-card.ftl
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Recipes/Crafting/bots.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
2024-10-02 06:45:10 +03:00
Golinth
3b682d4d68
Added Firebots - Real ( #32482 )
...
* Add Firebots
Had to add OnActivateInWorld to the spray system to get the bot to work. Checks for the flammable component and if the onFire boolean is true.
* Make SpraySystem actually use useDelay
got rid of that TODO
* Added firebot speech
Fire detected!
2024-09-30 20:13:16 -07:00
metalgearsloth
dd376e4e84
Optimise drains ( #32230 )
...
* Optimise drains
If it's still a problem then we do what I did for rmc14 and just dump all the active drains onto a job to getentitiesinrange in parallel.
* Fixes
2024-09-28 15:16:54 +10:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +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
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
SlamBamActionman
07174d0aaf
Better DNA forensics & ReagentData ( #26699 )
...
* Added the ability for blood to track DNA using ReagentData; Forensic Scanner now accounts for solution DNA, non-DNA holders have "Unknown DNA"
* Removes touch DNA for puddles, adds DNA to vomit
* DNA now leaves traces in containers and those marked without don't show DNA on scan (except for puddles), gibbed parts have DNA
* Fix stupid metamorphic glass bug grrr
* Removed SpillableComponent since DnaSubstanceTraceComponent is used instead
* Removes data field from maps, adds DNA tracking for some missed items
* Give default value, fix missing values.
* Fixes recipe bug
* Review changes
* Make the Data list into a nullable type
* Revert map changes
* Move gibbed unknown DNA to forensicssystem
2024-08-09 09:27:27 +10:00
Vigers Ray
f1aef2edb9
Статистика конца раунда ( #239 )
2024-07-25 02:01:01 +03:00
deltanedas
7b590122b6
fire extinguisher using item toggle ( #29906 )
...
* move SprayAttemptEvent to shared
* add SolutionTransferredEvent
* replace FireExtinguisher with SpraySafety
* update fire extinguisher yml
* invert visuals
* always handle event in solution transfer, it makes popups
* instantly fill it
* untroll
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-07-13 14:17:10 +10:00
beck-thompson
18df27d8e7
Spilling reagents on mutliple entities at once fix ( #29763 )
...
* Fixed!
* That could have been bad this is why I'm glad I check the diff xD
2024-07-07 13:52:18 +10: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
Tayrtahn
880fef507d
Replace BlockSolutionAccessComponent with an attempt event ( #26988 )
...
* BlockSolutionAccessComponent now only blocks one specified solution.
* Significant overhaul
Separated spilling when worn functionality into its own component/system.
Removed BlockSolutionAccessComponent.
Added an event for solution access.
2024-06-21 13:04:02 +10:00
eoineoineoin
b44b159431
Replace Matrix3 with System.Numerics.Matrix3x2 ( #27443 )
...
Replace Matrix3 with Matrix3x2
2024-06-02 14:07:41 +10:00
Nemanja
a1a8f04036
Decouple interactions from hands, cleanup old events, add new fears ( #28393 )
...
* ok basic shit
* second part
* pretend it isn't real it can't hurt you.
* 👁️ 👁️
* shadowcommander review
2024-05-31 13:26:19 -07:00
Kara
993eef1e7c
Resolve 'EntitySystem.Get<T>()' is obsolete in content ( #27936 )
...
* PROJECT 0 WARNINGS: Resolve `'EntitySystem.Get<T>()' is obsolete` in content
* pass entman
* dog ass test
* webeditor
2024-05-12 20:34:52 -04:00
Kara
855234aa30
Resolve 'TransformComponent.MapPosition' is obsolete in content ( #27939 )
...
* Resolve `'TransformComponent.MapPosition' is obsolete: 'Use TransformSystem.GetMapCoordinates'` in content
* build?
2024-05-12 10:31:54 -04:00
Tayrtahn
236da1cd27
Make UseDelay SetLength do EnsureComp ( #27601 )
...
Make UseDelay.SetLength do EnsureComp
2024-05-02 22:16:16 +10:00
beck-thompson
cdd900cef6
Infinate chem dupe fixed (Toilet, drain) + dirty water toilet fix ( #27446 )
...
innital commit
2024-04-29 13:08:41 +10:00
Tayrtahn
b292905216
Expand UseDelay to support multiple delays per entity; fix bible healing and bag pickup ( #27234 )
...
* Upgraded UseDelay to support multiple delays per entity
* Implement secondary delay for bibles.
Also some improvements to make it work nicely.
* Documentation is good
* Reserve the previous change; now Storage uses the special ID and Bible uses the default.
* .0
* Added VV support to UseDelayInfo
* Serialize better
* No register, just setlength
2024-04-25 22:25:52 -04:00
Tayrtahn
50631f430d
Add clothing equipped/unequipped events ( #27155 )
...
* Added ClothingGotEquipped/ClothingGotUnequipped events
* Better version
* Implemented in a few places
* More implementations
* Add ClothingDidEquipped/ClothingDidUnequipped events
2024-04-21 11:00:50 -04:00
Vasilis
d4982bad31
Stop mop buckets from spilling when you push them ( #26706 )
2024-04-04 02:39:54 -06:00
deltanedas
1db178b632
scoopable ash and foam, solution transfer prediction ( #25832 )
...
* move SolutionTransfer to shared and predict as much as possible
* fully move OpenableSystem to shared now that SolutionTransfer is
* fix imports for everything
* doc for solution transfer system
* trolling
* add scoopable system
* make ash and foam scoopable
* untroll
* untroll real
* make clickable it work
* troll
* the scooping room
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-04-01 17:27:39 +11:00
Tayrtahn
1b94e01563
Prevent storing liquids in equipped buckets ( #24412 )
...
* Block access to solutions in equipped spillables.
* Stop Drink verb appearing if the solution can't be accessed.
2024-03-31 15:40:22 +11:00
