Skip to content

Commit bc17212

Browse files
FalloutFalconIcarus-The-Sundarkpack13-api[bot]Stutternovchazzyjazzy
authored
Darkpack Pull 6/15/2026 (#64)
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: Stutternov <47883419+Stutternov@users.noreply.github.com> Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> Co-authored-by: dwinters99 <65516417+dwinters99@users.noreply.github.com> Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
2 parents 0af04b6 + 207f3b8 commit bc17212

123 files changed

Lines changed: 1643 additions & 268 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.

‎_maps/map_files/Vampire/special_fran/endron_ruin.dmm‎

Lines changed: 12 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@
6868
"bb" = (
6969
/turf/open/misc/dirt,
7070
/area/vtm/outside/forest)
71-
"bf" = (
72-
/obj/effect/spawner/random/trash/garbage,
73-
/turf/open/water/bloodwave,
74-
/area/vtm/interior/forest/cave/bane)
7571
"bi" = (
7672
/obj/machinery/light/directional/north,
7773
/obj/effect/turf_decal/trimline/red/line{
@@ -250,13 +246,6 @@
250246
},
251247
/turf/open/water/bloodwave,
252248
/area/vtm/interior/forest/cave/bane)
253-
"ee" = (
254-
/obj/effect/turf_decal/darkpack/cave{
255-
dir = 10
256-
},
257-
/obj/effect/spawner/random/trash/garbage,
258-
/turf/open/water/bloodwave,
259-
/area/vtm/interior/forest/cave/bane)
260249
"ef" = (
261250
/obj/structure/flora/rock/pile/darkpack,
262251
/turf/open/floor/plating/rough,
@@ -289,14 +278,6 @@
289278
},
290279
/turf/open/floor/city/plating,
291280
/area/vtm/interior/endron_facility/forest)
292-
"eJ" = (
293-
/obj/structure/lattice/catwalk,
294-
/obj/effect/spawner/random/trash/grime{
295-
spawn_loot_count = 20;
296-
spawn_scatter_radius = 3
297-
},
298-
/turf/open/water/acid,
299-
/area/vtm/interior/endron_facility/forest)
300281
"eK" = (
301282
/obj/effect/turf_decal/darkpack/cave{
302283
dir = 8
@@ -595,13 +576,6 @@
595576
/obj/item/clothing/head/vampire/pentex_beret,
596577
/turf/open/floor/city/factory,
597578
/area/vtm/interior/endron_facility/forest)
598-
"iZ" = (
599-
/obj/effect/turf_decal/darkpack/cave{
600-
dir = 10
601-
},
602-
/obj/effect/spawner/random/trash/mess,
603-
/turf/open/water/bloodwave,
604-
/area/vtm/interior/forest/cave/bane)
605579
"jf" = (
606580
/obj/structure/table,
607581
/obj/item/trash/raisins,
@@ -757,7 +731,6 @@
757731
/obj/effect/turf_decal/darkpack/cave{
758732
dir = 4
759733
},
760-
/obj/effect/spawner/random/trash/garbage,
761734
/turf/open/water/bloodwave,
762735
/area/vtm/interior/forest/cave/bane)
763736
"ly" = (
@@ -882,11 +855,6 @@
882855
/obj/effect/mapping_helpers/door/lock,
883856
/turf/open/floor/city/plating_mono,
884857
/area/vtm/interior/endron_facility/forest)
885-
"nl" = (
886-
/obj/effect/turf_decal/darkpack/cave,
887-
/obj/effect/spawner/random/trash/garbage,
888-
/turf/open/water/bloodwave,
889-
/area/vtm/interior/forest/cave/bane)
890858
"nv" = (
891859
/obj/machinery/shower/directional/north,
892860
/obj/structure/curtain,
@@ -1054,13 +1022,6 @@
10541022
},
10551023
/turf/cordon/secret,
10561024
/area/misc/cordon)
1057-
"pD" = (
1058-
/obj/effect/turf_decal/darkpack/cave{
1059-
dir = 8
1060-
},
1061-
/obj/effect/spawner/random/trash/garbage,
1062-
/turf/open/water/bloodwave,
1063-
/area/vtm/interior/forest/cave/bane)
10641025
"pG" = (
10651026
/obj/effect/turf_decal/darkpack/dirt,
10661027
/obj/effect/turf_decal/darkpack/dirt/corner{
@@ -1336,13 +1297,6 @@
13361297
/obj/effect/spawner/random/trash/janitor_supplies,
13371298
/turf/open/floor/city/circled,
13381299
/area/vtm/interior/endron_facility/forest)
1339-
"tE" = (
1340-
/obj/effect/turf_decal/darkpack/cave/corner{
1341-
dir = 8
1342-
},
1343-
/obj/effect/spawner/random/trash/garbage,
1344-
/turf/open/water/bloodwave,
1345-
/area/vtm/interior/forest/cave/bane)
13461300
"tG" = (
13471301
/obj/structure/fence{
13481302
dir = 4
@@ -1713,14 +1667,9 @@
17131667
/turf/closed/wall/vampwall/rock,
17141668
/area/vtm/interior/forest/cave/bane)
17151669
"zn" = (
1716-
/obj/structure/rack{
1717-
density = 0;
1718-
icon = 'icons/obj/tank.dmi';
1719-
icon_state = "holder";
1720-
name = "tank rack"
1721-
},
17221670
/obj/item/tank/internals/anesthetic,
17231671
/obj/item/clothing/mask/breath/medical,
1672+
/obj/structure/rack,
17241673
/turf/open/floor/city/circled,
17251674
/area/vtm/interior/endron_facility/forest)
17261675
"zx" = (
@@ -1809,7 +1758,6 @@
18091758
/obj/effect/turf_decal/darkpack/cave{
18101759
dir = 5
18111760
},
1812-
/obj/effect/spawner/random/trash/garbage,
18131761
/turf/open/water/bloodwave,
18141762
/area/vtm/interior/forest/cave/bane)
18151763
"Bl" = (
@@ -1979,13 +1927,6 @@
19791927
/obj/effect/spawner/random/trash/mess,
19801928
/turf/open/floor/city/factory,
19811929
/area/vtm/interior/endron_facility/forest)
1982-
"Dh" = (
1983-
/obj/effect/turf_decal/darkpack/cave{
1984-
dir = 1
1985-
},
1986-
/obj/effect/spawner/random/trash/garbage,
1987-
/turf/open/water/bloodwave,
1988-
/area/vtm/interior/forest/cave/bane)
19891930
"Dl" = (
19901931
/obj/effect/turf_decal/darkpack/dirt{
19911932
dir = 6
@@ -2056,13 +1997,6 @@
20561997
/obj/effect/mob_spawn/corpse/human/endron,
20571998
/turf/open/floor/city/plating_mono,
20581999
/area/vtm/interior/endron_facility/forest)
2059-
"Ee" = (
2060-
/obj/effect/turf_decal/darkpack/cave{
2061-
dir = 5
2062-
},
2063-
/obj/effect/spawner/random/trash/garbage,
2064-
/turf/open/water/bloodwave,
2065-
/area/vtm/interior/forest/cave/bane)
20662000
"Ef" = (
20672001
/obj/effect/turf_decal/darkpack/cave{
20682002
dir = 5
@@ -2349,7 +2283,6 @@
23492283
/area/vtm/interior/endron_facility/forest)
23502284
"HB" = (
23512285
/obj/effect/decal/garou_glyph/wyrm{
2352-
pixel_x = 0;
23532286
pixel_y = 31
23542287
},
23552288
/turf/open/misc/dirt,
@@ -6015,7 +5948,7 @@ wD
60155948
wD
60165949
bi
60175950
Mh
6018-
YT
5951+
tw
60195952
sL
60205953
Pw
60215954
Nj
@@ -6232,7 +6165,7 @@ mK
62326165
Mf
62336166
wD
62346167
HO
6235-
eJ
6168+
tw
62366169
Ul
62376170
Ox
62386171
qz
@@ -7405,7 +7338,7 @@ za
74057338
za
74067339
Ef
74077340
FR
7408-
iZ
7341+
IA
74097342
za
74107343
Jk
74117344
za
@@ -7513,7 +7446,7 @@ za
75137446
za
75147447
za
75157448
za
7516-
Dh
7449+
ed
75177450
wb
75187451
IA
75197452
RS
@@ -7624,11 +7557,11 @@ za
76247557
za
76257558
CX
76267559
Ux
7627-
tE
7560+
Wi
7561+
eK
76287562
eK
7629-
pD
76307563
eK
7631-
ee
7564+
IA
76327565
Lp
76337566
Lp
76347567
hP
@@ -7734,7 +7667,7 @@ EE
77347667
Ak
77357668
CX
77367669
Ux
7737-
bf
7670+
Pg
77387671
Pg
77397672
Pg
77407673
Wi
@@ -7847,7 +7780,7 @@ Pg
78477780
wb
78487781
Pg
78497782
Pg
7850-
nl
7783+
ev
78517784
Lp
78527785
JR
78537786
Iv
@@ -8171,7 +8104,7 @@ md
81718104
Lp
81728105
CX
81738106
Ux
8174-
bf
8107+
Pg
81758108
Pg
81768109
Pg
81778110
ev
@@ -8279,7 +8212,7 @@ za
82798212
Lp
82808213
iN
82818214
RS
8282-
Ee
8215+
CX
82838216
Ux
82848217
Pg
82858218
KX

‎code/__DEFINES/icon_smoothing.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
244244
#define SMOOTH_GROUP_COLOR_COUNTERTOP S_OBJ(90) ///obj/structure/table/countertop/(color)
245245
// DARKPACK EDIT END
246246
#define SMOOTH_GROUP_CITY_LOW_WALL S_TURF(91) ///obj/structure/platform/lowwall // DARKPACK EDIT ADD - WALLS
247+
#define SMOOTH_GROUP_FF_TABLES S_OBJ(92) ///obj/structure/table/countertop/fastfood // DARKPACK EDIT ADD - DECOR
247248

248249
/// Performs the work to set smoothing_groups and canSmoothWith.
249250
/// An inlined function used in both turf/Initialize and atom/Initialize.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#define AURA_SAD COLOR_SILVER // Silver
2222
#define AURA_SPIRITUAL COLOR_GOLD // Gold
2323
#define AURA_SUSPICIOUS COLOR_STRONG_BLUE // Dark Blue
24+
#define AURA_CONFIDENCE COLOR_VIVID_YELLOW // Primarly for the Shadow Lords gift "Aura of Confidence"
2425

2526
// Modifier auras.
2627
#define AURA_ANXIOUS "Anxious" // Auras appear scrambled like static or white noise
@@ -65,7 +66,8 @@ GLOBAL_LIST_INIT(aura_list, sort_list(list(
6566
"Anxious" = AURA_ANXIOUS,
6667
"Confused" = AURA_CONFUSED,
6768
"Daydreaming" = AURA_DAYDREAMING,
68-
"Psychotic" = AURA_PSYCHOTIC
69+
"Psychotic" = AURA_PSYCHOTIC,
70+
"Confidence" = AURA_CONFIDENCE,
6971
)))
7072

7173
GLOBAL_LIST_INIT(emotion_to_quality, sort_list(list(
@@ -94,5 +96,6 @@ GLOBAL_LIST_INIT(emotion_to_quality, sort_list(list(
9496
"Anxious" = "anxiety",
9597
"Confused" = "confusion",
9698
"Daydreaming" = "absentmindedness",
97-
"Psychotic" = "psychosis"
99+
"Psychotic" = "psychosis",
100+
"Confidence" = "confidence",
98101
)))

‎code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
//from base of living/CanAllowThrough(): (atom/movable/mover, border_dir)
88
#define COMSIG_LIVING_CAN_ALLOW_THROUGH "living_can_allow_through"
99
#define COMPONENT_LIVING_PASSABLE (1<<0)
10-
//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, output)
10+
//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, atom/target)
11+
#define COMSIG_LIVING_PRE_DICE_ROLLED "living_pre_dice_rolled"
12+
//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, atom/target, output)
1113
#define COMSIG_LIVING_DICE_ROLLED "living_dice_rolled"

‎code/__DEFINES/~darkpack/traits/declarations.dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
152152
#define TRAIT_SMALL_HANDS "small_hands"
153153
// Traits granted via gifts
154154
#define TRAIT_RAZOR_CLAWS "razor_claws"
155+
#define TRAIT_JAMMING_WEAPONS "jamming_weapons"
156+
#define TRAIT_NATURAL "natural"
157+
#define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
155158

156159
/// Sixth sense restricted to view range
157160
#define TRAIT_LOCAL_SIXTHSENSE "local_sixth_sense"

‎code/_globalvars/traits/_traits.dm‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
3939
"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
4040
"TRAIT_UNLINKABLE_FISHING_SPOT" = TRAIT_UNLINKABLE_FISHING_SPOT,
4141
"TRAIT_TETHER_ATTACHED" = TRAIT_TETHER_ATTACHED,
42+
"TRAIT_NATURAL" = TRAIT_NATURAL, // DARKPACK EDIT ADD - WEREWOLF
4243
),
4344
/atom/movable = list(
4445
"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,
@@ -675,6 +676,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
675676
"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
676677
"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
677678
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
679+
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
678680
"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
679681
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
680682
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
@@ -692,8 +694,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
692694
"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
693695
"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
694696
"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
695-
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS/FLAWS
696-
"TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS/FLAWS
697+
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
698+
"TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS_FLAWS
697699
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, //DARKPACK EDIT ADD
698700
"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
699701
"TRAIT_FAIR_GLABRO" = TRAIT_FAIR_GLABRO, // DARKPACK EDIT ADD - MERITS_FLAWS
@@ -718,6 +720,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
718720
"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
719721
"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
720722
"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
723+
"TRAIT_JAMMING_WEAPONS" = TRAIT_JAMMING_WEAPONS, // DARKPACK EDIT ADD - WEREWOLF
721724
"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
722725
"TRAIT_LIGHT_WEAKNESS" = TRAIT_LIGHT_WEAKNESS, // DARKPACK EDIT ADD - Setite Flaw
723726
"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
@@ -754,7 +757,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
754757
"TRAIT_STAKE_IMMUNE" = TRAIT_STAKE_IMMUNE, // DARKPACK EDIT ADD
755758
"TRAIT_STAKE_RESISTANT" = TRAIT_STAKE_RESISTANT, // DARKPACK EDIT ADD
756759
"TRAIT_STILLNESS_OF_DEATH" = TRAIT_STILLNESS_OF_DEATH, // DARKPACK EDIT ADD - Gargoyle Quirk
757-
"TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD - MERITS/FLAWS
760+
"TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD - MERITS_FLAWS
758761
"TRAIT_THIRD_EYE" = TRAIT_THIRD_EYE, // DARKPACK EDIT ADD - Tremere & Salubri Quirk
759762
"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
760763
"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS

‎code/_globalvars/traits/admin_tooling.dm‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
99
"TRAIT_RUSTIMMUNE" = TRAIT_RUSTIMMUNE,
1010
"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
1111
"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
12+
"TRAIT_NATURAL" = TRAIT_NATURAL, // DARKPACK EDIT ADD - WEREWOLF
1213
),
1314
/atom/movable = list(
1415
"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,
@@ -363,6 +364,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
363364
"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
364365
"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
365366
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
367+
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
366368
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
367369
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
368370
"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
@@ -399,6 +401,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
399401
"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
400402
"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
401403
"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
404+
"TRAIT_JAMMING_WEAPONS" = TRAIT_JAMMING_WEAPONS, // DARKPACK EDIT ADD - WEREWOLF
402405
"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
403406
"TRAIT_LIGHT_WEAKNESS" = TRAIT_LIGHT_WEAKNESS, // DARKPACK EDIT ADD - Setite Flaw
404407
"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD

0 commit comments

Comments
 (0)