Vigers Ray
0cbccf6f0e
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Shared/Access/Components/AccessReaderComponent.cs
# Resources/Locale/en-US/_strings/commands/melee-spread-command.ftl
# Resources/Locale/en-US/_strings/commands/persistence-save-command.ftl
# Resources/Locale/en-US/_strings/commands/show-access-readers-command.ftl
# Resources/Locale/en-US/_strings/commands/show-emergency-shuttle-command.ftl
# Resources/Locale/en-US/_strings/persistence/command.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
# Resources/Prototypes/Entities/Clothing/Belt/belts.yml
# Resources/Prototypes/Entities/Clothing/Head/scraphelmet.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/scraparmor.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
# Resources/Prototypes/Recipes/Crafting/improvised.yml
2025-06-09 03:22:11 +03:00
slarticodefast
9cb1a669d6
make PacifiedComponent session specific ( #38137 )
2025-06-07 14:37:13 -07:00
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
Vigers Ray
95880f4d5f
Колиция существ работает только с включеным боевым режимом ( #1988 )
2025-04-28 01:01:09 +03:00
Tayrtahn
441083e906
Fix warning CS0414 instances ( #36832 )
...
Fix warning cs0414 instances
2025-04-23 01:36:49 +02:00
Vigers Ray
6844adcc9e
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Shared/Doors/Systems/SharedDoorSystem.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
2025-04-19 05:02:40 +03:00
metalgearsloth
8ab0e59db6
Refactor disarms ( #36546 )
...
* Refactor disarms
- Move client stuff to shared
- Cleanup a bunch of stuff
- Ref events
- Fix the swing sound mispredict (I noticed it on target dummies).
* Revert this change
* minor review
* Rebiew
---------
Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-19 11:38:22 +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
metalgearsloth
7e3f3a7ca3
Combat mode prediction thing ( #36620 )
...
Was written before predicted popups prolly
2025-04-16 12:27:10 +02: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
ad81c30dcb
Lets Hamlet Dance ( #30478 )
...
Allow Ghost Roles that have NPC to turn on Combat Mode
2024-07-29 19:48:28 -07:00
Cojoke
62d8665484
Let Pacifists Use Certain Guns(Foam Weapons) ( #29835 )
...
Let Pacifists Use Certain Guns(foam)
2024-07-09 23:46:21 +10:00
ArkiveDev
b5f6aa0c9d
Pacifist messages use target's identity name instead of entity name ( #29325 )
2024-06-22 15:19:40 +10:00
Nemanja
8a95cb186c
Remove AlertType and AlertCategory ( #27933 )
2024-05-23 22:43:04 -04:00
Pieter-Jan Briers
e00f74505c
Use new ComponentPauseGenerator ( #25183 )
...
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
2024-02-26 14:36:19 +11:00
Callmore
5a2c744998
Tiny shove fix. ( #25353 )
...
* Remove second shove check.
* Change when popups and sounds are created.
Reduces phantom shoves that feel bad.
* why didn't i think of this i saw it earlier...
* Replaced Is fields with prefix
* remove some dependencies to fix tests???
2024-02-21 15:01:45 +11:00
Kara
faca1d7043
Pacifism rework ( #23037 )
...
* Pacifism rework
* grammar
2023-12-27 02:55:48 -07:00
KP
d0085f9428
Prevent pacified players from throwing dangerous stuff ( #22268 )
2023-12-11 15:40:22 -08:00
Nemanja
5ecd5f7521
Fix hostile simplemob rotation ( #20900 )
2023-10-14 00:15:20 -07:00
iacore
21247fb642
cleanup: remove TargetingDoll-related code ( #20866 )
2023-10-09 16:40:17 -07:00
Leon Friedrich
3101e5a18d
Fix action-granting items not being predicted ( #20778 )
...
* Ensure actions are predicted
* Fix test fail
2023-10-07 15:08:13 -04:00
Kara
2e481be694
Follow mouse rotation in combat mode ( #20433 )
2023-09-24 17:22:44 -04:00
Leon Friedrich
684b334806
Action container rejig ( #20260 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-09-23 18:49:39 +10:00
DrSmugleaf
a272cd4439
Remove manual localization from action entity prototypes ( #20023 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-09-11 22:34:41 +10:00
DrSmugleaf
09bce85f19
Fix actions not being usable, ordering, and containers ( #19964 )
2023-09-09 16:14:17 -07:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
metalgearsloth
c9d68023d9
Fix combat mode context menu ( #19743 )
2023-09-03 06:16:34 +10:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
Leon Friedrich
cabc834e84
Fix combat action prediction ( #19152 )
...
* Fix action predictions
* Add ActionsAddedTest
2023-08-14 23:06:45 -06:00
Vordenburg
28fe9d9f33
Refactor PacificationSystem ( #18715 )
2023-08-05 16:27:12 -05:00
Artjom
a2bf2207a2
New indicators for combat mode ( #15427 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-06 15:06:42 +10:00
Slava0135
18206a3059
fix harm mode popup ( #15823 )
...
* fix harm mode popup
* fix enable/disable message
2023-04-27 04:21:43 +12:00
Leon Friedrich
4e7cea96de
Remove speech & popups from actions ( #15747 )
2023-04-26 14:04:44 +10:00
DrSmugleaf
34bcd042d1
Remove combat mode component reference ( #15206 )
2023-04-08 13:16:48 -07:00
metalgearsloth
5a756a0094
Network pacifiedcomponent ( #13012 )
2022-12-13 11:02:02 -06:00
metalgearsloth
fb3f6fa80f
Predicted stamina ( #12413 )
...
* Predicted stamina
Needed to do some semblence of predicted melee.
* Okay now done.
* Pause support
* Comment
2022-11-08 14:34:07 -06:00
metalgearsloth
d1c1c8ada3
Fix canDisarm datafield ( #11963 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-10-16 23:23:44 +11:00
metalgearsloth
1ce609b865
Use AttackAttempt for pax ( #11844 )
2022-10-15 13:19:40 -07:00
metalgearsloth
a93d6eb5b6
Fix CanDisarm ( #11843 )
2022-10-14 23:14:07 -05:00
metalgearsloth
5c48d9257f
Close context menu on entering combat mode ( #11624 )
2022-10-03 18:12:13 -07:00
metalgearsloth
f51248ecaa
Melee refactor ( #10897 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-29 15:51:59 +10:00
Rane
a29e86a896
Pacification status effect and Pax ( #10796 )
2022-09-05 19:52:58 -07:00
Rane
b152aed18b
Disarm 1498 ( #11016 )
2022-09-05 19:19:33 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
Rane
b44ec9554a
Disarm 1984 ( #8872 )
2022-06-16 22:37:07 -07:00
metalgearsloth
fb943a61dc
Gun refactor ( #8301 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
metalgearsloth
6e94d08b17
Gun tweaks ( #8320 )
2022-05-22 12:31:46 +10:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Júlio César Ueti
2881cd4020
Make Disarm opt-in ( #7811 )
2022-04-30 14:29:13 -07:00
