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 4
23441 commits 14 branches 0 tags 3 GiB
Commit graph

237 commits

Author SHA1 Message Date
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
OctoRocket
ecef573af5
[Tweak] Default to Traitor instead of Extended when possible (#16386) 2023-06-08 17:16:18 +10:00
Leon Friedrich
a8eee5878a
Misc replay related changes (#17102) 2023-06-05 14:33:49 +10:00
metalgearsloth
57858f802f
Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
metalgearsloth
0c83642c5a
Add ambient music (#16829) 2023-05-29 10:44:11 +10:00
metalgearsloth
af5eaec932
Fix Centcomm (#16772) 2023-05-24 21:28:44 +10:00
Leon Friedrich
be0d22ad5e
Move upload commands to engine (#16582) 2023-05-20 11:53:09 +10:00
Moony
e91fc652a3
Dynamic space world generation and debris. (#15120) 
* World generation (squash)

* Test fixes.

* command

* o

* Access cleanup.

* Documentation touchups.

* Use a prototype serializer for BiomeSelectionComponent

* Struct enumerator in SimpleFloorPlanPopulatorSystem

* Safety margins around PoissonDiskSampler, cookie acquisition methodologies

* Struct enumerating PoissonDiskSampler; internal side

* Struct enumerating PoissonDiskSampler: Finish it

* Update WorldgenConfigSystem.cs

awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: 20kdc <asdd2808@gmail.com>
 2023-05-16 06:36:45 -05:00
metalgearsloth
74361f1581
Reduce FTL times (#16410) 2023-05-14 01:00:36 -07:00
Artjom
a2bf2207a2
New indicators for combat mode (#15427) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-05-06 15:06:42 +10:00
Pieter-Jan Briers
1c4a2594ce
Database thread pool use (#14498) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-05-02 10:36:39 +10:00