crystall-punk-14

juni/crystall-punk-14

Fork 0

Commit Graph

Select branches

Hide Pull Requests

LocalHelperRefactor

MagicWands

SpellStorage-Update

TheShuEd-patch-1

color-replacer-tool

demiplanes-update

des-fishing

ed-03-07-2024-cloud-shadows

ed-05-06-2025-minor-fix

ed-06-08-2024-food-experiment

ed-06-10-2024-events

ed-07-03-2025-cargo-positions

ed-08-04-2025-master-fix-2

ed-09-04-2025-marble-fix

ed-09-05-2024-ambient-update

ed-09-12-2024-zlevels-mapsqol

ed-10-08-2024-sublicense

ed-12-01-2025-player-tokens

ed-12-08-2025-thaumaturgy-is-real

ed-12-11-2024-watership

ed-13-01-2024-fixes

ed-14-04-2025-content

ed-15-11-2024-magic-signs

ed-17-07-2024-dungenagain

ed-18-07-2024-filter-entities

ed-18-10-2024-books

ed-20-09-2024-shircooode

ed-2025-02-03-upstream-stable

ed-2025-03-03-upstream-stable-2

ed-21-09-2025-armor-update

ed-22-05-2025-workplace

ed-23-03-2025-rails

ed-23-07-2024-upstream

ed-23-09-2025-epic-story

ed-26-08-2024-wallpaper

ed-27-06-2024-oneside-windows

ed-28-08-2024-upstream

ed-29-05-2025-special-rules

ed-29-09-2024-workshop

ed-29-09-2025-upstream

ed-31-08-2025-kenku

ed-cla-test2

ed-god-hair

ed-revert-all

ed-revert-marble

ed_worldevents

fishing

funnyfunnystuff

magick

map-upate

master

revert-1148-Syurko

revert-1150-ed-07-04-2025-deep-ocean

revert-359-biome_spawner_fix

revert-995-BalladeHealBuff

welcoming-guests

workbench-update

#1

#100

#1000

#1001

#1002

#1003

#1004

#1005

#1007

#1009

#101

#1010

#1011

#1012

#1013

#1015

#1018

#102

#1021

#1022

#1023

#1024

#1025

#1026

#1027

#1028

#1029

#103

#1033

#1034

#1035

#1036

#1037

#1038

#1039

#104

#1040

#1042

#1044

#1045

#1046

#1047

#1049

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#106

#1063

#1064

#1065

#1066

#1069

#107

#1070

#1071

#1072

#1074

#1075

#1077

#1079

#108

#1080

#1081

#1082

#1084

#1085

#1088

#1089

#109

#1090

#1091

#1092

#1094

#1095

#1096

#110

#1100

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1109

#111

#1110

#1112

#1113

#1115

#112

#1122

#1123

#1124

#1125

#1126

#1129

#113

#1130

#1131

#1132

#1135

#1136

#1137

#1138

#1139

#1140

#1141

#1142

#1144

#1145

#1146

#1147

#1148

#115

#1150

#1151

#1152

#1153

#1154

#1155

#1156

#1157

#1158

#1159

#116

#1160

#1161

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#117

#1170

#1171

#1172

#1173

#1174

#1175

#1176

#1177

#1178

#1179

#118

#1180

#1181

#1182

#1183

#1185

#1186

#1187

#1189

#119

#1190

#1191

#1192

#1195

#1196

#1197

#1198

#1199

#120

#1200

#1202

#1204

#1205

#1206

#1207

#1208

#121

#1213

#1216

#1218

#122

#1220

#1221

#1223

#1225

#1227

#1228

#1229

#123

#1230

#1231

#1232

#1232

#1239

#124

#1240

#1242

#1244

#1245

#1246

#1249

#125

#1250

#1251

#1253

#1255

#1256

#1257

#1258

#1259

#126

#1260

#1261

#1262

#1263

#1265

#1266

#1267

#1268

#1269

#127

#1270

#1271

#1272

#1273

#1274

#1275

#1276

#1277

#1278

#1279

#128

#1280

#1281

#1282

#1283

#1284

#1285

#1286

#1287

#1288

#1289

#129

#1290

#1291

#1292

#1296

#1297

#1298

#1299

#13

#130

#1300

#1302

#1303

#1304

#1307

#1308

#1309

#131

#1310

#1314

#1315

#1317

#1318

#132

#1321

#1323

#1324

#1325

#1326

#1327

#1328

#1329

#133

#1330

#1331

#1332

#1334

#1335

#1337

#1338

#1339

#134

#1340

#1341

#1342

#1343

#1345

#1346

#1347

#1348

#1349

#135

#1351

#1352

#1353

#1354

#1356

#1357

#1358

#1359

#136

#1360

#1361

#1362

#1363

#1364

#1365

#1366

#1367

#1368

#137

#1370

#1371

#1372

#1373

#1374

#1375

#1376

#1378

#138

#1380

#1381

#1382

#1383

#1384

#1385

#1386

#1387

#1389

#139

#1390

#1391

#1392

#1394

#1395

#1396

#1397

#1398

#1399

#14

#1401

#1402

#1403

#1404

#1405

#1406

#1407

#1408

#1409

#1410

#1411

#1412

#1413

#1414

#1416

#1417

#1418

#1419

#1420

#1421

#1422

#1423

#1424

#1425

#1426

#1427

#143

#1430

#1431

#1432

#1433

#1434

#1436

#1437

#1438

#1439

#144

#1440

#1442

#1443

#1444

#1445

#1446

#1447

#1448

#1449

#145

#1450

#1451

#1452

#1453

#1455

#1456

#1457

#1458

#1459

#146

#1460

#1461

#1462

#1463

#1464

#1465

#1466

#1467

#1468

#147

#1471

#1472

#1473

#1475

#1476

#1477

#1478

#1479

#148

#1480

#1481

#1482

#1483

#1484

#1485

#1486

#1487

#1488

#1489

#149

#1490

#1491

#1492

#1493

#1494

#1495

#1496

#1497

#1498

#1499

#15

#150

#1500

#1501

#1502

#1503

#1504

#1505

#1507

#1508

#1509

#151

#1510

#1511

#1514

#1515

#1516

#1517

#1518

#1519

#152

#1520

#1521

#1522

#1523

#1524

#1525

#1526

#1527

#1528

#1529

#153

#1531

#1532

#1533

#1534

#1535

#1537

#1538

#1539

#154

#1540

#1541

#1546

#1547

#1548

#1549

#155

#1550

#1553

#1556

#1558

#156

#1562

#1566

#1568

#1569

#157

#1571

#1572

#1577

#1578

#1579

#158

#1581

#1583

#1584

#1585

#159

#1590

#1591

#1592

#1594

#1596

#1597

#1599

#160

#1600

#1602

#1603

#1607

#161

#1613

#1616

#1617

#1618

#1619

#162

#1621

#1622

#1624

#1625

#1627

#1629

#163

#1630

#1632

#1635

#1636

#1637

#1638

#1639

#164

#1640

#1642

#1643

#1644

#1645

#1647

#1648

#1649

#165

#1650

#1652

#1654

#1655

#1657

#1658

#1659

#166

#1661

#1662

#167

#1671

#1672

#1673

#1674

#1675

#1676

#1679

#168

#1680

#1681

#1682

#1683

#1685

#1688

#1689

#169

#1690

#1691

#1692

#1695

#1696

#1697

#1698

#1699

#1700

#1701

#1702

#1703

#1705

#1708

#1709

#171

#1710

#1711

#1715

#1717

#1718

#1719

#172

#1725

#1726

#1727

#1730

#1734

#1735

#1737

#174

#1740

#1741

#1744

#1745

#1748

#1749

#175

#1752

#1753

#1754

#1755

#1756

#1757

#1761

#1762

#1763

#1764

#1765

#1766

#1768

#1769

#1770

#1771

#1772

#1773

#1774

#1777

#1778

#1779

#1780

#1781

#1786

#1787

#1788

#1789

#1790

#1792

#1793

#1794

#1796

#1797

#1798

#1799

#1803

#1804

#1805

#1807

#181

#1811

#1812

#1813

#1814

#1815

#1816

#1817

#1819

#182

#1820

#1821

#1822

#1824

#1825

#1826

#1827

#1828

#1829

#183

#1830

#1831

#1832

#1835

#1836

#1837

#1839

#184

#1842

#1845

#1847

#185

#188

#190

#191

#192

#194

#196

#197

#199

#2

#201

#202

#204

#205

#206

#209

#211

#212

#213

#214

#216

#217

#22

#222

#223

#224

#225

#226

#227

#228

#23

#230

#231

#232

#233

#234

#235

#236

#237

#239

#24

#240

#241

#243

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#256

#259

#26

#260

#262

#263

#265

#267

#269

#27

#270

#271

#272

#273

#274

#275

#276

#28

#280

#282

#283

#284

#285

#286

#288

#289

#290

#292

#293

#294

#295

#296

#297

#298

#299

#3

#301

#302

#303

#304

#306

#307

#308

#309

#311

#312

#313

#314

#317

#318

#320

#321

#322

#323

#325

#326

#327

#328

#329

#331

#333

#334

#335

#336

#337

#338

#34

#341

#342

#343

#344

#345

#346

#347

#348

#349

#350

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#366

#367

#37

#370

#371

#372

#373

#374

#376

#378

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#390

#391

#392

#393

#397

#398

#399

#4

#400

#401

#402

#403

#404

#405

#406

#407

#408

#410

#411

#412

#413

#417

#418

#419

#42

#420

#421

#423

#424

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#441

#442

#444

#45

#452

#453

#454

#455

#456

#457

#458

#459

#460

#461

#464

#465

#467

#468

#469

#470

#471

#472

#473

#474

#476

#477

#478

#479

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#489

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#510

#512

#513

#515

#516

#517

#518

#519

#520

#522

#523

#524

#525

#526

#527

#528

#529

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#559

#567

#570

#571

#572

#573

#574

#575

#576

#577

#578

#579

#582

#583

#584

#584

#585

#586

#587

#59

#590

#591

#592

#593

#594

#595

#597

#598

#599

#6

#60

#600

#601

#602

#603

#604

#606

#607

#608

#609

#61

#611

#614

#615

#616

#618

#619

#620

#621

#623

#625

#626

#627

#628

#629

#631

#632

#633

#634

#647

#648

#652

#653

#654

#655

#656

#657

#658

#659

#66

#660

#668

#669

#670

#671

#672

#673

#674

#677

#678

#679

#68

#680

#681

#682

#683

#684

#685

#686

#687

#688

#689

#690

#691

#692

#694

#695

#696

#697

#698

#699

#7

#700

#701

#702

#703

#704

#705

#706

#707

#708

#709

#71

#710

#712

#713

#714

#715

#716

#717

#718

#723

#73

#730

#731

#732

#733

#734

#735

#736

#74

#748

#749

#75

#750

#751

#752

#754

#755

#756

#757

#758

#759

#76

#760

#761

#763

#765

#766

#770

#771

#776

#778

#779

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#79

#790

#792

#794

#80

#802

#805

#806

#807

#808

#810

#811

#812

#813

#814

#815

#816

#817

#818

#819

#820

#821

#822

#823

#824

#826

#827

#83

#831

#832

#834

#835

#836

#837

#838

#839

#840

#841

#842

#843

#844

#846

#847

#848

#849

#850

#851

#852

#853

#854

#855

#857

#858

#859

#86

#860

#861

#862

#864

#865

#866

#872

#873

#874

#877

#88

#880

#881

#882

#883

#885

#886

#888

#889

#89

#891

#892

#893

#896

#897

#898

#899

#90

#900

#901

#902

#903

#904

#905

#906

#91

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#922

#923

#924

#925

#926

#928

#929

#930

#931

#932

#933

#934

#935

#936

#937

#938

#939

#94

#940

#941

#942

#943

#944

#945

#946

#948

#949

#950

#952

#953

#954

#955

#956

#96

#961

#962

#963

#964

#965

#966

#967

#968

#969

#97

#971

#972

#973

#975

#976

#977

#98

#986

#987

#988

#989

#99

#990

#992

#993

#994

#995

#997

#999

6f2699f521 Automatic changelog update PJBot 2025-08-12 22:22:52 +00:00
39cb27fe21 Borg hands & hand whitelisting (#38668) pathetic meowmeow 2025-08-12 18:21:42 -04:00
8b76ace136 Slightly shorten examine text for splashing a solution with a melee attack (#39428) āda 2025-08-12 17:17:03 -05:00
9b6cb79fa2 Fix dock radar colours (#38942) UpAndLeaves 2025-08-12 21:09:00 +01:00
eb289104ab Update DiscordAuthManager.cs Deserty0 2025-08-13 05:39:35 +10:00
db49a55481 Update CCvars.CP14DiscordAuth.cs Deserty0 2025-08-13 05:15:57 +10:00
f01725fdc7 Update CCvars.CP14DiscordAuth.cs Deserty0 2025-08-13 05:15:57 +10:00
0a6a560066 Update DiscordAuthManager.cs Deserty0 2025-08-13 05:04:07 +10:00
6f170bb45f lol Deserty0 2025-08-13 04:55:57 +10:00
c76d21e973 Fix antag objective assignment (again) (#39565) ScarKy0 2025-08-12 20:53:04 +02:00
cec07307bf 123 Deserty0 2025-08-13 04:48:48 +10:00
bd80a1eb60 Update PanicBunkerTab.xaml Deserty0 2025-08-13 04:32:30 +10:00
b0c2b92464 Update DiscordAuthManager.cs Deserty0 2025-08-12 00:24:43 +10:00
35e5025d3e Update CCvars.CP14DiscordAuth.cs Deserty0 2025-08-11 00:18:22 +10:00
146967b786 looool Deserty0 2025-08-11 00:04:09 +10:00
4b68d79729 uaua Deserty0 2025-08-09 02:12:34 +10:00
8899695ed5 Update DiscordAuthManager.cs Deserty0 2025-08-06 22:40:45 +10:00
1d410590b6 Update DiscordAuthManager.cs Deserty0 2025-08-06 22:38:00 +10:00
24eb9d7493 Update DiscordAuthManager.cs Deserty0 2025-08-06 22:33:43 +10:00
565283ae26 Update DiscordAuthManager.cs Deserty0 2025-08-06 22:31:46 +10:00
d55800c575 funny Deserty0 2025-08-06 22:22:16 +10:00
6dc363ee4b datafields ed-12-08-2025-thaumaturgy-is-real Ed 2025-08-12 13:44:15 +03:00
f4325c4235 Removed crazy burger from happyhonk fill table. 5tickman 2025-08-12 00:24:28 -05:00
ac74740ec5 Removed redundant edible components. 5tickman 2025-08-11 22:39:33 -05:00
915d815254 feat: make ReagentId hash by value (#39494) Perry Fraser 2025-08-11 18:44:10 -04:00
de7486b8db Fix ReagentQuantity Equality check (#39574) Princess Cheeseballs 2025-08-11 15:38:01 -07:00
291a6c9808 Automatic changelog update PJBot 2025-08-11 21:07:36 +00:00
fd52f698c7 Predict PoweredLights (#36541) metalgearsloth 2025-08-12 07:06:28 +10:00
e87e021f1b Automatic changelog update CrystallEdge Server 2025-08-11 23:47:33 +03:00
e6f5ed2450 Spell pre-examine (#1661) Red 2025-08-11 23:46:28 +03:00
3d71ddd1de Merge stable into master (#39572) Princess Cheeseballs 2025-08-11 12:56:51 -07:00
f161b7d386 Reduce LevelOfParallelism to 2 for integration tests (#39566) slarticodefast 2025-08-11 21:41:53 +02:00
661fc00a1f [HOTFIX] Stop players from clipping through Windoors (#39564) Princess Cheeseballs 2025-08-11 12:41:13 -07:00
14a45f1cad Reduce LevelOfParallelism to 2 for integration tests (#39566) slarticodefast 2025-08-11 21:41:53 +02:00
0a52ca6ba8 [HOTFIX] Stop players from clipping through Windoors (#39564) Princess Cheeseballs 2025-08-11 12:41:13 -07:00
a5351b8c77 ExtinguishOnTrigger and TriggerOnInteractHand (#39537) āda 2025-08-11 14:21:11 -05:00
aa5fe8d4d7 Automatic changelog update CrystallEdge Server 2025-08-11 22:20:37 +03:00
cef72a3512 Cookbook (#1644) nukkuminen 2025-08-11 22:19:32 +03:00
25df43cea4 fixes (#1658) Viator-MV 2025-08-11 22:18:59 +03:00
85708cad7f Automatic changelog update PJBot 2025-08-11 18:58:47 +00:00
ed6f906e6f Better robotics console (#38023) Samuka-C 2025-08-11 15:57:39 -03:00
47d7db0665 Base changeling objective(s) (#39562) ScarKy0 2025-08-11 19:13:27 +02:00
6ae19340ab Automatic changelog update PJBot 2025-08-11 15:44:56 +00:00
2a46fb474f Oasis: Add atmos network monitor (#39331) Alex 2025-08-11 11:43:47 -04:00
9ecb8333f2 Predict suitsensor system (#39325) kosticia 2025-08-11 18:35:11 +03:00
d7295d1ae4 Actions examine (#39558) Red 2025-08-11 17:52:20 +03:00
8d0a174b43 Automatic changelog update PJBot 2025-08-11 11:01:20 +00:00
3654fcf5dd fix: reform dionas via SpawnNextToOrDrop (#39505) Perry Fraser 2025-08-11 07:00:12 -04:00
ad5fe5678c Trigger on round end (#39545) āda 2025-08-11 02:44:36 -05:00
936831bfe0 Automatic changelog update PJBot 2025-08-10 22:21:36 +00:00
46a0cd9057 Adds rare Hamlet variant: Fragile Hamlet (#39531) Jessica M 2025-08-10 15:20:26 -07:00
458e2d222c Status Effect Alerts and Time Bugfixes (#39529) Princess Cheeseballs 2025-08-10 13:55:13 -07:00
7825d30562 Fire stacks trigger (#39530) āda 2025-08-10 14:59:32 -05:00
2aca7f62dc Automatic changelog update PJBot 2025-08-10 18:11:20 +00:00
80375370f8 Add voice locks to various hidden syndicate items (#39310) beck-thompson 2025-08-10 11:10:13 -07:00
80299e863a Automatic changelog update PJBot 2025-08-10 17:50:37 +00:00
55335cce0f Crawling Fixes 1: Dragons and Borgs can't do the worm. (#39084) Princess Cheeseballs 2025-08-10 10:49:29 -07:00
03326477a8 Combat box now huge. Reorganize order of abstract, parent, id, and name. Replaced "type: Food" with "type: Edible". 5tickman 2025-08-10 10:31:19 -05:00
1b2dc757e0 Automatic changelog update CrystallEdge Server 2025-08-10 17:28:17 +03:00
77c5d96ea3 New wild plant sprites. (#1654) creamybag 2025-08-10 17:27:12 +03:00
25df067d3f Backpacks description and categories (#1647) Alexsey Bezyuk 2025-08-11 00:25:34 +10:00
44beba9ca6 Convert flem sounds from stereo to mono (#1649) Morb 2025-08-10 07:23:41 -07:00
4c9f31ef13 Carcat guidebook tweak (#1652) nukkuminen 2025-08-10 17:23:25 +03:00
4e29107c89 Update Credits (#39512) github-actions[bot] 2025-08-10 02:45:37 +02:00
23e2f997a9 Automatic changelog update PJBot 2025-08-09 21:53:17 +00:00
3ffa3ea9d4 Moth displacement map fixes (#39174) Nemanja 2025-08-09 17:52:06 -04:00
3f9d303cfc Mapping - Box station - Tie the RD's disposal bin to the disposals system. (#39507) Serylis of Five 2025-08-09 22:38:18 +02:00
a4e5d1b211 Network StationMember properly (#39509) Nemanja 2025-08-09 16:13:14 -04:00
450ff99bac Fix: Water Bottles Verb Priority and Prediction (#39482) Princess Cheeseballs 2025-08-09 12:31:34 -07:00
662e509369 no more magic type mana armor (#1650) Kit 2025-08-09 13:53:25 -04:00
68eb43f0d8 fix mind role filter (#39499) deltanedas 2025-08-09 16:23:31 +00:00
c089e844dc Minor cleanup (#1645) Red 2025-08-09 13:47:21 +03:00
bfd1db72d8 Automatic changelog update CrystallEdge Server 2025-08-09 13:22:31 +03:00
bdd7e5ea65 Leather rework (#1638) Alexsey Bezyuk 2025-08-09 20:21:26 +10:00
96f28489c6 Перевод на RU (#1596) Nim 2025-08-09 13:12:47 +03:00
72d6fc3537 variable alias iaada 2025-08-08 19:14:18 -05:00
31167f97e4 @oldschoolotaku has signed the CLA in crystallpunk-14/crystall-punk-14#1644 github-actions[bot] 2025-08-08 23:57:57 +00:00
cf820cbf3e requested changes iaada 2025-08-08 18:50:36 -05:00
6dceb7b8e0 Merge Stable into Master (#39489) Nemanja 2025-08-08 19:35:49 -04:00
5e31bfae0c Buttons are now Free-placeable (again) (#39425) Southbridge 2025-08-08 18:45:17 -04:00
168186f75b Fix bar and base signs (#39487) kosticia 2025-08-09 01:44:40 +03:00
ce7b7c1adf Fix Whoopie Cushions from lagging the game. (#39194) Princess Cheeseballs 2025-08-08 15:11:13 -07:00
e826bbe4ed Automatic changelog update CrystallEdge Server 2025-08-09 00:28:28 +03:00
02286f492a material aspect support (#1643) Red 2025-08-09 00:27:23 +03:00
856bbb373a Merge remote-tracking branch 'upstream/master' into up/drinks-yml iaada 2025-08-08 15:17:10 -05:00
8015892add Automatic changelog update CrystallEdge Server 2025-08-08 22:43:13 +03:00
2b8145ce87 Cleanup Base food and drink a little (#39485) Princess Cheeseballs 2025-08-08 12:42:11 -07:00
a808bf521c Resurrection spell returns (#1642) Red 2025-08-08 22:42:08 +03:00
5cf8662f3c Remove NamesGolem (#39478) M87S 2025-08-08 12:30:46 -07:00
b38aba7812 Automatic changelog update PJBot 2025-08-08 19:28:53 +00:00
49fe34f78a fix: fix emote wheel icons (#39481) Perry Fraser 2025-08-08 15:27:46 -04:00
b60df574a6 Automatic changelog update PJBot 2025-08-08 19:01:48 +00:00
ca4f6d5e8b Starting glasses for Captain and HoP (#35531) K-Dynamic 2025-08-09 07:00:41 +12:00
1e3cf38c21 Automatic changelog update PJBot 2025-08-08 18:57:11 +00:00
c3555af821 Sentry turrets - Part 8: AI notifications (#35277) chromiumboy 2025-08-08 13:56:01 -05:00
9ad759b56d Update CP14DemiplaneSystem.cs Ed 2025-08-08 20:32:25 +03:00
1d21e13360 make objectives use yml defined mind filters (#36030) deltanedas 2025-08-08 16:58:46 +01:00
1374ceea47 Move some Station methods into shared (#38976) Nemanja 2025-08-08 11:22:34 -04:00
f4dad593a9 Automatic changelog update CrystallEdge Server 2025-08-08 17:38:21 +03:00
fa22152b42 Demiplane redesign again (again) (#1640) Red 2025-08-08 17:37:16 +03:00

... 8 9 10 11 12 ...