From 120529174a8eeb3846a2b2b27925f04605b8fa2a Mon Sep 17 00:00:00 2001 From: MilenVolf Date: Sat, 16 Sep 2023 07:38:08 +0300 Subject: [PATCH] Some additional fixes --- Resources/Maps/nukieplanet.yml | 30 ------------------- Resources/Prototypes/Access/misc.yml | 2 +- .../Entities/Mobs/Species/felinid.yml | 1 - .../Structures/Doors/Airlocks/airlocks.yml | 4 +++ .../Entities/Structures/Machines/lathe.yml | 4 +-- .../Prototypes/Recipes/Lathes/security.yml | 11 +++++++ 6 files changed, 18 insertions(+), 34 deletions(-) diff --git a/Resources/Maps/nukieplanet.yml b/Resources/Maps/nukieplanet.yml index 88b6f7a8f08099..40f96d7819c753 100644 --- a/Resources/Maps/nukieplanet.yml +++ b/Resources/Maps/nukieplanet.yml @@ -1266,110 +1266,82 @@ entities: pos: 17.5,0.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 810 components: - rot: 3.141592653589793 rad pos: 17.5,5.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 812 components: - rot: 3.141592653589793 rad pos: 15.5,5.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 815 components: - rot: 3.141592653589793 rad pos: 15.5,0.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 816 components: - rot: 3.141592653589793 rad pos: 6.5,-5.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 817 components: - rot: 3.141592653589793 rad pos: 2.5,-1.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1061 components: - rot: 3.141592653589793 rad pos: 6.5,-1.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1062 components: - rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1441 components: - rot: 3.141592653589793 rad pos: 37.5,2.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1442 components: - rot: 3.141592653589793 rad pos: 38.5,2.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1443 components: - rot: 3.141592653589793 rad pos: 38.5,7.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1444 components: - rot: 3.141592653589793 rad pos: 37.5,7.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1582 components: - pos: 46.5,0.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - uid: 1614 components: - pos: 48.5,2.5 parent: 3 type: Transform - - securityLevel: Level2 - type: WiresPanel - proto: AirlockSyndicateLocked entities: - uid: 397 @@ -1445,8 +1417,6 @@ entities: pos: 41.5,2.5 parent: 3 type: Transform - - securityLevel: Level5 - type: WiresPanel - proto: AlwaysPoweredWallLight entities: - uid: 2983 diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 34ec2adc7d92f9..fa8f53a4e126f6 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -34,5 +34,5 @@ - type: accessGroup id: AllAccessSyndicate tags: - - Syndicate + - SyndicateAgent - NuclearOperative diff --git a/Resources/Prototypes/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Entities/Mobs/Species/felinid.yml index e86763fa5949c6..e3164ad64df9d0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/felinid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/felinid.yml @@ -20,7 +20,6 @@ durationMultiplier: 1 bangAddMultiplier: 0.65 bangFlash: false - - type: WoundLicking - type: Reactive groups: Flammable: [ Touch ] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 2bf7285f2bfbea..0da1d2aa83fd7b 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -275,6 +275,8 @@ sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi - type: PaintableAirlock group: Glass + - type: WiresPanel + securityLevel: Level2 - type: Construction node: glassAirlockMedSecurity @@ -286,6 +288,8 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/syndicatecommand.rsi - type: PaintableAirlock + - type: WiresPanel + securityLevel: Level5 group: Glass - type: Construction node: glassAirlockMaxSecurity \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 345451d0b20116..aa10f9084d077b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -631,13 +631,13 @@ runningState: icon staticRecipes: - WeaponDisablerPractice - dynamicRecipes: - # Magazines - MagazinePistolRubber - SpeedLoaderMagnumRubber - MagazineLightRifleRubber - MagazineRifleRubber - MagazineMagnumSubMachineGunRubber + dynamicRecipes: + # Magazines - MagazinePistol - SpeedLoaderMagnum - MagazineLightRifle diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 13064ae783e1cc..98e865e6b09dad 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -294,6 +294,17 @@ Plastic: 300 Steel: 250 +- type: latheRecipe + id: MagazineRifleRubber + icon: + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi + state: rubber + result: MagazineRifleRubber + completetime: 20 + materials: + Plastic: 250 + Steel: 225 + - type: latheRecipe id: MagazineMagnumSubMachineGunRubber icon: