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

202 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
Leon Friedrich
c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
Kara
258ec0cac1
Clothing/item ECS & cleanup (#9706) 2022-07-27 03:53:47 -07:00
Kara
7e57dd987e
Chat fixes (#10051) 2022-07-26 16:49:23 -07:00
Rane
5ad13e0637
Redirect dead player LOOC to deadchat (#10009) 2022-07-26 06:58:19 -07:00
Arthur
0052df0cf5 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
 2022-07-15 15:39:41 +03:00
Morber
efb17f1e98
Nuke ops war anounce sound (#9035) 2022-07-15 02:16:41 -07:00
Kara
a0c531d08b
Identity fixes (#9701) 2022-07-13 22:23:55 -07:00
Arthur
418531da3e Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-11 02:21:41 +03:00
metalgearsloth
4a393d4665
Fix a bunch of warnings (#9528) 2022-07-09 09:07:47 +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
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
Arthur
e00e09b5f5 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-02 03:33:15 +03:00
Leon Friedrich
bb04646bbe
Fix radio/chat error (#9264) 2022-06-29 13:13:01 +10: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
Leon Friedrich
07a35e8363
Stop radio channels from being malformed. (#9210) 2022-06-27 13:56:38 +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
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
themias
3727696c01
Fix vow of silence popup spam (#8974) 2022-06-20 19:02:55 -07:00
EmoGarbage404
8273434af5
death to it (#8981) 2022-06-20 15:59:04 -05:00
Arthur
46de728dce Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Maps/infiltrator.yml
 2022-06-13 16:50:11 +03:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
Arthur
5e78fb6fff Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-06 04:32:53 +03: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
Leon Friedrich
ca7960382b
Missing nullables (#8634) 2022-06-04 17:17:48 +10: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
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
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager (#8492) 
* Make log not entity system

* Fixes
 2022-05-28 23:41:17 -07:00
Arthur
5aeb1ed4b8 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-25 02:29:09 +03: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
Alex Evgrashin
af926c5279
Typing indicator (typing chat bubble) (#8215) 2022-05-17 02:55:19 -07:00
Arthur
82c0b1c8e7 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-15 16:38:40 +03:00
wrexbe
bc68ac96dd
Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
wrexbe
3467a83d97
Suicide2 (#8117) 
* Fix toilet suicide

* Fix ghost ghosting

* Clean suicide system
 2022-05-13 09:09:15 +10:00
wrexbe
089e40a061
Convert suicide to ecs (#8091) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 22:05:16 +10:00
Arthur
b070c21dbb Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-05-10 18:17:00 +03:00
metalgearsloth
1ac5df5e4a
SpeechBubble occlusion (#8018) 2022-05-08 01:54:56 -07:00
Arthur
657216f43d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
 2022-04-25 13:13:07 +03:00
Rane
955e7af2ad
Fix capitalization of emotes (#7766) 2022-04-24 17:15:40 -07:00
Arthur
a6c1a837ad Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-04-24 14:25:19 +03:00
keronshb
a09f45eec7
Prevents suicide if someone is already dead (#7677) 
* Prevents suicide if someone is already dead

* Adds the Localization text for trying to suicide when dead
 2022-04-21 22:37:49 -07:00
Alex Evgrashin
98c03570ca
Fix semicolon only message (#7695) 2022-04-21 15:31:51 -07:00
Arthur
2587c1c71c Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
 2022-04-17 04:50:19 +03:00
Pieter-Jan Briers
b3e7c7af1f
Remove usage of CreateNetMessage. (#7563) 2022-04-15 11:55:49 -07:00
Arthur
2f9b19022c Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Server Info/Intro.txt
 2022-04-11 02:09:43 +03:00
keronshb
c2f0198243
Fixes Holoparasites killing their hosts when suiciding. (#7465) 
* Fixes Holoparasites from killing their hosts when suiciding

* Adds the CannotSuicide tag to the Guardian Parent

This way it effects all guardian types and not just holoparasites.

* Adds check, fixes whitespace

* Fixes the ghosting check
 2022-04-07 23:37:39 -05:00
Arthur
85f42d95f3 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-04-06 22:34:26 +03:00
metalgearsloth
de6651ac01
Update content for new lookup API (#7363) 2022-04-06 19:35:18 +10:00