Conflicts!!!

2025-12-09 16:07:40 +00:00 · 2020-06-22 17:39:24 +03:00
parent 66cbdd1174 a0a4007332
commit c41d2e78be
395 changed files with 84463 additions and 336540 deletions
--- a/tgui/bin/tgui-build.bat
+++ b/tgui/bin/tgui-build.bat
--- a/tgui/bin/tgui-dev-server.bat
+++ b/tgui/bin/tgui-dev-server.bat
--- a/tgui/packages/tgui/interfaces/Cargo.js
+++ b/tgui/packages/tgui/interfaces/Cargo.js
@@ -185,7 +185,7 @@ export const CargoCatalog = (props, context) => {
                      onClick={() => act('add', {
                        id: pack.id,
                      })}>
-                      {formatMoney(self_paid
+                      {formatMoney(self_paid && !pack.goody
                        ? Math.round(pack.cost * 1.1)
                        : pack.cost)}
                      {' cr'}