NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 19:01:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
27432 commits 14 branches 0 tags 2.9 GiB
Commit graph

90 commits

Author SHA1 Message Date
Morb0
860f045b08 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Audio/Machines/attributions.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
#	Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
#	Resources/Textures/Objects/Misc/books.rsi/book0.png
#	Resources/Textures/Objects/Misc/books.rsi/book1.png
#	Resources/Textures/Objects/Misc/books.rsi/book2.png
#	Resources/Textures/Objects/Misc/books.rsi/book3.png
#	Resources/Textures/Objects/Misc/books.rsi/book4.png
#	Resources/Textures/Objects/Misc/books.rsi/book5.png
#	Resources/Textures/Objects/Misc/books.rsi/book6.png
#	Resources/Textures/Objects/Misc/books.rsi/book7.png
#	Resources/Textures/Objects/Misc/books.rsi/book8.png
#	Resources/Textures/Objects/Misc/books.rsi/book_bar.png
#	Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_borg.png
#	Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
#	Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
#	Resources/Textures/Objects/Misc/books.rsi/book_detective.png
#	Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
#	Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
#	Resources/Textures/Objects/Misc/books.rsi/book_fish.png
#	Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
#	Resources/Textures/Objects/Misc/books.rsi/book_infections.png
#	Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
#	Resources/Textures/Objects/Misc/books.rsi/book_origami.png
#	Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
#	Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
#	Resources/Textures/Objects/Misc/books.rsi/meta.json
 2024-04-02 11:32:48 +03:00
Sk1tch
bc31c193c2
Added chat window transparency slider to options (#24990) 
* Adds a new slider to the misc tab in options that lets the player set chat window transparency

* Tweaked variable names

* Fixed order to match UI

* Renamed set chat window transparency function

* Changed and refactored to opacity instead of transparency

* Remove unnecessary int to float conversions

Slider used to be 0-100 while the CCVar was 0.0-1.0f. This is confusing and was only used for rounding to 2 decimal points.

* Round the value to two decimal points

* Remove rounding for now

* Rename

* Unhardcode chat color by moving to stylesheet

* Fix indent

* Make opacity slider only change opacity

---------

Co-authored-by: Your Name <you@example.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2024-04-01 13:48:02 -07:00
Morb0
a751abc778 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
 2024-03-17 14:01:54 +03:00
LordCarve
7d275a4b5e
Obsolete Logger cleanup for EntitySystems part 2 (#26159) 
* Kill the static InRangeUnOccluded

* Adjusted 4 more EntitySystems that were missed.
 2024-03-17 18:31:09 +11:00
Morb0
f135b32a88 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Datasets/tips.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/Textures/Structures/Windows/directional.rsi/meta.json
 2024-02-29 12:28:26 +03:00
metalgearsloth
a9502be29e
Revert "Fix chat bubbles (#25643)" (#25645) 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
 2024-02-28 00:51:20 +11:00
metalgearsloth
23d2c4d924
Fix chat bubbles (#25643) 
Dependencies got misused
 2024-02-28 00:01:24 +11:00
Julian Giebel
0752acdc2c
News UI overhaul and PDA notifications (#19610) 2024-02-26 21:38:00 -04:00
TemporalOroboros
f284b43ff6
Fixes obsolete Transform warnings in Content. (#25256) 
* Fix TransformComponent.MapPosition warnings in Content.Client

* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests

* Fix TransformComponent.MapPosition warnings in Content.Shared

* Fix TransformComponent.MapPosition warnings in Content.Server

* Fix TransformComponent.WorldPosition warnings in Content.Shared

* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later

* Fix TransformComponent.WorldPosition warnings in Content.Server

* Fix TransformComponent.WorldRotation warnings in Content.*

* Fix TransformComponent.MapPosition warnings I missed

* Fix TransformComponent.WorldMatrix warnings in Content.*

* Fix TransformComponent.InvWorldMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*

* Fix TransformComponent.Anchored.set warnings in Content.*

* Fix TransformComponent.Coordinates.set warnings in Content.*

* Fix TransformComponent.LocalPosition.set warnings in Content.*

* Fix TransformComponent.AttachToGridOrMap warnings in Content.*

* Fix TransformComponent.AttachParent warnings in Content.*

* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared

* Preempt TransformComponent.LocalRotation.set warnings in Content.Client

* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests

* Preempt TransformComponent.LocalRotation.set warnings in Content.Server

* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*

* ECS ClickableComponent

* Fix obsolete SharedTransformSystem methods in Content.*

* Fix ExplosionOverlay `SharedTransformSystem` dependency

* Maybe fix null eye position breaking tests

* MGS requested changes
 2024-02-27 12:06:20 +11:00
Morb0
92bd0148fe Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Resources/Locale/en-US/chat/sanitizer-replacements.ftl
#	Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png
#	Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png
 2024-02-17 12:43:04 +03:00
Pieter-Jan Briers
68ce53ae17
Random spontaneous cleanup PR (#25131) 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
 2024-02-13 16:48:39 -05:00
Morb0
70e63172f7 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	README.md
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/ServerInfo/Guidebook/Cargo/Cargo.xml
#	Resources/ServerInfo/Guidebook/Medical/Cloning.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json
#	Resources/Textures/Objects/Tools/t-ray.rsi/meta.json
#	Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png
#	Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png
 2024-02-12 12:53:34 +03:00
SlamBamActionman
247be5b5c7
Add option for character name colors in chat & move coloration to clientside (#24625) 
* Adds option to disable character names in chat/speechbubbles

* Moved the coloring of names to clientside

* Move string functions to SharedChatSystem to avoid duplicate code in SpeechBubble.cs

* Changed to be put under Accessibility section

* Cache CVar
 2024-02-10 22:38:55 -08:00
Morb0
5aa1642ba2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/VoiceMask/VoiceMaskComponent.cs
#	Resources/Prototypes/SoundCollections/lobby.yml
#	Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Structures/Walls/solidrust.rsi/full.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/meta.json
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust0.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust1.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust2.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust3.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust4.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust5.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust6.png
#	Resources/Textures/Structures/Walls/solidrust.rsi/solidrust7.png
 2024-01-26 01:14:50 +03:00
Nemanja
6605b7ba50
make newchat box more opaque (#24555) 2024-01-25 08:17:48 -05:00
Morb0
f062cbcec2 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
#	LICENSE.TXT
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon-flash.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
#	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
#	Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/roboticist.rsi/meta.json
#	Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
#	Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
 2024-01-02 23:07:58 +03:00
Kot
3d955677c5
Fix chat size cvar serialization (#23005) 2023-12-30 12:24:10 -05:00
Morb0
4426394d78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/regalrat.yml
#	Resources/Textures/Objects/Weapons/Melee/fireaxe.rsi/icon.png
 2023-12-23 02:53:18 +03:00
LordCarve
7d69055291
Use different chatbox placeholder when dependent keys unbound (#22747) 2023-12-22 11:39:29 -08:00
Kara
ee0c3c4a69
Fix glorfcode for real (#22838) 
Fix glorfcode
 2023-12-21 16:23:22 -08:00
Morb0
33942c412a Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/deny-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-0.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-1.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-2.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/fill-3.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/meta.json
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/normal-unshaded.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/on.png
#	Resources/Textures/Structures/Machines/VendingMachines/smartfridge.rsi/panel.png
 2023-12-14 00:57:14 +03:00
Pieter-Jan Briers
16bd6802df
More UI fixes (#22431) 
* Fix chat filter button

Oh look, the popup code was copy pasted between chat filter and channel selector.

Hilarious.

Anyways same stuff as 995f506aaf. I pulled it all out into a base class so NO MORE COPY PASTE.

Fixes #22360

* Remove all further EnableAllKeybinds buttons.

Fixes #22346

Yeah none of these are valid use cases, why is this set...
 2023-12-12 19:02:19 -07:00
KP
17270bb321
Fix glorfcode again (#22420) 2023-12-12 13:57:54 -08:00
Morb0
29a7082223 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Datasets/Names/military.yml
#	Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/ServerInfo/Guidebook/Service/Botany.xml
 2023-12-11 21:56:43 +03:00
KP
1b5e5032f4
Fix Glorfcode (#22271) 2023-12-11 19:53:10 +11:00
Morb0
6b2c649308 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Resources/Textures/Tiles/attributions.yml
 2023-12-10 10:43:49 +03:00
Pieter-Jan Briers
995f506aaf
Fix being unable to open chat channel drop-down. (#22255) 2023-12-09 13:15:06 +11:00
Arthur Asimov
3da699ad32 Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json
 2023-12-05 07:42:45 +03:00
deathride58
e32ede5882
Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! (#21999) 2023-12-04 16:10:49 -07:00
Arthur Asimov
f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
 2023-12-03 15:10:26 +03:00
metalgearsloth
269c93245d
Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
Morb0
3cb4017c90 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Audio/Announcements/license.txt
#	Resources/Audio/Effects/Shuttle/licenses.txt
#	Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
#	Resources/Textures/Structures/Storage/tanks.rsi/meta.json
 2023-11-14 16:35:33 +03:00
Vasilis
2f2d237f86
LOOC will appear on top of your head (#21514) 
* Oh well

* Minor fixing up

* HOLY BINGLE I DID IT

* TOGGLE!
 2023-11-09 02:18:58 -07:00
metalgearsloth
5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
Morb0
681762aca7 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
#	Resources/Prototypes/Objectives/objectiveGroups.yml
 2023-10-28 14:14:36 +03:00
Leon Friedrich
e685cb626b
Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
metalgearsloth
a2bbda43cc
Revert "Update submodule to 172.0.0 (#21222)" (#21225) 2023-10-24 21:55:20 +11:00
Leon Friedrich
7ba0ea2926
IPlayerManager refactor (#21215) 2023-10-24 20:19:08 +11:00
Morb0
55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png
#	Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
 2023-10-15 17:52:02 +03:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel (#20985) 2023-10-14 02:02:56 -07:00
Morb0
75443d7fb6 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Communications/CommunicationsConsoleSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json
 2023-10-11 16:56:19 +03:00
gus
9eede28d8c
Using capital letter for radio channel prefixes works now (#20846) 
Co-authored-by: gus <august.eymann@gmail.ccom>
 2023-10-08 22:07:54 -07:00
Morb0
34a8740819 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/workflows/build-test-release.yml
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
 2023-10-02 02:18:19 +03:00
Kara
80f36ea6d4
Glorfcode (force say on damage/stun/crit) (#20562) 2023-09-28 18:05:36 -07:00
Vasilis
eb4a9c4833
:( (#20440) 2023-09-23 13:44:49 -05:00
Vasilis
413ba8cc9a
Remove cringe hardcodes for background (#20374) 2023-09-22 14:50:34 -05:00
Morb0
e21ee44f9e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Datasets/verbs.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/aspid.yml
#	Resources/Prototypes/Maps/barratry.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/kettle.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
 2023-09-13 16:51:52 +03:00
metalgearsloth
5a0fc68be2
Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
Morb0
b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
 2023-09-05 00:12:02 +03:00