From da45b9bba8e821d190623b6b9008dd2f7b856228 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 1 Jun 2025 15:56:38 +0300 Subject: [PATCH] fixes --- .../Entities/Structures/Specific/Economy/trade_platform.yml | 1 - Resources/Prototypes/_CP14/Maps/comoss.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml index 9c87244067..38c6479c19 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml @@ -90,7 +90,6 @@ - type: CP14MagicEnergyDraw energy: -1 delay: 3 # 5m to full restore - - type: CP14MagicUnsafeDamage - type: CP14MagicEnergyExaminable - type: entity diff --git a/Resources/Prototypes/_CP14/Maps/comoss.yml b/Resources/Prototypes/_CP14/Maps/comoss.yml index ca180cc0a7..cba7f61de1 100644 --- a/Resources/Prototypes/_CP14/Maps/comoss.yml +++ b/Resources/Prototypes/_CP14/Maps/comoss.yml @@ -21,7 +21,7 @@ CP14Alchemist: [ 2, 2 ] CP14Blacksmith: [ 2, 2 ] CP14Innkeeper: [ 3, 4 ] - #CP14Merchant: [2, 2] + CP14Merchant: [2, 2] #Guard CP14Guard: [8, 8] CP14GuardCommander: [1, 1]