Vigers Ray
d791eb37bd
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
# Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
# Content.Server/Access/Systems/AgentIDCardSystem.cs
# Content.Server/Clothing/Systems/ChameleonClothingSystem.cs
# Content.Server/Entry/IgnoredComponents.cs
# Content.Shared/Access/Systems/SharedIdCardSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Inventory/InventorySystem.Relay.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
# Resources/Locale/en-US/_strings/atmos/atmos-pipe-layers.ftl
# Resources/Locale/en-US/_strings/chat/highlights.ftl
# Resources/Locale/en-US/_strings/implant/chameleon-controller.ftl
# Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
# Resources/Locale/en-US/_strings/reagents/absinthe.ftl
# Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
# Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
# Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml
# Resources/Prototypes/Roles/Jobs/CentComm/official.yml
# Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
# Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.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/Textures/Structures/Doors/secret_door.rsi/assembly.png
# Resources/Textures/Structures/Doors/secret_door.rsi/closed.png
# Resources/Textures/Structures/Doors/secret_door.rsi/closing.png
# Resources/Textures/Structures/Doors/secret_door.rsi/meta.json
# Resources/Textures/Structures/Doors/secret_door.rsi/open.png
# Resources/Textures/Structures/Doors/secret_door.rsi/opening.png
# 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/migration.yml
2025-06-04 13:39:57 +03:00
Krunklehorn
c2b1b81ec8
Add checks for various complex interactions ( #37246 )
...
* Prevent toggling radiation collectors
* Prevent resisting locks
* Prevent unbuckling others, early exit before doafter
* Prevent camera and camera router setup
* Prevent rotating and flipping
* Also prevent adding the unbuckle verb.
* Revert ResistLocker changes
* Prevent emitter tampering
* Also prevent lock verb
* Prevent toggling welders
* Prevent gun open/close bolt, rack and switch mode
* Prevent toggling stun batons
2025-06-02 10:06:45 -07: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
J
a89af44f56
Weapons warnings cleanup ( #36164 )
...
* Weapons warnings cleanup
* Changes to audio on Reflection stuff
2025-04-19 00:28:40 +10:00
Vigers Ray
67a1903332
Смена клавиши для взаимодействия с затвором и магазинами
2024-12-07 07:40:41 +03:00
BramvanZijp
d588409909
Rework the Flare Gun & add a Security Shell Gun. ( #32829 )
...
* Rework flaregun and add security shell gun
* Make flare gun twice as likely to appear in emergency lockers
* Security shell gun can now fire lethal shells like the flare gun used to be able to.
* Rebalance the sec shell gun material cost to primarily be steel instead of plastic
* Define the ShellShotgunLight tag in tags.yml
* Leave the no lethal shells for normal flareguns to a different PR.
* Move a comment to re-run checks.
* Bye bye lethal shells from plastic guns.
* Fix weird whitespace issue.
* Make the sec shell gun inherit the normal flare gun.
* Remove the rack verb and update the sec shell gun description
* Remove the ability to fire lethals from flare guns, pending blowing up the gun
---------
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2024-11-06 15:27:10 +01:00
Plykiya
6c1d1057d5
Replace DetachParentToNull() with DetachEntity() ( #29992 )
...
DETACH PARENT TO ENTITY
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-07-13 20:59:33 +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
metalgearsloth
fc0ff8fb31
Fix gun cycling ammo count update ( #25635 )
...
Doesn't update correctly when cycling.
2024-02-27 11:40:19 -05:00
metalgearsloth
b535909a49
Fix gun bolt crash ( #24283 )
...
Deleting non-predicted entities moment.
2024-01-19 21:14:41 +11:00
Kara
0ae3858b69
Examine prediction ( #23565 )
...
* Initial prediction
* new group handling
* groups for all examines that use multiple rn
* compile
* why was it doing this??
* handle newlines with sorting properly
2024-01-06 17:53:13 +11:00
TemporalOroboros
7a77d6d5dd
Content ecs containers ( #22484 )
2023-12-28 01:30:03 -04:00
metalgearsloth
3ab346f471
Remove Ammo component references ( #19537 )
2023-08-31 14:33:28 -07:00
Errant
70422845e2
Gun bolt fixes and QoL ( #19349 )
...
Co-authored-by: Errant <35878406+errant@users.noreply.github.com>
2023-08-20 21:42:36 +10:00
Volodius
59cdcd0fe3
Closing bolt no longer removes cartridge ( #19251 )
2023-08-20 21:32:19 +10:00
metalgearsloth
3fc81bca40
Fix bolt-less gun cycling ( #19051 )
...
Oop.
2023-08-13 01:07:59 -06:00
TaralGit
8acac895fc
(Re)Adds open bolt animations for gun sprites ( #17219 )
...
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10: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
330bb7bb14
Remove gun .Owners ( #14585 )
2023-03-11 20:08:22 +11:00
Scribbles0
058e2e2b56
Revolver Tweaks and Det Buff ( #13725 )
...
* revolver changes and det yml
* remove ammo box
* remove comma
* other ammo providers change
2023-01-26 12:15:20 -06:00
metalgearsloth
f38bef562c
Fix gun ItemStatus ( #12225 )
2022-10-26 07:46:13 -07:00
Leon Friedrich
581a805063
Replace ItemSlotChangedEvent with EntInsertedIntoContainerMessage ( #11934 )
2022-10-15 13:03:37 -07:00
metalgearsloth
d767ce9585
Fix a bunch of warnings ( #10886 )
...
* Fix a bunch of warnings
Also made ensnareable not broadcast as they're only used directed.
Mainly just Get<T> and AppearanceSystem
* buckle too
* fix tests
Co-authored-by: wrexbe <wrexbe@protonmail.com>
2022-08-27 20:26:35 -07:00
metalgearsloth
5cdec951c7
Only show gun examines in detail range ( #10697 )
...
The most important 2 are fire mode and how much ammo is left.
2022-08-23 09:04:50 -05:00
metalgearsloth
4901201b2d
Change gun activates to uses ( #10699 )
2022-08-19 19:15:53 -07:00
metalgearsloth
7f984792a1
Cleanup gun containers (probably last time) ( #8575 )
...
- snake_case instead of kebab-case
- Remove old MagazineBarrel containers
- Remove old event
2022-06-02 00:37:55 +10: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
