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

Mono Color

• c5d1aba8f0 Automatic changelog update PJBot 2025-02-06 23:08:33 +00:00
• ed01ad772d Buff the Combat Bakery Kit uplink item (#34927) themias 2025-02-06 18:07:26 -05:00
• 49a502cc25 Bacinet (#852) Nim 2025-02-07 00:02:59 +02:00
• 68f0543f5d @Nimfar11 has signed the CLA in crystallpunk-14/crystall-punk-14#852 github-actions[bot] 2025-02-06 20:33:52 +00:00
• 727935c0f7 Automatic changelog update PJBot 2025-02-06 19:18:04 +00:00
• 8ff90a6d20 Guide Control Button Now Redirects Properly (#34914) GrownSamoyedDog 2025-02-06 12:16:57 -07:00
• d204480be3 Automatic changelog update PJBot 2025-02-06 19:11:06 +00:00
• b6ccbef147 DNA scrambler examine fixes (#34920) 12rabbits 2025-02-06 11:09:59 -08:00
• 64ebcb5277 cleanup not needed locale string (#34922) lzk 2025-02-06 19:42:57 +01:00
• 3940d22076 Merge stable into master (#34924) slarticodefast 2025-02-06 16:35:48 +01:00
• 11e5d59171 HOTFIX: fix minibomb implant and syndicats not exploding (#34923) slarticodefast 2025-02-06 16:17:58 +01:00
• cd91effefb HOTFIX: Fix lineedit focus (#34621) ShadowCommander 2025-02-06 07:14:55 -08:00
• 6c7170e482 Automatic changelog update PJBot 2025-02-06 13:46:20 +00:00
• e675ea4273 hide icons for invisible entities (#34825) deltanedas 2025-02-06 13:45:13 +00:00
• 2cfe92489a Merge pull request #850 from crystallpunk-14/ed-06-02-2025-upstream-sync-fix Ed 2025-02-06 15:00:10 +03:00
• 5020cfac5c Automatic changelog update PJBot 2025-02-06 11:46:42 +00:00
• 16aad5a168 Swapped butter w/ olive oil for making spaghetti (#34904) SG6732 2025-02-06 20:45:33 +09:00
• 5c391b753f Merge remote-tracking branch 'upstream/stable' into ed-06-02-2025-upstream-sync-fix Ed 2025-02-06 14:38:00 +03:00
• f83505cfba Update cla.json Ed 2025-02-06 14:12:15 +03:00
• 55f93d88d6 Update cla.json Ed 2025-02-06 14:08:32 +03:00
• ebde8d6873 Update cla.json Ed 2025-02-06 14:07:42 +03:00
• 5e4df7ac87 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 Ed 2025-02-06 14:07:05 +03:00
• d294c0129f Update cla.yml Ed 2025-02-06 14:05:58 +03:00
• a0a827ea5a Upstream sync (#846) Ed 2025-02-06 13:57:14 +03:00
• 55a8fc4049 @Toby222 has signed the CLA in crystallpunk-14/crystall-punk-14#846 github-actions[bot] 2025-02-06 10:43:07 +00:00
• b5eb3a3dc1 Kick stamina spell (#844) Ed 2025-02-06 12:38:20 +03:00
• 4cc5b5bec1 bagel fix hos locker (#34919) Emisse 2025-02-06 01:38:08 -07:00
• 6d2e0f57c1 Automatic changelog update PJBot 2025-02-06 05:50:48 +00:00
• a0fe21ac2f Added Genderqueer pin! (Properly this time.) (#34561) centcomofficer24 2025-02-06 05:49:41 +00:00
• 43da2cc31f Automatic changelog update PJBot 2025-02-06 05:11:29 +00:00
• 001d61c6d5 Add air alarm admin logs (#33426) Palladinium 2025-02-06 16:10:21 +11:00
• 434d1584fc ~~Stable~~ Staging merge for the grinch (#34909) Myra 2025-02-06 01:35:57 +01:00
• 0c2baf91f3 Update engine properly Vasilis The Pikachu 2025-02-06 01:18:03 +01:00
• 36e42fb4b2 Merge branch 'master' of ssh://github.com/space-wizards/space-station-14 into staging Vasilis The Pikachu 2025-02-06 01:11:50 +01:00
• 6824ab4292 Emisse told me I can name it the grinch (#34905) Myra 2025-02-06 00:45:01 +01:00
• 3a3268bad3 Automatic changelog update PJBot 2025-02-05 23:13:15 +00:00
• f964908756 Sec Balance Part 1: Buffs Disabler and Disabler SMG (#34890) keronshb 2025-02-05 18:12:07 -05:00
• 60737dc36e Freeze spell (#843) Ed 2025-02-05 23:48:27 +03:00
• 35303d7d80 Guildmaster 2 spells (#842) Ed 2025-02-05 22:52:50 +03:00
• 0d9f9e9615 Make hacking energy swords predicted (#34877) Plykiya 2025-02-05 11:48:28 -08:00
• fed38041e0 pie pumpkin (#841) Nim 2025-02-05 21:39:30 +02:00
• efa067c126 Automatic changelog update PJBot 2025-02-05 16:50:11 +00:00
• d0bdbc875e Elf Ears (#33572) Farrellka 2025-02-05 19:49:04 +03:00
• 1e7b4140a4 Automatic changelog update PJBot 2025-02-05 14:55:52 +00:00
• 54d5ef93ad Reduce NukeOps Reinforcement price from 35TC to 30TC (#34675) hyperDelegate 2025-02-05 05:54:45 -09:00
• 4964aae503 Automatic changelog update PJBot 2025-02-05 14:47:28 +00:00
• ded6b46b80 Remove instant cryobed insertion (#34619) Booblesnoot42 2025-02-05 09:46:21 -05:00
• bf46e6b5e8 Smoking pipe new (#823) Nim 2025-02-05 16:44:34 +02:00
• f2c74ef9d4 Revert "Update ScalingViewport for Engine PR (#28786)" Errant 2025-02-05 14:15:22 +01:00
• fc80a18c35 Revert "Storage UI V2 (#33045)" Errant 2025-02-05 14:13:06 +01:00
• d6a9ddd9e0 Revert "Storage sidebar fix (#34680)" Errant 2025-02-05 14:12:52 +01:00
• 214fb2422f Automatic changelog update PJBot 2025-02-05 13:09:59 +00:00
• 13be8de848 Changed utensil sprites to appear smaller. (#34277) Gavin TC 2025-02-05 08:08:53 -05:00
• eb2aa083cc revert engine Errant 2025-02-05 14:00:49 +01:00
• e9c0338884 Remove Vector assets and renames Vector SMG magazines (#34603) K-Dynamic 2025-02-06 00:39:26 +12:00
• 5e80f98242 Update elemental.yml Ed 2025-02-05 14:24:12 +03:00
• d100ed765b Echoes of voices from the demiplanes (#840) Ed 2025-02-05 14:21:12 +03:00
• 16b91ce2ec Automatic changelog update PJBot 2025-02-05 08:43:33 +00:00
• 2cea673610 Expand variety of strange pills (#34843) DuckManZach 2025-02-05 08:42:27 +00:00
• 4becbd2c12 Frogs (#831) Nim 2025-02-05 09:51:50 +02:00
• a725de1477 Automatic changelog update PJBot 2025-02-05 03:24:37 +00:00
• 5092681729 HealingSystem: check blood restoration, staunching (#33526) Whatstone 2025-02-04 22:23:30 -05:00
• f52116ba3b Update Credits (#34815) github-actions[bot] 2025-02-05 01:58:38 +01:00
• 5b41728863 Automatic changelog update PJBot 2025-02-04 23:27:12 +00:00
• 265de76c9a Add clientside personal pointlight for observers (#33607) Winkarst 2025-02-05 02:26:06 +03:00
• 7478af2d2a Automatic changelog update PJBot 2025-02-04 22:59:38 +00:00
• 26d9f222c4 Adds randomized maintenance rooms to convex station (#34866) Spessmann 2025-02-04 14:58:30 -08:00
• 8482767109 Omega Armory Restock (#34810) ToxicSonicFan04 2025-02-04 14:57:47 -08:00
• d9d451d3d8 Fix Oasis evac timer (#34849) Dinner 2025-02-04 17:57:13 -05:00
• 26cff2c980 Plasma evac shuttle timer fix (#34847) compilatron 2025-02-05 09:56:57 +11:00
• 5af55bbf2b Dehardcoded Space Heaters UI window title (#34884) Menshin 2025-02-04 23:56:42 +01:00
• e58d031300 Hristov & .60 changes - Hristov Rework, Part 2 (#31662) SlamBamActionman 2025-02-04 22:55:09 +01:00
• b5125f040c Automatic changelog update PJBot 2025-02-04 21:47:58 +00:00
• 8035455022 Add binoculars (#34687) slarticodefast 2025-02-04 22:46:49 +01:00
• 11a4ed5439 creamy shyba (#839) creamybag 2025-02-04 23:35:48 +03:00
• a406b919f2 @TheShuEd has signed the CLA in crystallpunk-14/crystall-punk-14#839 github-actions[bot] 2025-02-04 20:25:52 +00:00
• e077ddefaf Update Dev.toml Ed 2025-02-04 22:57:15 +03:00
• b2234b7c4a Discord authentification (#819) Ed 2025-02-04 22:44:22 +03:00
• dd6ddf840b Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 Ed 2025-02-04 19:42:24 +03:00
• a2cd7754f7 Update Dev.toml Ed 2025-02-04 19:40:21 +03:00
• d1cb8584bc Update Dev.toml Ed 2025-02-04 19:37:35 +03:00
• 6a017ef17b Mind Swap Fix (#33553) ActiveMammmoth 2025-02-04 11:25:54 -05:00
• 1d5b01190d Automatic changelog update PJBot 2025-02-04 16:12:55 +00:00
• a71a79d785 Fixed bola effect stacking (#34723) pubbi 2025-02-04 10:11:46 -06:00
• 543d45ee04 Normal quartz returns (#838) Ed 2025-02-04 17:57:05 +03:00
• e876befe0e Merge branch 'master' into DONOTMAPTEST Killerqu00 2025-02-04 12:56:47 +01:00
• d531a9db9c Automatic changelog update PJBot 2025-02-04 07:53:17 +00:00
• b2a6d5c1b0 Cabinetification (#34293) Ps3Moira 2025-02-03 23:52:10 -08:00
• df56b67ba8 Automatic changelog update PJBot 2025-02-03 23:34:21 +00:00
• 2ffe539ba2 contrabandInventory Changes (Fixed) (#32934) Smith 2025-02-03 18:33:14 -05:00
• ca4e99b819 Store Test Change (#34844) ActiveMammmoth 2025-02-03 17:11:06 -05:00
• a4599f6d60 fixed effect string typos (#34858) UpAndLeaves 2025-02-03 21:29:43 +00:00
• 4476b1e64b Automatic changelog update PJBot 2025-02-03 21:23:30 +00:00
• 3d6188c921 DSword Replacement - the Hypereutactic Blade (#32414) keronshb 2025-02-03 16:22:21 -05:00
• 344d99dabb hunger damage experiment Ed 2025-02-03 17:36:56 +03:00
• 3227459231 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 Ed 2025-02-03 17:36:23 +03:00
• 478b927e2b copper prices fix Ed 2025-02-03 17:32:47 +03:00
• 4aea4b853c Minor procedural fixes pack (#837) Ed 2025-02-03 17:09:09 +03:00
• f8c203ba0a Automatic changelog update PJBot 2025-02-03 01:05:11 +00:00
• 8b56f6f1e9 Security Shield Naming Structure Inconsistency Change (#34841) DieselMohawk 2025-02-02 19:04:04 -06:00