Skip to content

Commit 4e0a08c

Browse files
FalloutFalconIcarus-The-Sundarkpack13-api[bot]buffyuwutgstation-ci[bot]
authored
Darkpack Pull 5/1/2026 (#48)
Co-authored-by: Icarus-The-Sun <119832971+Icarus-The-Sun@users.noreply.github.com> Co-authored-by: darkpack13-api[bot] <220339179+darkpack13-api[bot]@users.noreply.github.com> Co-authored-by: buffyuwu <42501819+buffyuwu@users.noreply.github.com> Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com> Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> Co-authored-by: buffyuwu <buffyvrc@gmail.com> Co-authored-by: dwinters99 <65516417+dwinters99@users.noreply.github.com> Co-authored-by: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: Stalkeros <42087567+Stalkeros2@users.noreply.github.com> Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: leaKsi <59278564+leaKsi@users.noreply.github.com> Co-authored-by: Fghj240 <43589874+Fghj240@users.noreply.github.com> Co-authored-by: Fghj240 <fakeemail@notrealemail.com> Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: archbtw <230859540+archbtw0@users.noreply.github.com> Co-authored-by: glue0000 <230859540+glue0000@users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com> Co-authored-by: StaringGasMask <62149527+Exester509@users.noreply.github.com> Co-authored-by: OrbisAnima <orbisanima@gmail.com> Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> Co-authored-by: KingkumaArt <69398298+KingkumaArt@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Notamaniac <notamaniac@gmail.com> Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com> Co-authored-by: Lucy <lucy@absolucy.moe> Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com> Co-authored-by: Frenjo <2939692+Frenjo@users.noreply.github.com> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: L0pz <55806451+L0pz@users.noreply.github.com> Co-authored-by: Gboster-0 <82319946+Gboster-0@users.noreply.github.com> Co-authored-by: XeonMations <62395746+XeonMations@users.noreply.github.com> Co-authored-by: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com> Co-authored-by: Drakeven <50409888+Drakeven@users.noreply.github.com> Co-authored-by: TheCarnalest <167369312+TheCarnalest@users.noreply.github.com> Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
1 parent e1d851e commit 4e0a08c

367 files changed

Lines changed: 2492 additions & 2541 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/rerun_flaky_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ on:
44
workflows: [CI Suite]
55
types:
66
- completed
7-
# DARKPACK ADDITION START
7+
# DARKPACK EDIT ADD START
88
permissions:
99
actions: write
1010
contents: write
1111
issues: write
12-
# DARKPACK ADDITION END
12+
# DARKPACK EDIT ADD END
1313
jobs:
1414
rerun_flaky_tests:
1515
runs-on: ubuntu-24.04

‎.github/workflows/run_linters.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
if: steps.linter-setup.conclusion == 'success' && !cancelled()
6666
run: |
6767
bash tools/ci/check_grep.sh
68-
bash modular_darkpack/tools/darkpack_check_grep.sh # DARKPACK EDIT ADDITION - checking modular_darkpack code
68+
bash modular_darkpack/tools/darkpack_check_grep.sh # DARKPACK EDIT ADD - checking modular_darkpack code
6969
bash modular_zapoc/tools/apoc_check_grep.sh # APOC EDIT ADD
7070
- name: Ticked File Enforcement
7171
if: steps.linter-setup.conclusion == 'success' && !cancelled()

‎SQL/database_changelog.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be
55
The latest database version is 5.35; The query to update the schema revision table is:
66

77
```sql
8-
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 35); /* DARKPACK EDIT, ORIGINAL: INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 34); */
8+
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 35); /* DARKPACK EDIT CHANGE - ORIGINAL: INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 34); */
99
```
1010

1111
or
1212

1313
```sql
14-
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 35); /* DARKPACK EDIT, ORIGINAL: INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 34); */
14+
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 35); /* DARKPACK EDIT CHANGE - ORIGINAL: INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 34); */
1515
```
1616

1717
In any query remember to add a prefix to the table names if you use one.

‎SQL/tgstation_schema.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ CREATE TABLE `library` (
261261
`author` varchar(45) NOT NULL,
262262
`title` varchar(45) NOT NULL,
263263
`content` text NOT NULL,
264-
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT, ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
264+
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT CHANGE - ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
265265
`ckey` varchar(32) NOT NULL DEFAULT 'LEGACY',
266266
`datetime` datetime NOT NULL,
267267
`deleted` tinyint(1) unsigned DEFAULT NULL,

‎SQL/tgstation_schema_prefixed.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ CREATE TABLE `SS13_library` (
260260
`author` varchar(45) NOT NULL,
261261
`title` varchar(45) NOT NULL,
262262
`content` text NOT NULL,
263-
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT, ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
263+
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT CHANGE - ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
264264
`ckey` varchar(32) NOT NULL DEFAULT 'LEGACY',
265265
`datetime` datetime NOT NULL,
266266
`deleted` tinyint(1) unsigned DEFAULT NULL,

‎_maps/map_files/Vampire/runtimetown.dmm‎

Lines changed: 44 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,10 @@
10951095
"tY" = (
10961096
/turf/open/floor/plating/canal,
10971097
/area/vtm/outside/pacificheights)
1098+
"uf" = (
1099+
/obj/effect/turf_decal/bordur,
1100+
/turf/open/floor/plating/sidewalk/poor,
1101+
/area/vtm/outside/baywalk)
10981102
"ug" = (
10991103
/obj/machinery/door/airlock/elevator/right{
11001104
elevator_mode = 1;
@@ -1507,6 +1511,13 @@
15071511
/obj/item/gun/ballistic/automatic/darkpack/sniper,
15081512
/turf/open/floor/plating/rough,
15091513
/area/vtm/interior/anarch)
1514+
"Ce" = (
1515+
/obj/effect/turf_decal/bordur{
1516+
dir = 1
1517+
},
1518+
/obj/fusebox/transformer,
1519+
/turf/open/floor/plating/sidewalk/poor,
1520+
/area/vtm/outside/baywalk)
15101521
"Ct" = (
15111522
/obj/structure/lamppost/one{
15121523
dir = 1
@@ -1792,6 +1803,9 @@
17921803
/obj/structure/vampdoor/prison,
17931804
/turf/open/floor/plating/rough,
17941805
/area/vtm/interior/shop)
1806+
"Gr" = (
1807+
/turf/open/floor/plating/asphalt,
1808+
/area/vtm/outside/baywalk)
17951809
"Gt" = (
17961810
/obj/structure/table,
17971811
/obj/item/storage/medkit/darkpack/tox,
@@ -2389,6 +2403,11 @@
23892403
/obj/effect/mapping_helpers/door/access/graveyard,
23902404
/turf/open/floor/plating/rough,
23912405
/area/vtm/graveyard/interior)
2406+
"OA" = (
2407+
/obj/effect/turf_decal/bordur,
2408+
/obj/structure/lamppost/one,
2409+
/turf/open/floor/plating/sidewalk/poor,
2410+
/area/vtm/outside/baywalk)
23922411
"OB" = (
23932412
/obj/darkpack_car/police{
23942413
locked = 0
@@ -2568,6 +2587,11 @@
25682587
},
25692588
/turf/open/floor/plating/sidewalk,
25702589
/area/vtm/outside/pacificheights)
2590+
"QU" = (
2591+
/obj/effect/turf_decal/bordur,
2592+
/obj/structure/lamppost/one,
2593+
/turf/open/floor/plating/sidewalk/poor,
2594+
/area/vtm/outside/financialdistrict)
25712595
"QW" = (
25722596
/obj/machinery/light/directional/north,
25732597
/obj/effect/spawner/random/vending/snackvend,
@@ -2856,6 +2880,13 @@
28562880
/obj/machinery/light/directional/west,
28572881
/turf/open/floor/plating/rough,
28582882
/area/vtm/interior/anarch)
2883+
"Wn" = (
2884+
/obj/effect/turf_decal/bordur{
2885+
dir = 1
2886+
},
2887+
/obj/fusebox/transformer,
2888+
/turf/open/floor/plating/sidewalk/poor,
2889+
/area/vtm/outside/financialdistrict)
28592890
"Ws" = (
28602891
/obj/structure/table,
28612892
/obj/vampire_computer,
@@ -3051,6 +3082,11 @@
30513082
"Zz" = (
30523083
/turf/open/misc/grass/random/grass,
30533084
/area/vtm/outside/pacificheights)
3085+
"ZC" = (
3086+
/obj/effect/turf_decal/bordur,
3087+
/obj/structure/roadsign/street,
3088+
/turf/open/floor/plating/sidewalk/poor,
3089+
/area/vtm/outside/pacificheights)
30543090
"ZF" = (
30553091
/obj/structure/railing,
30563092
/turf/open/floor/plating/canal,
@@ -4730,7 +4766,7 @@ UJ
47304766
NR
47314767
Hy
47324768
NR
4733-
cj
4769+
ZC
47344770
ik
47354771
VQ
47364772
ik
@@ -5750,11 +5786,11 @@ NR
57505786
NR
57515787
NR
57525788
NR
5753-
cj
5754-
ik
5789+
uf
5790+
Gr
57555791
VQ
57565792
ik
5757-
Fs
5793+
Ce
57585794
qt
57595795
FO
57605796
Wa
@@ -5818,8 +5854,8 @@ NR
58185854
NR
58195855
NR
58205856
NR
5821-
Bq
5822-
ik
5857+
OA
5858+
Gr
58235859
VQ
58245860
ik
58255861
Fs
@@ -6430,11 +6466,11 @@ NR
64306466
NR
64316467
NR
64326468
NR
6433-
Bq
6469+
QU
64346470
ik
64356471
VQ
64366472
ik
6437-
Fs
6473+
Wn
64386474
Wa
64396475
Wa
64406476
Mn

‎code/__DEFINES/jobs.dm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#define JOB_UNAVAILABLE_KINDRED_GENERATION 12
2424
/// Checks for character clan.
2525
#define JOB_UNAVAILABLE_KINDRED_CLAN 13
26+
#define JOB_UNAVAILABLE_FERA_TRIBE 14
27+
#define JOB_UNAVAILABLE_FERA_AUSPICE 15
2628

2729
// DARKPACK EDIT ADD END
2830

@@ -284,7 +286,7 @@ DEFINE_BITFIELD(job_flags, list(
284286
))
285287

286288
/// Combination flag for jobs which are considered regular crew members of the station.
287-
#define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_HIDE_WHEN_EMPTY|JOB_LATEJOIN_ONLY|JOB_CANNOT_OPEN_SLOTS|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN) // DARKPACK EDIT, ORIGINAL: #define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_NEW_PLAYER_JOINABLE|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN)
289+
#define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_HIDE_WHEN_EMPTY|JOB_LATEJOIN_ONLY|JOB_CANNOT_OPEN_SLOTS|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN) // DARKPACK EDIT CHANGE - ORIGINAL: #define STATION_JOB_FLAGS (JOB_ANNOUNCE_ARRIVAL|JOB_CREW_MANIFEST|JOB_EQUIP_RANK|JOB_CREW_MEMBER|JOB_NEW_PLAYER_JOINABLE|JOB_REOPEN_ON_ROUNDSTART_LOSS|JOB_ASSIGN_QUIRKS|JOB_CAN_BE_INTERN)
288290
/// Combination flag for jobs which are considered heads of staff.
289291
#define HEAD_OF_STAFF_JOB_FLAGS (JOB_BOLD_SELECT_TEXT|JOB_CANNOT_OPEN_SLOTS|JOB_HEAD_OF_STAFF)
290292
/// Combination flag for jobs which are enabled by station traits.

‎code/__DEFINES/mobs.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
#define SPECIES_SKELETON "skeleton"
198198
#define SPECIES_SNAIL "snail"
199199
#define SPECIES_VAMPIRE "vampire"
200-
#define SPECIES_ZOMBIE "rotten2" // DARKPACK EDIT -- Original : #define SPECIES_ZOMBIE "zombie"
200+
#define SPECIES_ZOMBIE "rotten2" // DARKPACK EDIT CHANGE - ORIGINAL: #define SPECIES_ZOMBIE "zombie"
201201
#define SPECIES_ZOMBIE_INFECTIOUS "memezombie"
202202
#define SPECIES_ZOMBIE_INFECTIOUS_MINDLESS "mindless_memezombie"
203203
#define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"

‎code/__DEFINES/~darkpack/branding.dm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@
66

77
#define SEPT_NAME "Sept of the Western Eye"
88

9-
#define EVIL_COMPANY "Pentex"
9+
#define EVIL_COMPANY "Pentex Group"
1010

1111
#define MAIN_EVIL_COMPANY EVIL_OIL_COMPANY // Only effects Pentex job slots
1212

1313
// Treated as subsidary of EVIL_COMPANY
1414
/* MAJOR COMPANIES - Currently or at one time held the Top 21 Company title */
1515
#define EVIL_TRASH_COMPANY "Ardus Enterprises"
16-
#define EVIL_TOY_COMPANY "Avalon Incorporated."
16+
#define EVIL_TOY_COMPANY "Avalon Incorporated"
1717
#define EVIL_CIGARETTE_COMPANY "Circinus Brands"
1818
#define EVIL_INVESTMENT_COMPANY "Consolidex Worldwide"
1919
#define EVIL_OIL_COMPANY "Endron International"
2020
#define EVIL_NUCLEAR_COMPANY "Atlas International" // Subsidiary of Endron
2121
#define EVIL_MINING_COMPANY "Harold and Harold Mining, Incorporated"
2222
#define EVIL_PAPER_COMPANY "Good House International"
2323
#define EVIL_FISHING_COMPANY "Hallahan Fishing Company"
24+
#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated"
2425
#define EVIL_GROCERY_COMPANY "Herrick's"
2526
#define EVIL_LIQUOR_COMPANY "King Breweries and Distilleries"
2627
#define EVIL_PHARMA_COMPANY "Magadon, Incorporated"
@@ -42,7 +43,7 @@
4243
#define EVIL_EGYPTIAN_OIL_COMPANY "EGPC"
4344

4445
/* HAROLD AND HAROLD SUBSIDIARIES */
45-
#define EVIL_EGYPTIAN_MINING_COMPANY "Kaulet Mining"
46+
#define EVIL_EGYPTIAN_MINING_COMPANY "Kauket Mining"
4647

4748
/* KING BREWERIES SUBSIDIARIES */
4849
#define EVIL_WATERWAY_COMPANY "AquaClear Foundation"
@@ -83,13 +84,12 @@
8384
#define EVIL_COSMETICS_COMPANY_3 "Pangloss Cosmetics" // Subsidiary of Siren Cosmetics
8485
#define EVIL_WEAPON_COMPANY "Full Force Solutions"
8586
#define EVIL_PR_COMPANY "Gaia Research Company"
86-
#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated"
8787
#define EVIL_CONSTRUCTION_COMPANY "Hi-Quality Builders"
8888
#define EVIL_LAW_COMPANY "Meyers, Feinstein and Hargrett"
8989
#define EVIL_TECH_COMPANY "NikNak Computing"
9090
#define EVIL_GAMING_COMPANY "Deep Dive Games" // Subsidiary of NikNak
9191
#define EVIL_NEWS_COMPANY "RED Network"
92-
#define EVIL_CONTSTRUCTION_COMPANY_2 "Safe Haven Construction"
92+
#define EVIL_CONSTRUCTION_COMPANY_2 "Safe Haven Construction"
9393
#define EVIL_INTEL_COMPANY "Shade, Inc."
9494
#define EVIL_HORROR_COMPANY "Slaughterhouse Video"
9595
#define EVIL_CONSULTING_COMPANY "Southeastern Tech Management"

‎code/__DEFINES/~darkpack/colors.dm‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,22 @@
1-
#define COLOR_ENDRON_GREEN "#015334"
1+
#define COLOR_CORP_PENTEX "#3B2033"
2+
3+
#define COLOR_CORP_ARDUS "#9BADB7"
4+
#define COLOR_CORP_AVALON "#6556ED"
5+
#define COLOR_CORP_CIRCINUS "#FFBF82"
6+
#define COLOR_CORP_CONSOLIDEX "#DD28FF"
7+
#define COLOR_CORP_ENDRON "#015334"
8+
#define COLOR_CORP_HAROLD_HAROLD "#92483B"
9+
#define COLOR_CORP_GOOD_HOUSE "#B297BB"
10+
#define COLOR_CORP_HALLAHAN "#460DD1"
11+
#define COLOR_CORP_HERCULEAN "#FF1010"
12+
#define COLOR_CORP_HERRICKS "#9009BB"
13+
#define COLOR_CORP_KING "#CDAF58"
14+
#define COLOR_CORP_MAGADON "#45F7FF"
15+
#define COLOR_CORP_NASTRUM "#FF7DA2"
16+
#define COLOR_CORP_OMNI_TV "#ED795E"
17+
#define COLOR_CORP_OTOLLEYS "#8FEDC5"
18+
#define COLOR_CORP_BLACK_DOG "#E3EBFF"
19+
#define COLOR_CORP_RAINBOW_INC "#FFB6EE"
20+
#define COLOR_CORP_TELLUS "#66FF28"
21+
#define COLOR_CORP_VESUVIUS "#E7E8C7"
22+
#define COLOR_CORP_YOUNG_SMITH "#A5BB97"

0 commit comments

Comments
 (0)