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

a8ff999b08 add StationTrackerComponent (#36803) Milon 2025-04-30 16:07:25 +02:00
feffbea9f9 Fix examine prediction (#36999) metalgearsloth 2025-04-30 17:49:36 +10:00
2ff8a45b58 fix so that the meat patty uses the meat patty sprite on custom burgers (#37064) Gentleman-Bird 2025-04-30 03:13:20 -04:00
ebb1f92027 feex oasis portal (#37058) IProduceWidgets 2025-04-29 22:55:45 -04:00
1b5547fbb9 Automatic changelog update PJBot 2025-04-30 00:52:48 +00:00
e3c3f4898f Fix NPCs stalling when too many exist (#37056) Nemanja 2025-04-29 20:51:41 -04:00
97d4e80685 merge stable into master (#37055) slarticodefast 2025-04-30 02:42:06 +02:00
0ee4babc55 Automatic changelog update PJBot 2025-04-30 00:41:34 +00:00
f399126c66 Centcomm carapace, moved armour from vests.yml to armor.yml (#35301) K-Dynamic 2025-04-30 12:40:27 +12:00
504dd63200 Automatic changelog update PJBot 2025-04-30 00:35:27 +00:00
10796df6bc Un-copypaste wallmount substation prototype to give them a UI (#37047) Pieter-Jan Briers 2025-04-30 02:34:20 +02:00
0e586e3fae Hotfix: Fix item toggling crashing the client for slimes (#37054) slarticodefast 2025-04-30 02:19:07 +02:00
aaf3db8f9d Automatic changelog update PJBot 2025-04-29 22:56:54 +00:00
a00b7b753c Mail visual update (#37049) ScarKy0 2025-04-30 00:55:47 +02:00
f69a856da0 Automatic changelog update PJBot 2025-04-29 22:18:39 +00:00
f59b878ce5 Add toolbox sound effects (#37048) themias 2025-04-29 18:17:32 -04:00
c96af2808f Added warning when attempting to run RUN_THIS on a zip repo download (Attempt 2) (#36922) Myra 2025-04-29 22:51:21 +01:00
3f17e7171b Automatic changelog update PJBot 2025-04-29 21:45:57 +00:00
afc55d6573 Show other speso colours, add larger denominations (Frontier#1496) (#37030) Whatstone 2025-04-29 17:44:47 -04:00
87d097bb5d Stable merge (#37050) Myra 2025-04-29 21:54:43 +01:00
84178dd534 Puddle code hotfix 2 (#37046) Princess Cheeseballs 2025-04-29 13:10:00 -07:00
a8ff930763 Staff of Animation Fixes & Recharging (#37021) ActiveMammmoth 2025-04-29 15:40:49 -04:00
e366230458 Add inhand sprites for mini jetpack (#37041) SlamBamActionman 2025-04-29 19:43:09 +02:00
b9b854e179 ringer bugfixes (#36936) Milon 2025-04-29 19:08:23 +02:00
0c4713da7f Automatic changelog update PJBot 2025-04-29 16:37:59 +00:00
3f1ba3b6e7 Added Space Carp Tooth Arrows and Sharkminnow Spears, buffs sharkminnow teeth. (#31257) Boaz1111 2025-04-29 18:36:53 +02:00
b4ea0f69f5 Update tiefling.yml (#1245) Ed 2025-04-29 18:11:36 +03:00
8cc50ea3a4 Update tiefling.yml Ed 2025-04-29 17:20:25 +03:00
c3b6938388 unicorns Ed 2025-04-29 17:14:05 +03:00
3ce8e62157 Automatic changelog update PJBot 2025-04-29 13:33:25 +00:00
aa29712a65 Fix clientsided alerts being overwritten by server (#37033) SlamBamActionman 2025-04-29 15:32:18 +02:00
74a8bb9509 Fix solution visualization after drawing with a whitelist (#36657) pathetic meowmeow 2025-04-29 09:18:07 -04:00
5ef74728c9 Automatic changelog update PJBot 2025-04-29 13:09:05 +00:00
ce080276db Push horn (#36009) Thinbug 2025-04-29 10:07:57 -03:00
9e9726f81b Add borders to the asteroid sand (#35397) kosticia 2025-04-29 15:58:39 +03:00
db008825e6 Automatic changelog update PJBot 2025-04-29 10:26:03 +00:00
8245474fdc Chem master more unit transfer buttons (#36995) abadaba695 2025-04-29 20:24:56 +10:00
612ffb90cb Update ores.yml Ed 2025-04-29 13:10:43 +03:00
ad63aef2b2 Automatic changelog update PJBot 2025-04-29 10:02:04 +00:00
53c3153645 re-buffs proto kinetic accelerator (#37012) TytosB 2025-04-29 05:00:55 -05:00
5afd520773 Automatic changelog update PJBot 2025-04-29 09:05:14 +00:00
23d835b4b6 oasis genpop (#37031) IProduceWidgets 2025-04-29 05:04:07 -04:00
354d633134 Merge branch 'master' into ed-14-04-2025-content Ed 2025-04-29 10:49:16 +03:00
aeed6b3954 More Mail Sprites (#37023) Princess Cheeseballs 2025-04-28 22:27:14 -07:00
31e0fedb61 Automatic changelog update PJBot 2025-04-29 05:25:40 +00:00
207d513666 SSD sleep take 2 (#34039) lzk 2025-04-29 07:24:33 +02:00
e21944d083 Automatic changelog update PJBot 2025-04-29 04:46:17 +00:00
294a5a1b69 Display obvious plant mutations in examine text (#32650) drakewill-CRL 2025-04-29 00:45:10 -04:00
9a3e70ca13 Automatic changelog update PJBot 2025-04-29 03:38:45 +00:00
f75811b4cb Rebalance magnet debris, update worldgen (#37025) Nemanja 2025-04-28 23:37:39 -04:00
ef49416540 Automatic changelog update PJBot 2025-04-29 03:14:08 +00:00
a94d4a0991 Buffing slugs and replacing beanbags from the Bulldog bundle (#33517) Stomf 2025-04-28 22:13:01 -05:00
8c38aa3742 BatteryWeaponPowerCell tweaks (#33500) Kirus59 2025-04-29 04:12:25 +03:00
a8054c37b1 Automatic changelog update PJBot 2025-04-29 00:27:29 +00:00
b33f1db432 Theatre access to Service Request Computer (#37003) themias 2025-04-28 20:26:23 -04:00
9154fbf7fe Automatic changelog update PJBot 2025-04-29 00:25:19 +00:00
4671382419 Remove Contact Slowdown when Weightless or in the Air (#33299) Victor Shen 2025-04-28 17:24:12 -07:00
f7a8a1779e Automatic changelog update PJBot 2025-04-28 23:44:46 +00:00
bd08c71189 Fix t-ray scanner exception spam (#37018) themias 2025-04-28 19:43:39 -04:00
956652e111 Disown atmos and botany (#37017) Partmedia 2025-04-28 15:21:53 -07:00
02b5592d69 Xenoborgs part 2 (#36844) Samuka-C 2025-04-28 19:10:35 -03:00
46b030df45 Automatic changelog update PJBot 2025-04-28 21:17:21 +00:00
9d8cc64d48 Fix mail cutting thinking your arms are infinite length (#37019) ScarKy0 2025-04-28 23:16:14 +02:00
75a90152a7 Automatic changelog update PJBot 2025-04-28 21:01:17 +00:00
3d0485fe5b Shoulder-length hairstyles resprite (#37000) KingFroozy 2025-04-29 00:00:10 +03:00
b3ea8ee031 Automatic changelog update PJBot 2025-04-28 19:23:15 +00:00
4171c4e6d5 make scrubber widenet in panic mode (#37013) lzk 2025-04-28 21:22:05 +02:00
c6bdce3b0c merge staging into master (#37009) slarticodefast 2025-04-28 20:14:39 +02:00
b629cbac3e Clear MIDI masters properly to avoid replay freezes (#36809) Pieter-Jan Briers 2025-04-26 08:42:16 +02:00
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) keronshb 2025-04-28 13:42:24 -04:00
f6bae21184 Cherrypick #36955 into staging (#37002) Myra 2025-04-28 19:40:56 +02:00
d4e40ae44b Revert "Add new color turtlenecks in WinterDrobe" (#36983) Nemanja 2025-04-28 13:38:43 -04:00
391230cd4b @Militore has signed the CLA in crystallpunk-14/crystall-punk-14#1242 github-actions[bot] 2025-04-28 15:27:14 +00:00
fe3fe95dfa Fix autorecharge metalgearsloth 2025-04-27 00:44:02 +10:00
88eda89faa MapManager warning cleanup on tests (#36940) Kyle Tyo 2025-04-28 06:52:25 -04:00
14ddd8b4cd Merge hotfix into master (#37001) ScarKy0 2025-04-28 11:47:56 +02:00
4509821f0e [HOTFIX] Revert "Updated air scrubber and air vent sprites." (#36992) Nemanja 2025-04-28 05:45:19 -04:00
14cca7990a [HOTFIX] Fix maroon objective, change the text (#36990) ScarKy0 2025-04-28 11:31:42 +02:00
973ad71f5c Automatic changelog update PJBot 2025-04-28 06:57:46 +00:00
2e8291cecb Amber Station - Added Genpop (#36997) Southbridge 2025-04-28 02:56:39 -04:00
0043bde402 Add some salvage ruins (#36814) IProduceWidgets 2025-04-28 01:33:40 -04:00
ff69325652 Automatic changelog update PJBot 2025-04-28 02:41:28 +00:00
a42fb658fd Mime suit resprite (#36702) KingFroozy 2025-04-28 05:40:21 +03:00
fba07c69a9 Update staging to engine v255.0.0 (#36916) Leon Friedrich 2025-04-28 12:11:48 +10:00
03894048e9 Automatic changelog update PJBot 2025-04-28 01:01:56 +00:00
875ccb94c6 nuke shelves' whitelists (#36986) lzk 2025-04-28 03:00:46 +02:00
f6b3ba79d3 Temporarily Making Cargo Buy and Sell Pallets Indestructible (#34195) Bokser815 2025-04-27 19:59:54 -05:00
106bee52b0 Automatic changelog update PJBot 2025-04-27 23:05:47 +00:00
13a1853168 Fragile Deliveries (#36980) ScarKy0 2025-04-28 01:04:39 +02:00
fac4bcd9b2 Automatic changelog update PJBot 2025-04-27 20:16:23 +00:00
85f0760b1b Add a mapping changelog to upstream (#34848) ArtisticRoomba 2025-04-27 13:15:17 -07:00
536106a666 Automatic changelog update PJBot 2025-04-27 15:12:19 +00:00
4690e62575 Feature/auto sync node scanner (#36635) Fildrance 2025-04-27 18:11:13 +03:00
b17e558046 Automatic changelog update PJBot 2025-04-27 14:48:24 +00:00
f29b38c44b Use RMC mob collision values (#36851) metalgearsloth 2025-04-28 00:47:18 +10:00
991d2fbf74 Update Dev.toml Ed 2025-04-27 17:01:16 +03:00
0da897947f Automatic changelog update PJBot 2025-04-27 11:09:42 +00:00
ffe130b38d Battery (SMES/substation) interface (#36386) Pieter-Jan Briers 2025-04-27 13:08:34 +02:00
791f7af5d4 Paramedic suits adjustments (#36707) KingFroozy 2025-04-27 14:27:01 +04:00
39c6544dc9 visionCorrector (#1230) Viator-MV 2025-04-27 13:24:52 +03:00

... 33 34 35 36 37 ...