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
Leon Friedrich
af79f369ae
Remove outdated access reader method. ( #19765 )
2023-09-03 11:05:22 +10:00
Morb0
2968d856bf
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-08-30 20:42:46 +03:00
Morb
c99e365ce7
Give nukies the ability to declare war for a TC boost ( #19291 )
...
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2023-08-29 23:56:20 -08:00
Morb0
5277dceed2
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
2023-08-24 22:01:46 +03:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08:00
faint
076d2e339b
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
# Content.Client/LateJoin/LateJoinGui.cs
# Content.Client/Power/PowerMonitoringWindow.xaml.cs
# Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/secret_weights.yml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
# RobustToolbox
2023-07-10 07:03:24 +03:00
TemporalOroboros
3ac4cf85db
Cleaner BoundUserInterfaces ( #17736 )
2023-07-09 02:02:17 +10:00
Morbo
5a14c570aa
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
# Resources/Prototypes/typing_indicator.yml
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
# Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
# Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
2023-04-15 19:12:31 +03:00
Morb
2eb2ded7f3
Multiline edit everywhere ( #15216 )
2023-04-14 12:57:47 -07:00
Morbo
c58729755f
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json
2023-03-24 05:48:43 +03:00
metalgearsloth
448165ffda
Escape pods ( #14809 )
...
* Namespace adjustments for days
* pod
* thanks rider
* Fix the oop launch
* Fixes
* Fix stuff
* eeeeeeeee
* Fix
* access
* map
* forgor
* thing
* Genericise escape pod fill
2023-03-23 19:54:41 -06:00
Morbo
e5fda096d9
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Server/Nuke/NukeSystem.cs
# Resources/Prototypes/Maps/box.yml
2023-02-25 07:37:50 +03:00
deltanedas
98b02b3d97
make emagged marker component (fixed version of #13867 ) ( #14096 )
...
* The all-in-one hacking solution
The thinking man's lockpick
The iconic EMAG
* emagged medbay's stasis bed
* left med, emagged sec' apc
* went back to chem, emagged the dispenser
* emagged the fax while i was there
* had a donut while waiting for emag to charge
* i broke into the bridge then announced 'mandatory johnson inspection in medical'
* get system instead of dependency
* feedback
* net suggestion
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
* use EnsureComp and import NetworkedComponent
---------
Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-02-18 19:03:06 -06:00
Morb
0dba1fa2d0
More localized announces ( #786 )
2023-01-31 16:34:04 -08:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Júlio César Ueti
ee969c9799
Adds even more important Admin Logging ( #10268 )
2022-08-08 09:21:56 +10:00
Morber
efb17f1e98
Nuke ops war anounce sound ( #9035 )
2022-07-15 02:16:41 -07:00
Kara
dc28b58468
Visual popup types ( #9523 )
...
* Visual popup types
* Pass over `PopupCoordinates` and `PopupCursor`
* `PopupEntity` pass
* Disease and reagent popup pass
* COLOUR
2022-07-09 04:09:52 -05:00
metalgearsloth
20f4c9988b
Fix station announcements ( #9380 )
...
* Fix station announcements
Doesn't just get what's on the grid. Also made it generic so other systems can use a station filter.
* bumped
* a
2022-07-04 16:00:51 +10:00
Kara
43b0f303c3
Lower shuttle time + recall turning point ( #9328 )
2022-07-01 13:40:36 -07:00
metalgearsloth
521ed99766
Evac shuttle ( #8931 )
...
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-26 15:20:45 +10:00
metalgearsloth
3da454140d
Add department-specific radio channels ( #9061 )
...
* Add department-specific radio channels
This commit adds working department-specific radio channels, while
minimizing damage to the current codebase. It is expected that a future
refactor will clean this up a bit.
ChatSystem now has a RadioPrefix() method that recognizes
department-specific channels (e.g. ":e" and ":m") in addition to the
global channel (";"). It strips the prefix from the message and assigns
messages an integer representing the destination channel, if any.
IListen and IRadio now accept optional 'channel' arguments with this
channel in mind.
The ugly is that the integer channel number is hard-coded and also shows
up in chat.
Comms are not modeled at this time. You cannot break comms (yet).
All headsets have channels soldered into them. You cannot change
encryption keys to hop on new channels. Steal a headset instead.
* Remove debugging print
* Convert to prototypes
* Use prototype names in headset prototype
* Adjust list style
* Document prototype fields
* cringe
* some cleanup
* colours
* Remove alphas at least
* cc
Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2022-06-23 20:11:03 +10:00
Veritius
33faf00112
Fix comms consoles not working ( #8644 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-04 02:09:04 -07:00
Veritius
237cb3d0b4
Communications Console: The ECSining ( #8374 )
...
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-03 21:37:35 +10:00
