From 62b8f2260e61e90d41634955c941f19067479a6c Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 27 Aug 2024 18:37:56 +0200 Subject: [PATCH 1/2] "Disable" upstream contraband system --- .../Entities/Objects/base_contraband.yml | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index fffa4b506cc..b51b6ca6bca 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -1,39 +1,41 @@ -# non-stealth syndicate stuff +### ALL COMPONENTS COMMENTED DUE TO CORVAX HiddenDescriptionSystem + +# non-stealth syndicate stuff - type: entity id: BaseSyndicateContraband abstract: true components: - - type: Contraband - severity: Syndicate - # no one should be carrying this around visibly! - allowedDepartments: null + # - type: Contraband + # severity: Syndicate + # # no one should be carrying this around visibly! + # allowedDepartments: null # minor contraband not departmentally restricted -- improvised weapons etc - type: entity id: BaseMinorContraband abstract: true components: - - type: Contraband - severity: Minor - # according to space law no dept is authorized to have - allowedDepartments: null + # - type: Contraband + # severity: Minor + # # according to space law no dept is authorized to have + # allowedDepartments: null # major contraband, for things like guns or weaponry that don't belong to any department and aren't syndicate specific - type: entity id: BaseMajorContraband abstract: true components: - - type: Contraband - severity: Major - allowedDepartments: null + # - type: Contraband + # severity: Major + # allowedDepartments: null # minor contraband by default restricted to security only - type: entity id: BaseRestrictedContraband abstract: true components: - - type: Contraband - severity: Restricted + # - type: Contraband + # severity: Restricted # departmentally restricted contraband -- this covers every configuration currently listed in space law - type: entity @@ -41,70 +43,70 @@ parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Command ] + # - type: Contraband + # allowedDepartments: [ Command ] - type: entity id: BaseSecurityCommandContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Security, Command ] + # - type: Contraband + # allowedDepartments: [ Security, Command ] - type: entity id: BaseSecurityScienceCommandContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Security, Science, Command ] + # - type: Contraband + # allowedDepartments: [ Security, Science, Command ] - type: entity id: BaseSecurityEngineeringContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Security, Engineering ] + # - type: Contraband + # allowedDepartments: [ Security, Engineering ] - type: entity id: BaseEngineeringContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Engineering ] + # - type: Contraband + # allowedDepartments: [ Engineering ] - type: entity id: BaseScienceContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Science ] + # - type: Contraband + # allowedDepartments: [ Science ] - type: entity id: BaseSecurityCargoContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Security, Cargo ] + # - type: Contraband + # allowedDepartments: [ Security, Cargo ] - type: entity id: BaseCargoContraband parent: BaseRestrictedContraband abstract: true components: - - type: Contraband - allowedDepartments: [ Cargo ] + # - type: Contraband + # allowedDepartments: [ Cargo ] # for ~objective items - type: entity id: BaseGrandTheftContraband abstract: true components: - - type: Contraband - severity: GrandTheft - allowedDepartments: [ Command ] + # - type: Contraband + # severity: GrandTheft + # allowedDepartments: [ Command ] From b84595846bf372fc4c24e1c3eac7b0673a543c02 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 27 Aug 2024 19:04:15 +0200 Subject: [PATCH 2/2] fix 2 --- .../Entities/Objects/base_contraband.yml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index b51b6ca6bca..4ff85601913 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -1,10 +1,10 @@ -### ALL COMPONENTS COMMENTED DUE TO CORVAX HiddenDescriptionSystem +### All components commented due to corvax HiddenDescriptionSystem # non-stealth syndicate stuff - type: entity id: BaseSyndicateContraband abstract: true - components: + # components: # - type: Contraband # severity: Syndicate # # no one should be carrying this around visibly! @@ -14,7 +14,7 @@ - type: entity id: BaseMinorContraband abstract: true - components: + # components: # - type: Contraband # severity: Minor # # according to space law no dept is authorized to have @@ -24,7 +24,7 @@ - type: entity id: BaseMajorContraband abstract: true - components: + # components: # - type: Contraband # severity: Major # allowedDepartments: null @@ -33,7 +33,7 @@ - type: entity id: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # severity: Restricted @@ -42,7 +42,7 @@ id: BaseCommandContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Command ] @@ -50,7 +50,7 @@ id: BaseSecurityCommandContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Security, Command ] @@ -58,7 +58,7 @@ id: BaseSecurityScienceCommandContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Security, Science, Command ] @@ -66,7 +66,7 @@ id: BaseSecurityEngineeringContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Security, Engineering ] @@ -74,7 +74,7 @@ id: BaseEngineeringContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Engineering ] @@ -82,7 +82,7 @@ id: BaseScienceContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Science ] @@ -90,7 +90,7 @@ id: BaseSecurityCargoContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Security, Cargo ] @@ -98,7 +98,7 @@ id: BaseCargoContraband parent: BaseRestrictedContraband abstract: true - components: + # components: # - type: Contraband # allowedDepartments: [ Cargo ] @@ -106,7 +106,7 @@ - type: entity id: BaseGrandTheftContraband abstract: true - components: + # components: # - type: Contraband # severity: GrandTheft # allowedDepartments: [ Command ]