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

149 commits

Author SHA1 Message Date
Arthur
b877259791 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
 2022-07-29 17:59:17 +03:00
Rane
b8be23004b
Latejoin traitors (#9783) 2022-07-28 17:59:45 -07:00
metalgearsloth
55692d4d71
Revert map PRs (#10079) 
* Revert "Fix Saltern cvar (#10077)"

This reverts commit 0f0420eca9.

* Revert "Map ID fixes (Take 2) (#10075)"

This reverts commit c15e14676d.
 2022-07-27 22:27:23 +10:00
metalgearsloth
0f0420eca9
Fix Saltern cvar (#10077) 2022-07-27 05:37:20 -05:00
Myctai
43ec284318
Fix some more "CentCom" instances (#9970) 2022-07-26 07:00:38 -07:00
Rane
5ad13e0637
Redirect dead player LOOC to deadchat (#10009) 2022-07-26 06:58:19 -07:00
Pancake
62fc083e1f
Update CCVars.cs (#10046) 2022-07-26 19:50:18 +10:00
Arthur
075299b54d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
 2022-07-22 22:45:30 +03:00
metalgearsloth
0378a23790
Make shuttle brakes use thrusters and bandaid shuttle movement (#9826) 2022-07-17 19:36:08 +10:00
metalgearsloth
b9e876ca92
The real movement refactor (#9645) 
* The real movement refactor

* ref events

* Jetpack cleanup

* a

* Vehicles partially working

* Balance tweaks

* Restore some shitcode

* AAAAAAAA

* Even more prediction

* ECS compstate trying to fix this

* yml

* vehicles kill me

* Don't lock keys

* a

* Fix problem

* Fix sounds

* shuttle inputs

* Shuttle controls

* space brakes

* Keybinds

* Fix merge

* Handle shutdown

* Fix keys

* Bump friction

* fix buckle offset

* Fix relay and friction

* Fix jetpack turning

* contexts amirite
 2022-07-16 13:51:52 +10:00
Arthur
421895e321 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-08 20:58:22 +03:00
Nemanja
836c0bb1c4
Zombie Mode [New Game Mode] (#8501) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-07-06 13:42:51 +10:00
Kara
69871ef73a
Experimental nukie changes (#9428) 2022-07-04 23:49:19 -07:00
ike709
0b86e0e953
Event Music & Nuke Countdown Song (#8597) 
Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-07-04 16:29:38 +10:00
metalgearsloth
da383cc029
Reduce shuttle transit time (#9397) 2022-07-04 15:14:04 +10:00
Arthur
e00e09b5f5 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-02 03:33:15 +03:00
Moony
8e90bf46e9
Implements panic bunkering. (#9315) 
* Implements panic bunkering.
Helps with raid management, esp with unknown accounts.

* adds an enable/disable command.
 2022-07-01 22:46:37 +02:00
Kara
43b0f303c3
Lower shuttle time + recall turning point (#9328) 2022-07-01 13:40:36 -07:00
Moony
efdc3bc7e0
Gimps the restart vote. (#9327) 
* Disables the restart vote when admins are online.

* Gimps the restart vote so it requires 85% agreement.

* address rebiew
 2022-07-01 02:52:20 -05:00
Arthur
e1e7dc2a9d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
 2022-06-28 22:33:18 +03:00
LittleBuilderJane
6325a10a43
Adds the Central Command outpost for Roundend and ERT to spawn at. (#9146) 
* Adds Reach II

* Updated Reach II to work after refactor

* removing old map

* Adding the Central Command outpost

* Reachii isn't meant to be in here at all.

* updated possible error in .yml

* updating .yml

* Updated CentComm, fixed some issues like lighting.

* Imagine if we also docked at centcomm

* a

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-27 23:11:39 +10:00
metalgearsloth
12e5cdacae
Disable emergency shuttles locally (#9195) 
Can still re-enable via cvar but this is to make devving faster.
 2022-06-27 15:19:40 +10:00
metalgearsloth
e72e060972
Don't load cargo shuttle by default (#9194) 
* Don't load cargo shuttle by default

Realistically only I am going to care and it wastes a few seconds per test / debugging locally.

* Make it a general cvar instead

* a
 2022-06-27 14:58:40 +10:00
metalgearsloth
521ed99766
Evac shuttle (#8931) 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-06-26 15:20:45 +10:00
Arthur
a5fa8904ec Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs
 2022-06-24 04:58:34 +03:00
metalgearsloth
5169ade3fd
Movement acceleration (#8969) 2022-06-23 12:13:22 +10:00
EmoGarbage404
8273434af5
death to it (#8981) 2022-06-20 15:59:04 -05:00
Arthur
5b9ec5ce3e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Interaction/SharedInteractionSystem.cs
 2022-06-18 07:08:37 +03:00
eclips_e
df9f9aee53
Make ghost timer a cvar (#8817) 
Co-authored-by: Just-a-Unity-Dev <rnmangunay@addu.edu.ph>
Co-authored-by: Just-a-Unity-Dev <just-a-unity-dev@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-16 19:56:09 +10:00
Arthur
d0c5c06e4d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
 2022-06-11 02:46:43 +03:00
metalgearsloth
3639b381d0
Change default preset to secret (#8694) 
It gets voted for at the start every time anyway and traitor isn't even voteable.
 2022-06-06 19:44:34 -07:00
Arthur
fee8678a41 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Maps/game.yml
 2022-06-04 03:08:27 +03:00
Moony
fada213a22
Implements item pricing, and piracy. (#8548) 
* Start implementing item pricing.

* Flesh out prices a bit, add the appraisal tool.

* Add prices to more things.

* YARRRRRRR

* gives pirates an appraisal tool in their pocket.

* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.

* Address reviews.

* Address reviews.
 2022-06-03 10:56:11 -05:00
ike709
5ae56c67e1
Adds the ability to not play admin sounds (#8242) 
Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
 2022-06-02 15:41:19 +02:00
Pieter-Jan Briers
5f9f319d5a
Fix server update restarts when server paused. (#8509) 2022-05-30 01:09:50 -07:00
Arthur
2f7cc32485 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	README.md
 2022-05-29 08:59:07 +03:00
Pieter-Jan Briers
4c1b0b87fb
Fix rules popup (#8485) 
* CVar to show rules popup for localhost.

For testing purposes.

* Fix rules popup being broken and throwing.

😐
 2022-05-27 14:50:11 -07:00
Arthur
5aeb1ed4b8 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-25 02:29:09 +03:00
ike709
0b15db1120
Adds a cvar for server rules (#8365) 
Co-authored-by: Veritius <veritiusgaming@gmail.com>
Co-authored-by: ike709 <ike709@github.com>
 2022-05-23 12:43:09 -07:00
ike709
20651fc71f
Fixed disabling OOC not disabling the discord relay (#8275) 
Co-authored-by: ike709 <ike709@github.com>
 2022-05-19 20:18:28 -07:00
Arthur
da3072a8b4 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/manifest.yml
 2022-05-19 20:03:31 +03:00
ike709
53deaaf6ec
Adds space ambience (#8096) 
* Adds space ambience

* handle that better

* Update Content.Client/Audio/BackgroundAudioSystem.cs

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>

* Update Content.Client/Audio/BackgroundAudioSystem.cs

Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>

Co-authored-by: ike709 <ike709@github.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
 2022-05-17 21:21:16 -07:00
Paul Ritter
b3456c8376
Funny red spacemen (nukeops) (#8073) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-18 12:48:35 +10:00
Alex Evgrashin
af926c5279
Typing indicator (typing chat bubble) (#8215) 2022-05-17 02:55:19 -07:00
metalgearsloth
bb09d0ddc4
Restart vote is now actually passable (#8194) 2022-05-16 13:33:14 +10:00
Arthur
82c0b1c8e7 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-15 16:38:40 +03:00
Veritius
3b7e202044
Flavor text (#8070) 2022-05-13 15:58:45 -07:00
Arthur
b070c21dbb Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-10 18:17:00 +03:00
T-Stalker
187494356e
No more spesswind (#8059) 2022-05-09 15:35:42 -07:00
Arthur
6ca4c0ceb8 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/species.yml
#	Resources/manifest.yml
 2022-05-07 05:32:09 +03:00