Commit graph

101 commits

Author SHA1 Message Date
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morbo
f9229d979c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
2022-12-02 06:42:59 +03:00
Pieter-Jan Briers
cd6d4cb83c
Fix logging of admin announcements in admin logs. (#12778) 2022-11-27 15:10:21 -06:00
Morb
e025a5ded1
Rework sponsor markings (#593) 2022-11-27 08:13:01 -08:00
Morbo
513e6cf6ef Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Chat/Managers/ChatManager.cs
2022-11-25 04:31:52 +03:00
Leon Friedrich
6af331c9ff
Remove StoredChatMessage (#12623) 2022-11-22 22:52:19 +11:00
Morbo
a1416bc4f7 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-15 22:24:03 +03:00
Morb
9c9af7567e
Sponsors markings (#552) 2022-11-15 11:22:06 -08:00
Leon Friedrich
0b5a58001c
IListener and IRadio purge (#11980) 2022-11-15 15:09:27 +11:00
Morb
c6b5cead6e
Hotfix sponsor OOC messages (#474) 2022-10-19 04:22:54 -07:00
Morbo
4513b14d32 Fix sponsor chat message update var 2022-10-18 21:32:44 +03:00
Morbo
3af5b83703 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
2022-10-18 21:23:46 +03:00
Leon Friedrich
3aeba9a63e
Fix chat sanitization and entity name escaping (#12015) 2022-10-17 23:59:09 -07:00
router
2bd3a6c673
add more to chat sanitization (#11988) 2022-10-17 15:54:51 +11:00
Morb
7ae33c14b3
Sponsor cat marking reward (#437) 2022-10-09 17:59:41 -07:00
Morbo
8bf73a47fd Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
2022-10-10 03:16:56 +03:00
ninruB
7e14a3ca48
Small chat sanitization tweak. (#11637) 2022-10-09 12:21:27 -07:00
Morb
55b8f54f33
Sponsor priority join (#428) 2022-09-26 19:32:39 -07:00
Morb
b49688dc01
Награды спонсорам (#402) 2022-09-19 11:16:58 -07:00
Morbo
6b74e70360 Merge remote-tracking branch 'upstream/master' into test2
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Textures/Tiles/attributions.yml
2022-08-16 00:21:46 +03:00
Visne
58769634c7
Fix a bunch of compiler warnings (#10518) 2022-08-13 22:28:34 -07: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
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
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
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
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
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
cec80e9668 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/species.yml
2022-04-02 03:45:49 +03:00
mirrorcult
70f0fffed2
ChatManager murder (#7337) 2022-03-31 16:21:58 +11:00
Arthur
336be19a71 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
2022-03-16 21:50:36 +03:00
Rane
bb9ad4259c
Diseases (#7057)
* Disease system first pass

* Renamed HealthChange

* First working version of diseases (wtf???)

* Fix the cursed yaml initialization

* Pop-Up effect

* Generic status effect

* Create copy of prototype

* CureDiseaseEffect

* Disease resistance

* Spaceacillin

* Nerf spaceacillin now that we know it works

* Sneezing, Coughing, Snoughing

* Fix queuing, prevent future issues

* Disease protection

* Disease outbreak event

* Disease Reagent Cure

* Chem cause disease effect

* Disease artifacts

* Try infect when interacting with diseased

* Diseases don't have to be infectious

* Talking without a mask does a snough

* Temperature cure

* Bedrest

* DiseaseAdjustReagent

* Tweak how disease statuses work to be a bit less shit

* A few more diseases

* Natural immunity (can't get the same disease twice)

* Polished up some diseases, touched up spaceacillin production

* Rebalanced transmission

* Edit a few diseases, make disease cures support a minimum value

* Nitrile gloves, more disease protection sources

* Health scanner shows diseased status

* Clean up disease system

* Traitor item

* Mouth swabs

* Disease diagnoser machine

* Support for clean samples

* Vaccines + fixes

* Pass on disease resistant clothes

* More work on non-infectious diseases & vaccines

* Handle dead bodies

* Added the relatively CBT visualizer

* Pass over diseases and their populators

* Comment stuff

* Readability cleanup

* Add printing sound to diagnoser, fix printing bug

* vaccinator sound, seal up some classes

* Make disease protection equip detection not shit (thanks whoever wrote addaccentcomponent)

* Mirror review

* More review stuff

* More mirror review stuff

* Refactor snoughing

* Redid report creator

* Fix snough messages, new vaccinator sound

* Mirror review naming

* Woops, forgot the artifact

* Add recipes and fills

* Rebalance space cold and robovirus

* Give lizarb disease interaction stuff

* Tweak some stuff and move things around

* Add diseases to mice (since animal vectors are interesting and can be used to make vaccines)

* Remove unused reagent
2022-03-13 20:02:55 -05:00
Morbo
57602284f0
Add new option of wide-eyed emote (#135) 2022-03-04 18:07:16 +03:00
Arthur
41398c1749 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-03-02 02:12:36 +03:00
Chris V
3a31a33075
Add a Color parameter to dispatching announcements, change the color of certain common messages (#6840) 2022-03-02 00:21:28 +11:00
Arthur
c98bc0e967 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-27 00:56:06 +03:00
Moony
0898c8a837
More events (#6894)
* Implements bureaucratic error and random sentience.

* Adds the Vent Critters event.

* bug moment

* forgot ignores.

* undo something i included in the PR by mistake.

* address review
2022-02-25 23:10:09 -06:00
Arthur
11b1fad3c5 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
2022-02-23 15:34:15 +03:00
metalgearsloth
b87806f7ed
Fix some build warnings (#6832)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-02-21 14:41:50 +11:00
Arthur
0a782deced Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-17 01:05:48 +03:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
Arthur
e52523e9e1 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Server Info/Rules.txt
2022-01-29 06:58:08 +03:00