Morb0
996b761d80
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Packaging/ClientPackaging.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
2025-01-16 13:37:26 +03:00
Myra
6041c828de
Remove baby jail ( #34443 )
...
* Remove baby jail
Closes #33893
* Test fail fix.
2025-01-15 22:08:15 +01:00
Morb0
6c09b978a3
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Telephone/TelephoneSystem.cs
# LICENSE.TXT
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Guidebook/rules.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/ServerInfo/Guidebook/Chemicals.xml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2025-01-12 19:59:31 +03:00
Errant
46d58bf22a
Role Types ( #33420 )
...
* mindcomponent namespace
* wip MindRole stuff
* admin player tab
* mindroletype comment
* mindRolePrototype redesign
* broken param
* wip RoleType implementation
* basic role type switching for antags
* traitor fix
* fix AdminPanel update
* the renameningTM
* cleanup
* feature uncreeping
* roletypes on mind roles
* update MindComponent.RoleType when MindRoles change
* ghostrole configuration
* ghostrole config improvements
* live update of roleType on the character window
* logging stuff and notes
* remove thing no one asked for
* weh
* Mind Role Entities wip
* headrev count fix
* silicon stuff, cleanup
* exclusive antag config, cleanup
* jobroleadd overwerite
* logging stuff
* MindHasRole cleanup, admin log stuff
* last second cleanup
* ocd
* move roletypeprototype to its own file, minor note stuff
* remove Roletype.Created
* log stuff
* roletype setup for ghostroles and autotraitor reinforcements
* ghostrole type configs
* adjustable admin overlay
* cleanup
* fix this in its own PR
* silicon antagonist
* borg stuff
* mmi roletype handling
* spawnable borg roletype handling
* weh
* ghost role cleanup
* weh
* RoleEvent update
* polish
* log stuff
* admin overlay config
* ghostrolecomponent cleanup
* weh
* admin overlay code cleanup
* minor cleanup
* Obsolete MindRoleAddedEvent
* comment
* minor code cleanup
* MindOnDoGreeting fix
* Role update message
* fix duplicate job greeting for cyborgs
* fix emag job message dupe
* nicer-looking role type update
* crew aligned
* syndicate assault borg role fix
* fix test fail
* fix a merge mistake
* fix LoneOp role type
* Update Content.Client/Administration/AdminNameOverlay.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* Update Content.Shared/Roles/SharedRoleSystem.cs
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* comment formatting
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* change logging category
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* fix a space
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* use MindAddRoles
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* get MindComponent from TryGetMind
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* move var declaration outside loop
* remove TryComp
* take RoleEnum behind the barn
* don't use ensurecomp unnecessarily
* cvar comments
* toggleableghostrolecomponent documentation
* skrek
* use EntProtoId
* mindrole config
* merge baserolecomponent into basemindrolecomponent
* ai and borg silicon role tweaks
* formatting
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* I will end you (the color)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* use LocId type for a locale id
* update RoleEvent documentation
* update RoleEvent documentation
* remove obsolete MindRoleAddedEvent
* refine MindRolesUpdate()
* use dependency
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* inject dependency
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
* roleType.Name no longer required
* reformatted draw code logic
* GhostRoleMarkerRoleComponent comment
* minor SharedRoleSystem cleanup
* StartingMindRoleComponent, unhardcode roundstart silicon
* Update Content.Shared/Roles/SharedRoleSystem.cs
* remove a whitespace
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-11 22:17:26 +01:00
Morb0
6106783f01
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# .github/labeler.yml
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.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/last.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Mobs/Vox.xml
# Resources/ServerInfo/Guidebook/Science/APE.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
2024-12-26 00:30:02 +03:00
Southbridge
7eb714d38f
Monospace Support for Rich Text ( #33830 )
...
* Initial Commit
* Moved all this to SS14 on it's own
* Added prototype validation
2024-12-13 15:24:34 +01:00
deathride58
5ab8e467a5
Adds an introductory message to the user-facing ahelp chat window ( #33348 )
...
* Adds an introductory message to the user-facing ahelp chat window
* Update Resources/Locale/en-US/administration/bwoink.ftl
* Update Resources/Locale/en-US/administration/bwoink.ftl
---------
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
2024-12-09 09:54:23 +01:00
Errant
0c4dd9d1b9
Revert "Simplify separated screen top menu ( #33047 )" (Stable -> Master) ( #33785 )
2024-12-08 22:14:34 +01:00
Vasilis The Pikachu
8472603b76
Revert "Simplify separated screen top menu ( #33047 )"
...
This reverts commit f27fa1ed30
2024-12-08 21:36:48 +01:00
SpaceManiac
20be8298b7
Organize the Sandbox Panel window ( #33684 )
...
* Organize Sandbox Panel
* Map Editing -> Editing
* Unset ToggleMode on Suicide button. Can hardly un-suicide, no?
* Remove 'Link machines' button that has done nothing for 3 years
* Remember Sandbox window's position instead of forcing to center
* Shows Spawns -> Show Spawns
* Remove SandboxSystem.MachineLinking
2024-12-07 19:13:56 +01:00
Morb0
e76bb1fa57
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Tiles/plating_burnt.png
2024-12-05 01:22:35 +03:00
Plykiya
450bf813b8
Fix for inspecting entities in hand ( #33642 )
...
Actually inspect entity in hands
2024-11-30 17:14:39 +01:00
Intoxicating-Innocence
d5225d1f46
Ghost role drop-down alignment ( #33397 )
...
* dropdown shares margin width with children
* removed dependency that rider added for some reason
* reduced vertical margin from 8 to 2
2024-11-26 09:28:31 +01:00
metalgearsloth
f27fa1ed30
Simplify separated screen top menu ( #33047 )
2024-11-26 01:59:34 +01:00
Nikolai Korolev
ea7f5433ac
Fix RA0003 warning for ChatBox ( #33531 )
2024-11-25 22:53:12 +11:00
SlamBamActionman
89392e2424
Remove drag & drop dropping items from containers ( #32706 )
...
* Initial commit
* Update based on maintainer discussion
* Forgot to remove this woops
2024-11-20 12:00:38 +11:00
Morb0
2deb2ac88b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
2024-11-08 17:29:34 +03:00
MilenVolf
cc3a19c212
Collapsible ghost roles menu ( #32717 )
...
* Make ghost roles collapsible
* Save `BodyVisible` state of each `Collapsible` box
* Make ghost role collapsible only when group has more than 1 role
* Make it a little prettier
* Make only ghost role buttons collapsible
* Apply requested changes
* Typo
* Small cleanup
* Store in list, instead of iterating
* Make unique ids more unique
* Move it out of the cycle
* Make _collapsibleBoxes into dictionary and use key instead of Collapsible boxes names
Added TODO. So after the problem will be fixed in `GhostRolesEui`, it should be mirrored and fixed here too.
* Put TODO in GhostRolesEui. I guess Issue must be made for this
* Use HashSet instead of Dictionary as suggested. Invert the HashSet, so being present means it uncollapsed
I decided to invert HashSet to _uncollapsedStates, because players surely will have more collapsed buttons than opened, so we optimise memory usage a little bit.
* Remove extra space from ghost roles window
* Add buttons stretching. Size 3:1
2024-11-04 01:49:42 +01:00
Morb0
be480aced1
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-10-30 16:38:56 +03:00
metalgearsloth
94e686ca9c
Fix separated game screen bumping ( #33046 )
...
I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally.
2024-10-29 16:07:57 +11:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.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/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
eoineoineoin
a8982b88af
Allow users to drag-reorder action bar ( #32552 )
...
* Avoid rebuilding all buttons on action state change
Allows for drag events to continue when actions change
* Remove excess action buttons
---------
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2024-10-03 16:01:01 +02:00
Winkarst
0093fce5b4
Dialog windows now grab the keyboard focus ( #31294 )
...
* Dialog windows now grab the keyboard focus
* Comment
2024-09-20 00:01:54 +10:00
Morb0
1c95353b06
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/books.yml
2024-09-03 22:03:54 +03:00
godisdeadLOL
a25132ed5d
Actions bar dynamic resizing ( #31759 )
...
* action bar dynamic resizing
* action bar dynamic resizing for separated style
* decreased indent for separated style
---------
Co-authored-by: YourUsername <you@example.com>
2024-09-02 15:12:11 -04:00
Morb0
0f339baab5
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Stations/base.yml
2024-09-01 22:20:47 +03:00
Winkarst
88dcc831c1
Remove calls to FormattedMessage obsolete methods ( #31706 )
...
* Remove FormattedMessage obsolete methods
* Oops
2024-09-01 13:00:53 +02:00
Morb0
721f7bfecf
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/base.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png
# SpaceStation14.sln
2024-08-28 16:40:36 +03:00
12rabbits
367cdfd439
Make guidebook remember where you left off ( #31375 )
...
* Guidebook tracks last read entry
* Persistent guidebook fixes
* Persistent guidebook requested changes
* Update Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
---------
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2024-08-27 01:06:54 +02:00
metalgearsloth
2e1b486e8b
Add BUI ctor tests ( #31463 )
...
5 lines of eaten iocmanager.injectdependencies led to this.
2024-08-26 17:39:48 +10:00
metalgearsloth
2e029a7d5b
Action stuff ( #31305 )
...
* Action stuff
- Cleanup some event stuff
- Avoid dirtying entity unnecessarily
- Add ActionGrant as an easy way to apply / remove actions via compregistry.
* Fix merge
2024-08-25 22:43:31 +10:00
metalgearsloth
948bb726de
Run actions on press ( #31191 )
...
I know UI generallys want to do stuff on key-up not key-down. With that being said the delay on release for these is noticeable.
e.g.
ActivateInWorld / UseInHand / any in-world interactions are on-press. This is especially noticeable if you have the same event on action + verb.
2024-08-25 22:36:22 +10:00
SlamBamActionman
61a1e89339
Add codeword highlighting ( #30092 )
...
* Added codeword highlighting
* Updated to support more codeword roles, color is set serverside
* Review feedback
* Change to a Component-based system using SessionSpecific
* Tidied up CanGetState, set Access restrictions on component
* Clean-up
* Makes the injection ignore brackets, restore some codewords, remove "Taste/Touch" from adjectives
2024-08-23 11:14:38 +02:00
Morb0
07a34aaaae
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# 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/Structures/Wallmounts/signs.rsi/meta.json
2024-08-23 09:38:36 +03:00
metalgearsloth
f7e08ec343
Station AI overlay ( #31335 )
...
Split
2024-08-22 23:13:47 -06:00
metalgearsloth
6553fd3d6e
Fix inventory GUI for non-inventory entities ( #31306 )
...
Default to invisible and only set visible if itemslots gets initialised.
2024-08-22 13:05:17 -04:00
Morb0
acf1ff4ec0
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Systems/ChatSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.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/Consumable/Food/produce.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/StatusIcon/faction.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# 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/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/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
2024-08-12 13:18:43 +03:00
ShadowCommander
1df84515c7
Add EntityWorldTargetAction ( #29819 )
...
* Add EntityWorldTargetAction initial implementation
* Update obsolete methods
* Partially working EntityWorldTargetAction
* Fix entity selection
* Move and clean up AfterInteract
* Fix building new walls
* Readd no entity or coordinates error
* Consolidate action validation code
* Add summaries to component
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-08-08 12:47:08 +03:00
Morb0
7990ca8f46
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.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/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/equipped-FEET.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/icon.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-right.png
# Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json
2024-08-08 01:38:43 +03:00
Plykiya
a87efd7d01
Replace xform.WorldPosition with xformSystem method for Setting/Getting ( #30029 )
...
* GET WORLD POSITON, ROTATION
* Missing parentheses
* ui system depndency
* the issue
* Unused
* Let the function do the transform
---------
Co-authored-by: plykiya <plykiya@protonmail.com>
2024-08-06 21:02:01 +10:00
Ed
a95d2257c3
JobRequirement refactor ( #30347 )
...
* refactor JobRequirements
* add profile support
* fix
* Update quartermaster.yml
* sloth fixes
* inport 30208
* Update DepartmentPrototype.cs
* species restriction
* left tweak stick
* stringbuilder is cool!
2024-08-05 14:25:49 +10:00
DrSmugleaf
54d5bd266c
Add mapping editor ( #23427 )
...
* Add mapping editor (#757 )
* Remove mapping actions, never again
* Cleanup actions system
* Jarvis, remove all references to CM14
* Fix InventoryUIController crashing when an InventoryGui is not found
* Rename mapping1 to mapping
* Clean up context calls
* Add doc comments
* Add delegate for hiding decals in the mapping screen
* Jarvis mission failed
* a
* Add test
* Fix not flushing save stream in mapping manager
* change
* Fix verbs
* fixes
* localise
---------
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2024-08-04 13:31:45 +10:00
Morb0
e853272357
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
2024-07-21 12:48:56 +03:00
metalgearsloth
b41c6a28fe
Reset ghost role menu scroll upon search ( #30159 )
...
Quality of life so it doesn't sit on your old spot anymore.
2024-07-21 02:38:45 -04:00
metalgearsloth
edb05e36bb
Reapply "Remove some BUI boilerplate" ( #30214 ) ( #30219 )
...
* Reapply "Remove some BUI boilerplate" (#30214 )
This reverts commit cb0ba66be3
2024-07-21 14:48:13 +10:00
Morb0
a5980baa7d
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json
# Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/security.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/space.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png
# Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png
# Resources/migration.yml
2024-07-21 07:20:43 +03:00
Nemanja
cb0ba66be3
Revert "Remove some BUI boilerplate" ( #30214 )
...
Revert "Remove some BUI boilerplate (#28399 )"
This reverts commit cbf329a82d
2024-07-20 20:42:27 -04:00
metalgearsloth
cbf329a82d
Remove some BUI boilerplate ( #28399 )
...
* Remove some BUI boilerplate
- The disposals overrides got removed due to the helper method handling it.
- Replace window creation with CreateWindow helper.
- Fixed some stinky code which would cause exceptions.
* More
* moar
* weh
* done
* More BUIs
* More updates
* weh
* moar
* look who it is
* weh
* merge
* weh
* fixes
2024-07-20 15:40:16 +10:00
Ed
d8ab4982ad
Character menu issuer localization ( #29840 )
...
* Update CharacterUIController.cs
* TODO Burn this shit
* huh?
* huh!
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-07-17 08:47:50 +03:00
Morb0
8ffde2eea4
Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# .github/workflows/test-packaging.yml
# Content.Server/Administration/Systems/AdminSystem.cs
# Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png
# Tools/gen_build_info.py
2024-07-14 12:15:16 +03:00
