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

247 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
Nemanja
9ca84ac3fb
Grid inventory fixes (#22161) 
* Gridinv fixes

* eek

* oh yeah this too

* eek
 2023-12-05 16:38:10 -07: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
Nemanja
cc8984d096
Grid Inventory (#21931) 
* Grid Inventory

* oh boy we keep cracking on

* auto insertion is kinda working? gross, too!

* pieces and proper layouts

* fix the sprites

* mousing over grid pieces... finally

* dragging deez nuts all over the screen

* eek!

* dragging is 90% less horrendous

* auto-rotating

* flatten

* Rotation at last

* fix rotation and change keybind for removing items.

* rebinding and keybinding

* wow! look at that! configurable with a button! cool!

* dragging is a bit cooler, eh?

* hover insert, my beloved

* add some grids for storage, fix 1x1 storages, fix multiple inputs at once

* el navigation

* oh yeah some stuff i forgor

* more fixes and QOL stuff

* the griddening

* the last of it (yippee)

* sloth review :)
 2023-12-04 16:04:39 -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
783879921b
Disable artifact spam on roundend (#21970) 
* Disable artifact spam on roundend

I think part of the issue was the enormous amount of logspam but at any rate this turns it off.

* Also this

* And these
 2023-11-28 22:39:16 -05:00
Flareguy
c7f4294d73
disables space wind and tile ripping cvars (#21847) 2023-11-27 14:42:29 -07:00
metalgearsloth
269c93245d
Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
Pieter-Jan Briers
8bf807a9b5
Basic rate limiting for chat messages (#21907) 2023-11-27 14:08:30 +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
metalgearsloth
5cbf935cf0
Wrap gateway generator in cvar for dev (#21758) 2023-11-21 21:36:38 -07: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
metalgearsloth
aae3d7133a
Bump expedition timer to 11mins (#21635) 
We've had it at like, 18, 12, and 7, I think 7 is too low and 18 is definitely too high.

Ideally:
- 2 minutes to get inside
- 7 or so minutes inside.
- 2 minutes as a buffer to either fulton themselves out or run out if necessary.
 2023-11-13 15:39:33 -07: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
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
Keiku
7b4ceb9d0c
Add checkbox for toggle walking (#20926) 
Co-authored-by: onoira <onoira@psiko.zone>
LGTM!
 2023-10-18 13:59:00 -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
13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	.github/workflows/update-wiki.yml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/manifest.yml
 2023-09-24 12:56:24 +03:00
metalgearsloth
036b9ef74f
Expeditions rework (#18960) 2023-09-19 22:52:01 +10:00
Morb0
58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
 2023-09-19 11:41:15 +03:00
Leon Friedrich
7d9693d976
Fix replay recording temporary paths not supporting subdirectories (#19887) 2023-09-16 21:46:12 +10:00
Morb
94de2bea3d
News fix (#1417) 2023-09-15 00:12:11 +03:00
Kevin Zheng
a622844a5f
Make slow spacing variables CCVars (#19862) 2023-09-13 19:38:56 -08:00
Morb
2a143c873c
SSD Indicator (#19701) 2023-09-11 15:52:56 +10:00
DrSmugleaf
bd1b9b3e52
Make discord webhook cvars confidential (#19546) 2023-08-25 14:14:04 -07:00
Morb
c73a90e16c
Enrich discord round notifications (#19502) 2023-08-24 19:53:32 -07:00
DrSmugleaf
913c80db4a
Add round end Discord pings, discord webhook API (#19468) 2023-08-24 16:50:07 -05:00
DrSmugleaf
3690ae482b
Limit saving admin logs to one task (#19146) 2023-08-16 09:12:10 +02:00
Arimah Greene
3e464cd1f0
Add CVar for customizing round restart time (#19136) 
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
 2023-08-16 04:36:50 +03:00
ShadowCommander
c4fb166af3
Particle Accelerator power changed admin chat warning (#18806) 2023-08-07 11:07:57 -06:00
Kevin Zheng
db5dee6db3
Add radiators (#18728) 
* Add radiators

* Limit heat transfer to fluid heat capacity

* Adjust datafield names

* Fix material arbitrage

* This code has been debugged, and so there are no more bugs. Debugging code is therefore unnecessary

* Adjust radiator layer subfloor visibility

* Cache CVars

* No default

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Like and unsubscribe

* Fix CVar caching

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-08-06 02:21:05 -06:00
Kevin Zheng
64e6d346d6
Add cvar to deadmin when joining round (#18430) 2023-07-31 11:13:38 -08:00
Vasilis
55f935e3fe
Adds a cvar to hide PII information in ban message (#18428) 
* my macbook hates running 2 clients

* yes
 2023-07-29 20:14:56 +03:00
Nemanja
8b0d6a4d45
Prevent using LOOC in crit (#18297) 
* Prevent crit players from using LOOC

* fix comment
 2023-07-26 00:02:48 -06:00
Nemanja
d55cd23b0a
Zombie Mode 𝓡𝓮𝓭𝓾𝔁 (#18199) 
* zombie mode redux

* the great zombie changes

* fix this

* 65 down to 50

* empty

* Changes to address stalling

* make zombie nukies no longer nukies

* actually work
 2023-07-25 15:31:35 -06:00
Pieter-Jan Briers
c6d2dd6c7b
Automatic server replay recordings (#18235) 
Co-authored-by: Moony <moony@hellomouse.net>
 2023-07-23 16:02:23 +02:00
Riggle
579913b617
Better notes and bans (#14228) 
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2023-07-21 13:38:52 +02:00
LankLTE
fb53c14a54
Made Artifact EORG a server config (#18172) 
* Added config and updated sala

* CE's suggestion.

* Fixed config

* greater than
 2023-07-21 03:49:10 -05:00
Errant
108236aab3
Set admin only debug coords default true (#17811) 
* Hide debug coordinates for non-admins

* Added server cvar

* Switched default setting to hide coords
 2023-07-04 02:30:57 -05:00
Errant
24ac92ff9a
Hide debug coordinates from non-admins (#17804) 
* Hide debug coordinates for non-admins

* Added server cvar
 2023-07-03 15:31:52 -06:00
Emisse
dd17ac1b3b
troooo (#17728) 2023-06-29 03:14:46 -06:00
Nemanja
044d5f6853
Status Icons (#17529) 2023-06-27 20:31:53 -04:00
Pieter-Jan Briers
4c8965ac32
CVar to promotehost automatically. (#17643) 2023-06-26 13:01:30 +10:00
Pieter-Jan Briers
3e03418238
Allow changing alert level delay. (#17435) 2023-06-24 22:01:14 +10:00
Leon Friedrich
b03d9a90ab
Add support for client-side replays (#17168) 2023-06-19 03:23:31 +10:00
Pieter-Jan Briers
50257c3bd7
Limit postgres database concurrency (#17246) 2023-06-10 21:52:08 +10:00