Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
479c00e
Adds Canes to the pharmacy (#959)
Icarus-The-Sun Apr 25, 2026
355990c
Automatic changelog for PR #959 [ci skip]
darkpack13-api[bot] Apr 25, 2026
78e614e
Aura updates when we want it to (#952)
FalloutFalcon Apr 25, 2026
20d161c
Automatic changelog for PR #952 [ci skip]
darkpack13-api[bot] Apr 25, 2026
70156bf
discipline type path fix (#956)
FalloutFalcon Apr 25, 2026
e96e472
Automatic changelog for PR #956 [ci skip]
darkpack13-api[bot] Apr 25, 2026
a330e8d
Pierce the Veil gives TRUE Night Vision (#963)
Icarus-The-Sun Apr 26, 2026
fb594ea
Automatic changelog for PR #963 [ci skip]
darkpack13-api[bot] Apr 26, 2026
ea38bf6
Jobs can have tribe and auspice restrictions (#929)
FalloutFalcon Apr 26, 2026
a387043
Automatic changelog for PR #929 [ci skip]
darkpack13-api[bot] Apr 26, 2026
9b7b7e1
Automatic changelog compile [ci skip]
tgstation-ci[bot] Apr 27, 2026
b296858
Height hotfix (#974)
chazzyjazzy Apr 27, 2026
6f6fe2f
Automatic changelog for PR #974 [ci skip]
darkpack13-api[bot] Apr 27, 2026
866a185
Fixing Monstrous Quirk (#957)
chazzyjazzy Apr 27, 2026
53dc6fe
Automatic changelog for PR #957 [ci skip]
darkpack13-api[bot] Apr 27, 2026
e89ffe0
crime reporting tweak (#975)
buffyuwu Apr 28, 2026
a44c687
Automatic changelog for PR #975 [ci skip]
darkpack13-api[bot] Apr 28, 2026
5422945
Removes dice output preference (#977)
FalloutFalcon Apr 28, 2026
6bf923e
Automatic changelog for PR #977 [ci skip]
darkpack13-api[bot] Apr 28, 2026
7e76543
Readds bank vault codes to Giovanni Kindred (#969)
chazzyjazzy Apr 28, 2026
32d1fe0
Automatic changelog for PR #969 [ci skip]
darkpack13-api[bot] Apr 28, 2026
a3b9be0
Makes store owners say stuff (#968)
chazzyjazzy Apr 28, 2026
0278b74
Automatic changelog for PR #968 [ci skip]
darkpack13-api[bot] Apr 28, 2026
2c8a07e
Fixing Serpentis 1 (#862)
chazzyjazzy Apr 28, 2026
0cac7b6
Automatic changelog for PR #862 [ci skip]
darkpack13-api[bot] Apr 28, 2026
dc286b8
Makes lightposts go out when the area power transformer is broken (#973)
chazzyjazzy Apr 29, 2026
cd4b8af
Automatic changelog for PR #973 [ci skip]
darkpack13-api[bot] Apr 29, 2026
8fe2575
hair dye spray onfloor (#980)
FalloutFalcon Apr 29, 2026
d63bf0d
Street Sign that shows area name (#962)
FalloutFalcon Apr 29, 2026
41d160b
Automatic changelog for PR #980 [ci skip]
darkpack13-api[bot] Apr 29, 2026
0f45179
Automatic changelog for PR #962 [ci skip]
darkpack13-api[bot] Apr 29, 2026
9ff1cdf
tfn upstream - #124 'rebase hotfixes' and #128 two merits and aura he…
chazzyjazzy Apr 29, 2026
da7a342
Automatic changelog for PR #946 [ci skip]
darkpack13-api[bot] Apr 29, 2026
79c4757
increases timer for cats breeding (#979)
FalloutFalcon Apr 29, 2026
c84d085
Automatic changelog for PR #979 [ci skip]
darkpack13-api[bot] Apr 29, 2026
78184fb
Adding factions to jobs (#986)
chazzyjazzy Apr 30, 2026
9fd7ad2
Automatic changelog for PR #986 [ci skip]
darkpack13-api[bot] Apr 30, 2026
0e55cc4
Empty Bloodbags for sale at the Pharmacy (#985)
chazzyjazzy Apr 30, 2026
25cc905
Automatic changelog for PR #985 [ci skip]
darkpack13-api[bot] Apr 30, 2026
a841b5b
Removes unticked and unplanned delivery module (#984)
dwinters99 Apr 30, 2026
587355c
Gargoyles can tuck their wings and their flying makes flapping noises…
chazzyjazzy Apr 30, 2026
232fd50
Automatic changelog for PR #947 [ci skip]
darkpack13-api[bot] Apr 30, 2026
fc6584c
Company Logos (#491)
dwinters99 Apr 30, 2026
91ff50c
Automatic changelog for PR #491 [ci skip]
darkpack13-api[bot] Apr 30, 2026
5e2d43f
Third Eye Landslide (#835)
theselfish Apr 30, 2026
f3105cc
Automatic changelog for PR #835 [ci skip]
darkpack13-api[bot] Apr 30, 2026
1ab1d74
Frenzy Rework (#683)
FalloutFalcon Apr 30, 2026
bbc6ef9
Automatic changelog for PR #683 [ci skip]
darkpack13-api[bot] Apr 30, 2026
0cbb950
`DARKPACK EDIT` sanity (#875)
FalloutFalcon Apr 30, 2026
49c4c12
Fera claws are sharp and deal aggravated damage (#990)
FalloutFalcon May 1, 2026
c8b5925
Automatic changelog for PR #990 [ci skip]
darkpack13-api[bot] May 1, 2026
7a6558e
Config for roleplay only merits (#983)
FalloutFalcon May 1, 2026
66a64ad
Automatic changelog for PR #983 [ci skip]
darkpack13-api[bot] May 1, 2026
1307050
Prevents phone frequency collision (#992)
FalloutFalcon May 1, 2026
81a5ad2
Automatic changelog for PR #992 [ci skip]
darkpack13-api[bot] May 1, 2026
a5fa5b9
Brawl prefers the highest damage attack (#993)
FalloutFalcon May 1, 2026
4cde661
You cant jump while prone (#994)
FalloutFalcon May 1, 2026
347dc1c
Automatic changelog for PR #993 [ci skip]
darkpack13-api[bot] May 1, 2026
2ab2d77
Automatic changelog for PR #994 [ci skip]
darkpack13-api[bot] May 1, 2026
d29b73c
Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…
FalloutFalcon May 1, 2026
59708ac
fix define name change for darkpack pull
FalloutFalcon May 1, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/rerun_flaky_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ on:
workflows: [CI Suite]
types:
- completed
# DARKPACK ADDITION START
# DARKPACK EDIT ADD START
permissions:
actions: write
contents: write
issues: write
# DARKPACK ADDITION END
# DARKPACK EDIT ADD END
jobs:
rerun_flaky_tests:
runs-on: ubuntu-24.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
if: steps.linter-setup.conclusion == 'success' && !cancelled()
run: |
bash tools/ci/check_grep.sh
bash modular_darkpack/tools/darkpack_check_grep.sh # DARKPACK EDIT ADDITION - checking modular_darkpack code
bash modular_darkpack/tools/darkpack_check_grep.sh # DARKPACK EDIT ADD - checking modular_darkpack code
bash modular_zapoc/tools/apoc_check_grep.sh # APOC EDIT ADD
- name: Ticked File Enforcement
if: steps.linter-setup.conclusion == 'success' && !cancelled()
Expand Down
4 changes: 2 additions & 2 deletions SQL/database_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be
The latest database version is 5.35; The query to update the schema revision table is:

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

or

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

In any query remember to add a prefix to the table names if you use one.
Expand Down
2 changes: 1 addition & 1 deletion SQL/tgstation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ CREATE TABLE `library` (
`author` varchar(45) NOT NULL,
`title` varchar(45) NOT NULL,
`content` text NOT NULL,
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT, ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT CHANGE - ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
`ckey` varchar(32) NOT NULL DEFAULT 'LEGACY',
`datetime` datetime NOT NULL,
`deleted` tinyint(1) unsigned DEFAULT NULL,
Expand Down
2 changes: 1 addition & 1 deletion SQL/tgstation_schema_prefixed.sql
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ CREATE TABLE `SS13_library` (
`author` varchar(45) NOT NULL,
`title` varchar(45) NOT NULL,
`content` text NOT NULL,
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT, ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
`category` VARCHAR(255) NOT NULL, /* DARKPACK EDIT CHANGE - ORIGINAL: `category` enum('Any','Fiction','Non-Fiction','Adult','Reference','Religion') NOT NULL, */
`ckey` varchar(32) NOT NULL DEFAULT 'LEGACY',
`datetime` datetime NOT NULL,
`deleted` tinyint(1) unsigned DEFAULT NULL,
Expand Down
52 changes: 44 additions & 8 deletions _maps/map_files/Vampire/runtimetown.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,10 @@
"tY" = (
/turf/open/floor/plating/canal,
/area/vtm/outside/pacificheights)
"uf" = (
/obj/effect/turf_decal/bordur,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/outside/baywalk)
"ug" = (
/obj/machinery/door/airlock/elevator/right{
elevator_mode = 1;
Expand Down Expand Up @@ -1507,6 +1511,13 @@
/obj/item/gun/ballistic/automatic/darkpack/sniper,
/turf/open/floor/plating/rough,
/area/vtm/interior/anarch)
"Ce" = (
/obj/effect/turf_decal/bordur{
dir = 1
},
/obj/fusebox/transformer,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/outside/baywalk)
"Ct" = (
/obj/structure/lamppost/one{
dir = 1
Expand Down Expand Up @@ -1792,6 +1803,9 @@
/obj/structure/vampdoor/prison,
/turf/open/floor/plating/rough,
/area/vtm/interior/shop)
"Gr" = (
/turf/open/floor/plating/asphalt,
/area/vtm/outside/baywalk)
"Gt" = (
/obj/structure/table,
/obj/item/storage/medkit/darkpack/tox,
Expand Down Expand Up @@ -2389,6 +2403,11 @@
/obj/effect/mapping_helpers/door/access/graveyard,
/turf/open/floor/plating/rough,
/area/vtm/graveyard/interior)
"OA" = (
/obj/effect/turf_decal/bordur,
/obj/structure/lamppost/one,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/outside/baywalk)
"OB" = (
/obj/darkpack_car/police{
locked = 0
Expand Down Expand Up @@ -2568,6 +2587,11 @@
},
/turf/open/floor/plating/sidewalk,
/area/vtm/outside/pacificheights)
"QU" = (
/obj/effect/turf_decal/bordur,
/obj/structure/lamppost/one,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/outside/financialdistrict)
"QW" = (
/obj/machinery/light/directional/north,
/obj/effect/spawner/random/vending/snackvend,
Expand Down Expand Up @@ -2856,6 +2880,13 @@
/obj/machinery/light/directional/west,
/turf/open/floor/plating/rough,
/area/vtm/interior/anarch)
"Wn" = (
/obj/effect/turf_decal/bordur{
dir = 1
},
/obj/fusebox/transformer,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/outside/financialdistrict)
"Ws" = (
/obj/structure/table,
/obj/vampire_computer,
Expand Down Expand Up @@ -3051,6 +3082,11 @@
"Zz" = (
/turf/open/misc/grass/random/grass,
/area/vtm/outside/pacificheights)
"ZC" = (
/obj/effect/turf_decal/bordur,
/obj/structure/roadsign/street,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/outside/pacificheights)
"ZF" = (
/obj/structure/railing,
/turf/open/floor/plating/canal,
Expand Down Expand Up @@ -4730,7 +4766,7 @@ UJ
NR
Hy
NR
cj
ZC
ik
VQ
ik
Expand Down Expand Up @@ -5750,11 +5786,11 @@ NR
NR
NR
NR
cj
ik
uf
Gr
VQ
ik
Fs
Ce
qt
FO
Wa
Expand Down Expand Up @@ -5818,8 +5854,8 @@ NR
NR
NR
NR
Bq
ik
OA
Gr
VQ
ik
Fs
Expand Down Expand Up @@ -6430,11 +6466,11 @@ NR
NR
NR
NR
Bq
QU
ik
VQ
ik
Fs
Wn
Wa
Wa
Mn
Expand Down
4 changes: 3 additions & 1 deletion code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#define JOB_UNAVAILABLE_KINDRED_GENERATION 12
/// Checks for character clan.
#define JOB_UNAVAILABLE_KINDRED_CLAN 13
#define JOB_UNAVAILABLE_FERA_TRIBE 14
#define JOB_UNAVAILABLE_FERA_AUSPICE 15

// DARKPACK EDIT ADD END

Expand Down Expand Up @@ -284,7 +286,7 @@ DEFINE_BITFIELD(job_flags, list(
))

/// Combination flag for jobs which are considered regular crew members of the station.
#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)
#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)
/// Combination flag for jobs which are considered heads of staff.
#define HEAD_OF_STAFF_JOB_FLAGS (JOB_BOLD_SELECT_TEXT|JOB_CANNOT_OPEN_SLOTS|JOB_HEAD_OF_STAFF)
/// Combination flag for jobs which are enabled by station traits.
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
#define SPECIES_SKELETON "skeleton"
#define SPECIES_SNAIL "snail"
#define SPECIES_VAMPIRE "vampire"
#define SPECIES_ZOMBIE "rotten2" // DARKPACK EDIT -- Original : #define SPECIES_ZOMBIE "zombie"
#define SPECIES_ZOMBIE "rotten2" // DARKPACK EDIT CHANGE - ORIGINAL: #define SPECIES_ZOMBIE "zombie"
#define SPECIES_ZOMBIE_INFECTIOUS "memezombie"
#define SPECIES_ZOMBIE_INFECTIOUS_MINDLESS "mindless_memezombie"
#define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"
Expand Down
10 changes: 5 additions & 5 deletions code/__DEFINES/~darkpack/branding.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@

#define SEPT_NAME "Sept of the Western Eye"

#define EVIL_COMPANY "Pentex"
#define EVIL_COMPANY "Pentex Group"

#define MAIN_EVIL_COMPANY EVIL_OIL_COMPANY // Only effects Pentex job slots

// Treated as subsidary of EVIL_COMPANY
/* MAJOR COMPANIES - Currently or at one time held the Top 21 Company title */
#define EVIL_TRASH_COMPANY "Ardus Enterprises"
#define EVIL_TOY_COMPANY "Avalon Incorporated."
#define EVIL_TOY_COMPANY "Avalon Incorporated"
#define EVIL_CIGARETTE_COMPANY "Circinus Brands"
#define EVIL_INVESTMENT_COMPANY "Consolidex Worldwide"
#define EVIL_OIL_COMPANY "Endron International"
#define EVIL_NUCLEAR_COMPANY "Atlas International" // Subsidiary of Endron
#define EVIL_MINING_COMPANY "Harold and Harold Mining, Incorporated"
#define EVIL_PAPER_COMPANY "Good House International"
#define EVIL_FISHING_COMPANY "Hallahan Fishing Company"
#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated"
#define EVIL_GROCERY_COMPANY "Herrick's"
#define EVIL_LIQUOR_COMPANY "King Breweries and Distilleries"
#define EVIL_PHARMA_COMPANY "Magadon, Incorporated"
Expand All @@ -42,7 +43,7 @@
#define EVIL_EGYPTIAN_OIL_COMPANY "EGPC"

/* HAROLD AND HAROLD SUBSIDIARIES */
#define EVIL_EGYPTIAN_MINING_COMPANY "Kaulet Mining"
#define EVIL_EGYPTIAN_MINING_COMPANY "Kauket Mining"

/* KING BREWERIES SUBSIDIARIES */
#define EVIL_WATERWAY_COMPANY "AquaClear Foundation"
Expand Down Expand Up @@ -83,13 +84,12 @@
#define EVIL_COSMETICS_COMPANY_3 "Pangloss Cosmetics" // Subsidiary of Siren Cosmetics
#define EVIL_WEAPON_COMPANY "Full Force Solutions"
#define EVIL_PR_COMPANY "Gaia Research Company"
#define EVIL_HANDGUN_COMPANY "Herculean Firearms Incorporated"
#define EVIL_CONSTRUCTION_COMPANY "Hi-Quality Builders"
#define EVIL_LAW_COMPANY "Meyers, Feinstein and Hargrett"
#define EVIL_TECH_COMPANY "NikNak Computing"
#define EVIL_GAMING_COMPANY "Deep Dive Games" // Subsidiary of NikNak
#define EVIL_NEWS_COMPANY "RED Network"
#define EVIL_CONTSTRUCTION_COMPANY_2 "Safe Haven Construction"
#define EVIL_CONSTRUCTION_COMPANY_2 "Safe Haven Construction"
#define EVIL_INTEL_COMPANY "Shade, Inc."
#define EVIL_HORROR_COMPANY "Slaughterhouse Video"
#define EVIL_CONSULTING_COMPANY "Southeastern Tech Management"
Expand Down
23 changes: 22 additions & 1 deletion code/__DEFINES/~darkpack/colors.dm
Original file line number Diff line number Diff line change
@@ -1 +1,22 @@
#define COLOR_ENDRON_GREEN "#015334"
#define COLOR_CORP_PENTEX "#3B2033"

#define COLOR_CORP_ARDUS "#9BADB7"
#define COLOR_CORP_AVALON "#6556ED"
#define COLOR_CORP_CIRCINUS "#FFBF82"
#define COLOR_CORP_CONSOLIDEX "#DD28FF"
#define COLOR_CORP_ENDRON "#015334"
#define COLOR_CORP_HAROLD_HAROLD "#92483B"
#define COLOR_CORP_GOOD_HOUSE "#B297BB"
#define COLOR_CORP_HALLAHAN "#460DD1"
#define COLOR_CORP_HERCULEAN "#FF1010"
#define COLOR_CORP_HERRICKS "#9009BB"
#define COLOR_CORP_KING "#CDAF58"
#define COLOR_CORP_MAGADON "#45F7FF"
#define COLOR_CORP_NASTRUM "#FF7DA2"
#define COLOR_CORP_OMNI_TV "#ED795E"
#define COLOR_CORP_OTOLLEYS "#8FEDC5"
#define COLOR_CORP_BLACK_DOG "#E3EBFF"
#define COLOR_CORP_RAINBOW_INC "#FFB6EE"
#define COLOR_CORP_TELLUS "#66FF28"
#define COLOR_CORP_VESUVIUS "#E7E8C7"
#define COLOR_CORP_YOUNG_SMITH "#A5BB97"
2 changes: 2 additions & 0 deletions code/__DEFINES/~darkpack/factions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
#define FACTION_ANARCHS "anarchs"
#define FACTION_CAMARILLA "camarilla"
#define FACTION_SABBAT "sabbat"
#define FACTION_GIOVANNI "giovanni-faction"

// City faction
#define FACTION_CITY "city"

#define FACTION_GAIA "gaia"
#define FACTION_PENTEX "pentex"
10 changes: 5 additions & 5 deletions code/__DEFINES/~darkpack/fera/werewolf_tribe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#define TRIBE_CORAX "Corax" // DARKPACK TODO - CORAX

#define TRIBE_ALL list(TRIBE_RONIN, TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_CORAX)
#define TRIBE_GAIA list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_CORAX)
#define TRIBE_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS, TRIBE_CORAX)
#define TRIBE_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS)
#define TRIBE_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS)
#define TRIBE_LIST_ALL list(TRIBE_RONIN, TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_BLACK_SPIRAL_DANCERS, TRIBE_CORAX)
#define TRIBE_LIST_GAIA list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS, TRIBE_SHADOW_LORDS, TRIBE_CORAX)
#define TRIBE_LIST_WYLD list(TRIBE_GALESTALKERS, TRIBE_CHILDREN_OF_GAIA, TRIBE_UKTENA, TRIBE_FIANNA, TRIBE_GET_OF_FENRIS, TRIBE_BLACK_FURIES, TRIBE_SILVER_FANGS, TRIBE_SILENT_STRIDERS, TRIBE_RED_TALONS, TRIBE_STARGAZERS, TRIBE_SHADOW_LORDS, TRIBE_CORAX)
#define TRIBE_LIST_WEAVER list(TRIBE_GLASS_WALKERS, TRIBE_BONE_GNAWERS)
#define TRIBE_LIST_WYRM list(TRIBE_BLACK_SPIRAL_DANCERS)
1 change: 1 addition & 0 deletions code/__DEFINES/~darkpack/phones.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#define TIME_TO_RING 10 SECONDS

#define USABLE_RADIO_FREQUENCY_FOR_PHONE_RANGE 2000
#define MAX_RADIO_FREQUENCY_FOR_PHONE_RANGE 3000

#define PHONE_AVAILABLE 0
#define PHONE_RINGING 1
Expand Down
4 changes: 0 additions & 4 deletions code/__DEFINES/~darkpack/storyteller_dice.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
#define ROLL_FAILURE 0
#define ROLL_SUCCESS 1

//Used for /datum/preference/choiced/dice_output
#define DICE_OUTPUT_BALLOON "Balloon"
#define DICE_OUTPUT_CHAT "Chat"

/// Output is shown to everyone near you
#define ROLL_PUBLIC "public"
/// Output is only shown to the roller
Expand Down
12 changes: 9 additions & 3 deletions code/__DEFINES/~darkpack/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_REPELLED_BY_HOLINESS "repelled_by_holiness"
/// Any changes in this Kindred's Humanity will be doubled
#define TRAIT_SENSITIVE_HUMANITY "sensitive_humanity"
/// Duration of frenzy is doubled
#define TRAIT_LONGER_FRENZY "longer_frenzy"
/// Difficulty rolls to resist or guide frenzy are two higher. They can also never spend willpower to avoid frenzy
#define TRAIT_DIFFICULT_FRENZY "difficult_frenzy"
/// Difficulty rolls to rage roles are one higher.
#define TRAIT_DIFFICULT_RAGE "difficult_rage"
// Setite weakness, sunlight is particularly bad bad.
#define TRAIT_LIGHT_WEAKNESS "light_weakness"
// DARKPACK TODO - refactor these traits into mutant bodyparts and a component maybe
Expand All @@ -96,6 +98,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_SERPENTIS_SKIN "serpent_skin"
// Is the mob melted into a wall via Visceratika?
#define TRAIT_BOND_WITHIN_THE_MOUNTAIN "bond_within_the_mountain"
// Is the mob unable to be cuffed? (For Tzimisce zulo form and others)
#define TRAIT_NO_CUFF "no_cuff" //Used for uncuffable forms such as Tenebrous and Blood form.


// Allows the user to pass through doors
Expand Down Expand Up @@ -159,6 +163,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_MONSTROUS "monstrous"
#define TRAIT_HORRIFIC_APPEARANCE "horrific_appearance"
#define TRAIT_STILLNESS_OF_DEATH "stillness_of_death"
#define TRAIT_THIRD_EYE "third_eye"
#define TRAIT_PREY_EXCLUSION "prey_exclusion"
#define TRAIT_VICTIM_OF_THE_MASQUERADE "victim_of_the_masquerade"
#define TRAIT_VAMPIRE_TERRITORIAL "territorial"
Expand All @@ -172,6 +177,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_METAMORPH "metamorph"
#define TRAIT_MERIT_UNTAMABLE "merit_untamable"
#define TRAIT_FAIR_GLABRO "fair_glabro"
#define TRAIT_NO_CUFF "no_cuff" //Used for uncuffable forms such as Tenebrous and Blood form.
#define TRAIT_EAT_FOOD "eat_food"


// END TRAIT DEFINES
2 changes: 2 additions & 0 deletions code/__DEFINES/~darkpack/traits/sources.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@
// used by the obfuscate ability
#define OBFUSCATE_TRAIT "obfuscate_trait"

#define FRENZY_TRAIT "frenzy" // FRENZY

#define ZONE_TRAIT "zone_trait"
Loading
Loading