mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-13 20:31:10 +03:00
Fix upstream
This commit is contained in:
Morb0
parent
0eba25c0eb
commit
74885605cf
5 changed files with 20 additions and 17 deletions
|
|
@ -1,5 +1,6 @@
|
|||
using Content.Server.Mind;
|
||||
using Content.Shared.Examine;
|
||||
using Content.Shared.Roles;
|
||||
using Content.Shared.Roles.Jobs;
|
||||
using Content.Shared.Whitelist;
|
||||
|
||||
|
|
@ -8,7 +9,8 @@ namespace Content.Server.Corvax.HiddenDescription;
|
|||
public sealed partial class HiddenDescriptionSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly MindSystem _mind = default!;
|
||||
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
|
||||
[Dependency] private readonly EntityWhitelistSystem _whitelis = default!;
|
||||
[Dependency] private readonly SharedRoleSystem _roles = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
|
|
@ -20,13 +22,18 @@ public sealed partial class HiddenDescriptionSystem : EntitySystem
|
|||
private void OnExamine(Entity<HiddenDescriptionComponent> hiddenDesc, ref ExaminedEvent args)
|
||||
{
|
||||
_mind.TryGetMind(args.Examiner, out var mindId, out var mindComponent);
|
||||
TryComp<JobComponent>(mindId, out var job);
|
||||
|
||||
foreach (var item in hiddenDesc.Comp.Entries)
|
||||
{
|
||||
var isJobAllow = job?.Prototype != null && item.JobRequired.Contains(job.Prototype.Value);
|
||||
var isMindWhitelistPassed = _whitelistSystem.IsValid(item.WhitelistMind, mindId);
|
||||
var isBodyWhitelistPassed = _whitelistSystem.IsValid(item.WhitelistMind, args.Examiner);
|
||||
var isJobAllow = false;
|
||||
if (_roles.MindHasRole<JobRoleComponent>((mindId, mindComponent), out var jobRole))
|
||||
{
|
||||
isJobAllow = jobRole.Value.Comp1.JobPrototype != null &&
|
||||
item.JobRequired.Contains(jobRole.Value.Comp1.JobPrototype.Value);
|
||||
}
|
||||
|
||||
var isMindWhitelistPassed = _whitelis.IsValid(item.WhitelistMind, mindId);
|
||||
var isBodyWhitelistPassed = _whitelis.IsValid(item.WhitelistMind, args.Examiner);
|
||||
var passed = item.NeedAllCheck
|
||||
? isMindWhitelistPassed && isBodyWhitelistPassed && isJobAllow
|
||||
: isMindWhitelistPassed || isBodyWhitelistPassed || isJobAllow;
|
||||
|
|
|
|||
|
|
@ -451,13 +451,13 @@
|
|||
- type: ZombifyOnDeath
|
||||
- type: IncurableZombie
|
||||
- type: InitialInfected
|
||||
mindRoles:
|
||||
- MindRoleInitialInfected
|
||||
# Corvax-MRP
|
||||
- type: NpcFactionMember
|
||||
addFriendlyFactions:
|
||||
- Zombie
|
||||
# Corvax
|
||||
mindRoles:
|
||||
- MindRoleInitialInfected
|
||||
|
||||
- type: entity
|
||||
parent: BaseNukeopsRule
|
||||
|
|
|
|||
|
|
@ -252,13 +252,13 @@
|
|||
- type: ZombifyOnDeath
|
||||
- type: IncurableZombie
|
||||
- type: InitialInfected
|
||||
mindRoles:
|
||||
- MindRoleInitialInfected
|
||||
# Corvax-MRP
|
||||
- type: NpcFactionMember
|
||||
addFriendlyFactions:
|
||||
- Zombie
|
||||
# Corvax
|
||||
mindRoles:
|
||||
- MindRoleInitialInfected
|
||||
|
||||
# event schedulers
|
||||
|
||||
|
|
|
|||
|
|
@ -10,17 +10,10 @@
|
|||
{
|
||||
"name": "icon"
|
||||
},
|
||||
{
|
||||
"name": "s"
|
||||
},
|
||||
{
|
||||
"name": "equipped-INNERCLOTHING",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "s-equipped-INNERCLOTHING",
|
||||
"directions": 4
|
||||
},
|
||||
{
|
||||
"name": "equipped-INNERCLOTHING-monkey",
|
||||
"directions": 4
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": 1,
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_. poster1_legit, poster3_contraband, poster3_legit, poster4_contraband, poster4_legit, poster5_contraband, poster5_legit, poster6_contraband, poster6_legit, poster7_contraband, poster7_legit, poster8_contraband, poster8_legit, poster9_contraband, poster9_legit, poster10_legit, poster11_legit, poster12_legit, poster13_legit, poster14_contraband, poster15_legit, poster16_contraband, poster16_legit, poster17_legit, poster19_legit, poster20_contraband, poster20_legit, poster21_contraband, poster21_legit, poster22_contraband, poster22_legit, poster23_contraband, poster23_legit, poster24_legit, poster25_contraband, poster26_legit, poster28_legit, poster29_contraband, poster29_legit, poster30_contraband, poster31_contraband, poster31_legit, poster32_contraband, poster32_legit, poster33_contraband, poster33_legit, poster34_legit, poster35_contraband, poster36_legit, poster37_legit, poster39_legit, poster43_contraband, poster44_contraband, poster46_contraband, poster48_contraband, poster50_legit, poster51_legit, poster53_contraband, poster55_contraband, poster56_contraband, poster59_contraband, poster60_contraband, poster63_contraband edited and localised by github:lapatison",
|
||||
"copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman. poster1_legit, poster3_contraband, poster3_legit, poster4_contraband, poster4_legit, poster5_contraband, poster5_legit, poster6_contraband, poster6_legit, poster7_contraband, poster7_legit, poster8_contraband, poster8_legit, poster9_contraband, poster9_legit, poster10_legit, poster11_legit, poster12_legit, poster13_legit, poster14_contraband, poster15_legit, poster16_contraband, poster16_legit, poster17_legit, poster19_legit, poster20_contraband, poster20_legit, poster21_contraband, poster21_legit, poster22_contraband, poster22_legit, poster23_contraband, poster23_legit, poster24_legit, poster25_contraband, poster26_legit, poster28_legit, poster29_contraband, poster29_legit, poster30_contraband, poster31_contraband, poster31_legit, poster32_contraband, poster32_legit, poster33_contraband, poster33_legit, poster34_legit, poster35_contraband, poster36_legit, poster37_legit, poster39_legit, poster43_contraband, poster44_contraband, poster46_contraband, poster48_contraband, poster50_legit, poster51_legit, poster53_contraband, poster55_contraband, poster56_contraband, poster59_contraband, poster60_contraband, poster63_contraband edited and localised by github:lapatison",
|
||||
"size": {
|
||||
"x": 32,
|
||||
"y": 32
|
||||
|
|
@ -381,6 +381,9 @@
|
|||
{
|
||||
"name": "poster51_legit"
|
||||
},
|
||||
{
|
||||
"name": "poster52_legit"
|
||||
},
|
||||
{
|
||||
"name": "random_legit"
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue