NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-09 04:24:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
23767 commits 14 branches 0 tags 3 GiB
Commit graph

586 commits

Author SHA1 Message Date
Morb0
caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/wrench.rsi/meta.json
 2023-12-08 13:54:31 +03:00
Leon Friedrich
287d22cc49
Inventory slot enumerator rejig (#21788) 2023-12-08 08:20:51 +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
avery
01df46602d
use /64 for ipv6 bans (#22121) 2023-12-04 00:36:49 -06: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
8185212a02
Remove the awful audio command (#22071) 2023-12-02 10:45:19 +11:00
metalgearsloth
7f98cb8134
Add even more logging to audio debug comm (#22057) 2023-12-01 20:44:43 +11:00
metalgearsloth
ec47033ee2
Add more global audio debugging yipee (#22050) 2023-12-01 16:42:33 +11:00
metalgearsloth
62bc4b51c0
Add more playaudio debugging (#22047) 
* Add more playaudio debugging

* Even more hacks

* a
 2023-12-01 14:03:36 +11:00
metalgearsloth
d795729661
Add verb to spawn players on the spot (#22000) 
* Add verb to spawn players on the spot

Apparently ss13 had it. Respawn for us will most of the time kick them to lobby to setup again but this just puts them in place so an admin can then SetOutfit or whatever.

* Add player cloning
 2023-11-30 16:40:07 -05:00
metalgearsloth
8e5f53a0b7
Add a debug command for global audio (#22018) 2023-12-01 00:24:48 +11:00
Morb
63551a4471
[Secrets] VPN guard (#1594) 2023-11-28 18:52:28 +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
nikthechampiongr
a8ea676593
Admin Respawn Verb now works as intended (#21840) 
* Respawn verb actually works now

For some reason the respawn verb was using the name of the person who used it instead of the person that was targetted.

* added changelog

* typo moment

* Removed unnecessary check
 2023-11-26 15:11:59 -06:00
metalgearsloth
64343c289d
Revert Arch testmerge 2 (#21901) 2023-11-26 14:20:07 +11:00
metalgearsloth
855ab4d129
Update submodule to 182.1.0 (#21900) 2023-11-26 13:53:54 +11:00
Morb0
84c143160a Merge remote-tracking branch 'upstream/master' into master-syndie 
# Conflicts:
#	SpaceStation14.sln
 2023-11-24 12:58:41 +03:00
metalgearsloth
d4bed09cdc
Revert the other arch changes (#21871) 2023-11-24 11:19:46 +11:00
Morb0
43a5b73f4e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	SpaceStation14.sln
 2023-11-23 18:28:34 +03:00
metalgearsloth
93bd9972f1
Content arch (#20107) 
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
 2023-11-23 14:34:37 +11:00
Morb0
804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
#	Resources/Prototypes/SoundCollections/lobby.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/steel.png
 2023-11-22 20:22:45 +03:00
DrSmugleaf
641b490313
Replace usages of MobObserver and AdminObserver with GameTicker consts (#21814) 2023-11-21 15:27:37 +11:00
Morb0
259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2023-11-04 12:16:53 +03: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
Leon Friedrich
f308adffaf
Move ActorComponent to shared (#21293) 2023-10-29 04:21:02 +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
Leon Friedrich
0880145ac8
Mind tweaks & fixes (#21203) 2023-10-24 10:23:56 -04: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
metalgearsloth
46a3076ecb
Predict tile-prying (#21167) 2023-10-24 00:20:33 +11:00
DrSmugleaf
52e1d64ee2
Stop all reads/writes to the admin_log_entity table (#21186) 2023-10-22 21:24:03 -07:00
Morb0
2af666368b Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/MassMedia/Systems/NewsSystem.cs
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos_casual.rsi/meta.json
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
 2023-10-20 01:50:09 +03:00
DrSmugleaf
f560f88eb5
Remove 700 usages of Component.Owner (#21100) 2023-10-19 12:34:31 -07:00
Morb0
1c61956e31 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/ServerInfo/Guidebook/Science/Science.xml
 2023-10-18 13:22:26 +03:00
Kara
77964d4a6b
Kill SharedEntityExtensions and all popup extensions (#20909) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-10-16 16:56:09 +11:00
Leon Friedrich
1f0c9314fd
Default warp point names (#21017) 2023-10-16 16:39:39 +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
ed15b93926
Make starting gear automatically find hands for inhand items (#20861) 2023-10-14 10:28:52 -07:00
TemporalOroboros
0775ab6a14
Moves SolutionContainerManagerComponent to Shared. (#20944) 2023-10-15 03:45:28 +11:00
Kara
546fa44526
Kill SharedUnoccludedExtensions (#20914) 2023-10-15 03:42:37 +11:00
DrSmugleaf
8639df7a74
Add pop sound effect when using the erase admin verb (#20988) 2023-10-14 02:53:02 -07:00
DrSmugleaf
f02a54497d
Make the panic bunker UI send cvar updates on focus exit, add erase verb tooltip message (#20987) 2023-10-14 02:28:08 -07:00
DrSmugleaf
5be0df32ad
Add admin Erase verb, add checkbox to erase from the ban panel (#20985) 2023-10-14 02:02:56 -07:00
DrSmugleaf
3a2482420f
Show total playtime in player list and AHelp window (#20980) 2023-10-14 01:55:40 -07:00
Morb0
6f6cbb14af Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
#	Content.Client/Changelog/ChangelogManager.cs
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
#	Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
#	SpaceStation14.sln
 2023-10-14 00:39:46 +03:00
DrSmugleaf
db4ad40430
Add panic bunker UI and automatic panic bunker (#20954) 2023-10-13 11:56:12 -07:00
Morb0
5a4438ca85 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.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/secret_weights.yml
#	Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json
#	Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png
#	Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
 2023-10-05 19:37:38 +03:00
coolmankid12345
9df5ded9ad
Revolutionaries (#18477) 
Co-authored-by: coolmankid12345 <coolmankid12345@users.noreply.github.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
 2023-10-04 18:47:33 -07:00