From 0450b4821156825d5d313402f6e1b62294011d16 Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Tue, 16 Jul 2024 22:42:19 +0300 Subject: [PATCH 1/2] quick fix (#367) --- .../Objects/Weapons/Guns/Ammunition/Magazines/50.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/50.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/50.yml index 41aae5b9a09..a279ce3ec92 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/50.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Magazines/50.yml @@ -11,8 +11,8 @@ mayTransfer: true whitelist: tags: - - N14Cartridge.50 - proto: N14Cartridge.50 + - N14Cartridge50 + proto: N14Cartridge50 capacity: 5 - type: ContainerContainer containers: @@ -39,4 +39,4 @@ parent: BaseMagazine50AMR components: - type: BallisticAmmoProvider - proto: N14Cartridge.50 + proto: N14Cartridge50 From 966cbb1d830bf219f3fb46ff703ba860951b518d Mon Sep 17 00:00:00 2001 From: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com> Date: Wed, 17 Jul 2024 01:05:57 +0300 Subject: [PATCH 2/2] Map fix (#368) * NCR Ranger startingGear fix (#262) fixes a typo * Adds 45-70 / 50 / welding glasses and speedLoaders to crafting benches (#266) * adds .45-70, .50 and speed loaders into crafting benches * removes single cartridges from crafting benches * adds welding glasses into workbench * SteeL * Changes Deathclaw damage slowdown thresholds (#270) * Smooth movement system (#267) Smooth Movement * map fix * delete some * delete this too --------- Co-authored-by: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Co-authored-by: FrostRusty <156849123+FrostRusty@users.noreply.github.com> --- Resources/Maps/N14/sunnyvale2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Maps/N14/sunnyvale2.yml b/Resources/Maps/N14/sunnyvale2.yml index f8cbb41eac8..44dcd07cddd 100644 --- a/Resources/Maps/N14/sunnyvale2.yml +++ b/Resources/Maps/N14/sunnyvale2.yml @@ -168918,7 +168918,7 @@ entities: - type: Transform pos: 188.53584,16.457537 parent: 1 -- proto: LMGMagazine5.56Rifle +- proto: LMGMagazine556Rifle entities: - uid: 6830 components: @@ -169101,7 +169101,7 @@ entities: rot: -1.5707963267948966 rad pos: 17.359634,-56.297928 parent: 1 -- proto: Magazine5.56Rifle +- proto: Magazine556Rifle entities: - uid: 7358 components: @@ -169243,7 +169243,7 @@ entities: - type: Transform pos: 17.583593,-55.660427 parent: 1 -- proto: MagazineBox5.56 +- proto: MagazineBox556 entities: - uid: 46099 components: