From fecfe97527400d84cd5ebd86b32d16558cffbaab Mon Sep 17 00:00:00 2001 From: rebe83 Date: Thu, 18 Jun 2026 14:00:50 -0500 Subject: [PATCH 1/6] change table to only trash and fish --- .../Entities/Objects/Specific/Fishing/loot_tables.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml index b6b936a77d4..c6948e17cfd 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml @@ -100,9 +100,8 @@ id: ToiletFishingLootTable table: !type:GroupSelector children: - # like water but no rare fishes - !type:NestedSelector - tableId: BasicFishingLootTable + tableId: GenericTrashItems # DeltaV - changed BasicFishingLootTable to just trash to avoid salvage scrap and tools weight: 80 - !type:NestedSelector tableId: WaterFishTable From 7b09db1c149d5c6cbb628aeebcec664bcc445f6d Mon Sep 17 00:00:00 2001 From: rebe83 Date: Fri, 19 Jun 2026 13:11:02 -0500 Subject: [PATCH 2/6] change tables add shrimp --- .../Prototypes/_DV/Entities/Mobs/NPCs/fun.yml | 4 ++-- .../Objects/Specific/Fishing/loot_tables.yml | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml index f515ba09a7f..e9e341fddf0 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml @@ -1,9 +1,9 @@ - type: entity name: space shrimp - parent: [ SimpleMobBase, FlyingMobBase, MobCombat ] + parent: [ SimpleMobBase, FlyingMobBase, MobCombat , BaseFishRare ] # DeltaV - add basefishrare so that it is fishable id: MobSpaceShrimp description: Shrimply cursed... - suffix: METEM MACHINE ONLY #for now, only to be used as a very rare result for the metempsychosis machine. If fishing ever gets added, this suffix can be removed. + # suffix: METEM MACHINE ONLY #for now, only to be used as a very rare result for the metempsychosis machine. If fishing ever gets added, this suffix can be removed. components: - type: MeleeWeapon soundHit: diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml index c6948e17cfd..5a84c8a60cc 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml @@ -8,20 +8,20 @@ id: BasicFishingLootTable table: !type:GroupSelector children: - # 75% chance of scrap of some kind + # 65% chance of scrap of some kind - !type:GroupSelector - weight: 75 + weight: 65 # DeltaV - 75 to 65% children: - !type:NestedSelector tableId: SalvageScrapLowValue - weight: 65 + weight: 90 # DeltaV - 65 to 90% - !type:NestedSelector tableId: SalvageScrapHighValue - weight: 35 - # 15% chance of some trash + weight: 10 # DeltaV - 35 to 10% + # 25% chance of some trash - !type:NestedSelector tableId: GenericTrashItems - weight: 15 + weight: 25 # DeltaV - 15 to 25% # 10% chance of low-value treasure or maintenance tools - !type:GroupSelector weight: 10 @@ -45,6 +45,7 @@ - id: FishNuker - id: FishToxic - id: FishIan + - id: MobSpaceShrimp # DeltaV - shrimp attack! # Fish from water - type: entityTable @@ -101,8 +102,11 @@ table: !type:GroupSelector children: - !type:NestedSelector - tableId: GenericTrashItems # DeltaV - changed BasicFishingLootTable to just trash to avoid salvage scrap and tools + tableId: GenericTrashItems # DeltaV - changed BasicFishingLootTable to just trash to avoid salvage scrap and tools in perma weight: 80 - !type:NestedSelector tableId: WaterFishTable - weight: 20 + weight: 15 # DeltaV - changed from 20 to 15 + - !type:NestedSelector + tableId: RareFishTable # DeltaV - add rare fish + weight: 5 From e28c4d47a3cd9ce7d07037c13fd92537e3edfad2 Mon Sep 17 00:00:00 2001 From: rebe83 Date: Sun, 21 Jun 2026 10:44:15 -0500 Subject: [PATCH 3/6] make fish more common in general, increase points to money --- .../VendingMachines/Inventories/fishing_points.yml | 2 +- .../Entities/Objects/Specific/Fishing/loot_tables.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml index 0b7d434255d..736e64cb17b 100644 --- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml +++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml @@ -20,7 +20,7 @@ - id: ChairFolding cost: 25 - id: SpaceCash1000 - cost: 50 + cost: 100 # DeltaV - from 50 to 100 - id: DrinkBeerCan cost: 10 - id: DrinkBeerBottleFull diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml index 5a84c8a60cc..64b62d75334 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Fishing/loot_tables.yml @@ -70,10 +70,10 @@ children: - !type:NestedSelector tableId: BasicFishingLootTable - weight: 70 + weight: 40 # DeltaV - 70 to 40 - !type:NestedSelector tableId: WaterFishTable - weight: 20 + weight: 50 # DeltaV - 20 to 50 - !type:NestedSelector tableId: RareFishTable weight: 10 @@ -103,10 +103,10 @@ children: - !type:NestedSelector tableId: GenericTrashItems # DeltaV - changed BasicFishingLootTable to just trash to avoid salvage scrap and tools in perma - weight: 80 + weight: 60 # DeltaV - from 80 to 60 - !type:NestedSelector tableId: WaterFishTable - weight: 15 # DeltaV - changed from 20 to 15 + weight: 30 # DeltaV - changed from 20 to 30 - !type:NestedSelector tableId: RareFishTable # DeltaV - add rare fish - weight: 5 + weight: 10 From 4b487f51008d5ac474c1dc8d65dd42f301a97297 Mon Sep 17 00:00:00 2001 From: Theo Date: Mon, 22 Jun 2026 13:59:39 -0500 Subject: [PATCH 4/6] Update Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Signed-off-by: Theo --- Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml index e9e341fddf0..d6f934dce43 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml @@ -3,7 +3,6 @@ parent: [ SimpleMobBase, FlyingMobBase, MobCombat , BaseFishRare ] # DeltaV - add basefishrare so that it is fishable id: MobSpaceShrimp description: Shrimply cursed... - # suffix: METEM MACHINE ONLY #for now, only to be used as a very rare result for the metempsychosis machine. If fishing ever gets added, this suffix can be removed. components: - type: MeleeWeapon soundHit: From 41ba893e36c52ecb7ec009b686742b86783a4b48 Mon Sep 17 00:00:00 2001 From: rebe83 Date: Mon, 22 Jun 2026 15:37:07 -0500 Subject: [PATCH 5/6] shrimp hostile --- Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml index d6f934dce43..ec81903be49 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/fun.yml @@ -1,6 +1,6 @@ - type: entity name: space shrimp - parent: [ SimpleMobBase, FlyingMobBase, MobCombat , BaseFishRare ] # DeltaV - add basefishrare so that it is fishable + parent: [ SimpleMobBase, FlyingMobBase, MobCombat , BaseFishRare ] id: MobSpaceShrimp description: Shrimply cursed... components: @@ -61,7 +61,7 @@ canBeRemoved: false - type: NpcFactionMember factions: - - Passive + - SimpleHostile - type: Body prototype: Animal - type: HTN From e978ed2cec1e2ae112069b3ac224837eeb0accec Mon Sep 17 00:00:00 2001 From: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Date: Tue, 23 Jun 2026 09:18:54 -0500 Subject: [PATCH 6/6] Update Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --- .../_DV/Catalog/VendingMachines/Inventories/fishing_points.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml index 736e64cb17b..d777637ac2c 100644 --- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml +++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/fishing_points.yml @@ -20,7 +20,7 @@ - id: ChairFolding cost: 25 - id: SpaceCash1000 - cost: 100 # DeltaV - from 50 to 100 + cost: 100 - id: DrinkBeerCan cost: 10 - id: DrinkBeerBottleFull