Skip to content

Commit bd230c5

Browse files
FalloutFalcondarkpack13-api[bot]dwinters99theselfishtgstation-ci[bot]
authored
Darkpack Pull 6/28/2026 (#71)
Co-authored-by: darkpack13-api[bot] <220339179+darkpack13-api[bot]@users.noreply.github.com> Co-authored-by: dwinters99 <65516417+dwinters99@users.noreply.github.com> Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com> Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: 1393F <59183821+1393F@users.noreply.github.com> Co-authored-by: mcbalaam <104003807+mcbalaam@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> Co-authored-by: Lucy <lucy@absolucy.moe> Co-authored-by: Wisemonster <87689371+Wisemonster@users.noreply.github.com> Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com> Co-authored-by: TelevisionStatic <greenwolf133705@gmail.com> Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com> Co-authored-by: NiklasNeighbor <121561587+NiklasNeighbor@users.noreply.github.com> Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Co-authored-by: Glamyrio <glamyrio@mail.ru> Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: Y0SH1M4S73R <y0sh1m4s73r@gmail.com> Co-authored-by: Iajret <8430839+Iajret@users.noreply.github.com> Co-authored-by: Fghj240 <43589874+Fghj240@users.noreply.github.com> Co-authored-by: Fghj240 <fakeemail@notrealemail.com> Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com> Co-authored-by: levels0 <lv0lv0lv0@proton.me> Co-authored-by: tonty <39193182+tontyGH@users.noreply.github.com> Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com> Co-authored-by: oguzzzok123 <jonklerjopa@gmail.com> Co-authored-by: F <92830655+Frfor17@users.noreply.github.com> Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com> Co-authored-by: QuiteLiterallyAnything <154708292+QuiteLiterallyAnything@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> Co-authored-by: MelokG <99420088+MelokG000@users.noreply.github.com> Co-authored-by: AnturK <AnturK@users.noreply.github.com> Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com> Co-authored-by: Ugo Manzo <129977162+UgoManzo@users.noreply.github.com> Co-authored-by: CabinetOnFire <gregandysoner@gmail.com> Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com> Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: CatoChristopherMrow <johnmaddentickeledmyrear@gmail.com> Co-authored-by: soulware <81992759+soulware1@users.noreply.github.com> Co-authored-by: EnterTheJake <102721711+EnterTheJake@users.noreply.github.com> Co-authored-by: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com> Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com> Co-authored-by: Ambrose997 <109041767+Ambrose997@users.noreply.github.com> Co-authored-by: Icarus-The-Sun <119832971+Icarus-The-Sun@users.noreply.github.com> Co-authored-by: buffyuwu <buffyvrc@gmail.com>
2 parents 68e0ace + bb95ff7 commit bd230c5

120 files changed

Lines changed: 1214 additions & 203 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/runtimetown.dmm‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@
711711
/obj/item/ammo_box/darkpack/c9mm,
712712
/obj/item/ammo_box/darkpack/c45acp/silver,
713713
/obj/item/ammo_box/darkpack/c45acp,
714+
/obj/item/ammo_box/darkpack/c46pdw,
714715
/turf/open/floor/plating/rough,
715716
/area/vtm/interior/anarch)
716717
"nq" = (
@@ -774,10 +775,6 @@
774775
"oD" = (
775776
/turf/open/misc/grass,
776777
/area/vtm/outside/pacificheights)
777-
"oF" = (
778-
/obj/structure/chair/wood/darkpack,
779-
/turf/open/floor/plating/rough,
780-
/area/vtm/interior/techshop)
781778
"oM" = (
782779
/turf/open/floor/plating/sidewalk,
783780
/area/vtm/interior/supply)
@@ -1628,6 +1625,7 @@
16281625
/area/vtm/outside/pacificheights)
16291626
"CB" = (
16301627
/obj/structure/extinguisher_cabinet/directional/north,
1628+
/obj/structure/chair/wood/darkpack,
16311629
/turf/open/floor/plating/rough,
16321630
/area/vtm/interior/techshop)
16331631
"CF" = (
@@ -2099,6 +2097,15 @@
20992097
/obj/structure/ladder/manhole/up,
21002098
/turf/open/floor/plating/rough,
21012099
/area/vtm/interior/techshop)
2100+
"IU" = (
2101+
/obj/structure/table,
2102+
/obj/item/gun/ballistic/automatic/darkpack/mp7,
2103+
/obj/item/ammo_box/magazine/darkpack/c46pdw,
2104+
/obj/item/ammo_box/magazine/darkpack/c46pdw,
2105+
/obj/item/ammo_box/magazine/darkpack/c46pdw/ext,
2106+
/obj/item/ammo_box/magazine/darkpack/c46pdw/ext,
2107+
/turf/open/floor/plating/rough,
2108+
/area/vtm/interior/techshop)
21022109
"IZ" = (
21032110
/obj/machinery/fax/aasimites,
21042111
/obj/structure/table/wood,
@@ -2388,6 +2395,8 @@
23882395
/obj/structure/vampdoor{
23892396
dir = 4
23902397
},
2398+
/obj/effect/mapping_helpers/door/access/claimable,
2399+
/obj/effect/mapping_helpers/door/lock,
23912400
/turf/open/floor/plating/rough,
23922401
/area/vtm/interior/techshop)
23932402
"Mg" = (
@@ -3960,7 +3969,7 @@ Ri
39603969
Wz
39613970
bU
39623971
EL
3963-
Id
3972+
IU
39643973
Id
39653974
Id
39663975
Id
@@ -4028,7 +4037,7 @@ pN
40284037
pN
40294038
Jo
40304039
EL
4031-
oF
4040+
Id
40324041
ho
40334042
Id
40344043
Id

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
///from base of /mob/living/proc/melee_swing()
2+
#define COMSIG_LIVING_MELEE_SWING "mob_melee_swing"
3+
14
#define COMSIG_LIVING_JUMP_PREP_TOGGLE "living_jump_prep_toggle"
25

36
//from base of living/set_pull_offset(): (mob/living/pull_target, grab_state)

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#define ROLL_COOLDOWN -2
12
#define ROLL_BOTCH -1
23
#define ROLL_FAILURE 0
34
#define ROLL_SUCCESS 1
@@ -14,3 +15,8 @@
1415
#define ROLL_ADMIN "admin"
1516
/// Output is show to no one and is not logged
1617
#define ROLL_NONE "none"
18+
19+
/// Time at which the roll was recorded
20+
#define OLD_ROLL_TIME 1
21+
/// Dice output of the old roll (roll define or just raw number depending on numerical)
22+
#define OLD_ROLL_OUTPUT 2

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
156156
#define TRAIT_NATURAL "natural"
157157
#define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
158158

159+
/// Mob has had atleast one tooth yanked out while having no method of regenerating it.
160+
#define TRAIT_TOOTH_PULLED "tooth_pulled"
161+
159162
/// Sixth sense restricted to view range
160163
#define TRAIT_LOCAL_SIXTHSENSE "local_sixth_sense"
161164
/// If the mob can't have surgery done on it. See: Blood form Tzimisce
@@ -186,6 +189,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
186189
#define TRAIT_FAIR_GLABRO "fair_glabro"
187190
#define TRAIT_EAT_FOOD "eat_food"
188191
#define TRAIT_CALM_HEART "calm_heart"
189-
192+
#define TRAIT_ACUTE_HEARING "acute_hearing"
193+
#define TRAIT_DISFIGURED_APPEARANCE "disfigured_appearance"
194+
#define TRAIT_GRAVE_SMELL "grave_smell"
195+
#define TRAIT_GLOWING_EYES "glowing_eyes"
190196

191197
// END TRAIT DEFINES

‎code/_globalvars/lists/maintenance_loot.dm‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@
1717
GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto chemistry items
1818
list(//trash
1919
/obj/item/trash/can = 1,
20+
/* // DARKPACK EDIT REMOVAL
2021
/obj/item/trash/candy = 1,
2122
/obj/item/trash/cheesie = 1,
2223
/obj/item/trash/chips = 1,
2324
/obj/item/trash/pistachios = 1,
2425
/obj/item/trash/popcorn = 1,
2526
/obj/item/trash/raisins = 1,
2627
/obj/item/trash/sosjerky = 1,
28+
*/
29+
// DARKPACK ADD CHANGE START
30+
/obj/effect/spawner/random/trash/food_packaging = 7,
31+
// DARKPACK ADD CHANGE END
2732
/obj/item/trash/flare = 1,
2833
/obj/item/trash/candle = 1,
2934

@@ -101,7 +106,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
101106
/obj/item/radio/headset = 1,
102107
/obj/item/storage/backpack = 1,
103108
/obj/item/storage/belt/fannypack = 1,
104-
/obj/item/storage/wallet/random = 1,
109+
/obj/item/storage/wallet/darkpack = 1, // DARKPACK EDIT CHANGE
105110
) = 1,
106111

107112
list(//construction and crafting
@@ -147,7 +152,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
147152
/obj/item/extinguisher = 1,
148153
/obj/item/grenade/smokebomb = 1,
149154
/obj/item/radio/off = 1,
150-
/obj/item/stack/spacecash/c10 = 1,
155+
/obj/item/stack/dollar/rand/hundred = 1, // DARKPACK EDIT CHANGE
151156
/obj/item/stack/medical/wrap/sticky_tape = 1,
152157
/obj/item/tank/internals/emergency_oxygen = 1,
153158
/obj/item/paper/paperslip/fishing_tip = 1,
@@ -164,6 +169,8 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
164169

165170
GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
166171
list(//tools
172+
/obj/effect/spawner/random/weapon/small_melee = 10, // DARKPACK EDIT ADD START - LOOT
173+
/obj/effect/spawner/random/weapon/weak_large_melee = 5, // DARKPACK EDIT ADD END
167174
/obj/item/grenade/iedcasing/spawned = 1,
168175
/obj/item/hatchet = 1,
169176
/obj/item/melee/baton/security/cattleprod = 1,
@@ -364,15 +371,20 @@ GLOBAL_LIST_INIT(rarity_loot, list(//rare: really good items
364371
) = 1,
365372

366373
list(//misc
374+
/obj/effect/spawner/random/occult/artifact = 10, // DARKPACK EDIT ADD
367375
/obj/item/book/granter/crafting_recipe/dusting/pipegun_prime = 1,
368376
/obj/item/book/granter/crafting_recipe/trash_cannon = 1,
377+
/* // DARKPACK EDIT REMOVAL
369378
/obj/item/book/granter/crafting_recipe/dusting/laser_musket_prime = 1,
370379
/obj/item/book/granter/crafting_recipe/dusting/detached_ratvarian_repeater = 1,
371380
/obj/item/book/granter/sign_language = 1,
381+
*/
372382
/obj/item/disk/nuclear/fake = 1,
373383
/obj/item/disk/surgery/advanced_plastic_surgery = 1,
384+
/* // DARKPACK EDIT REMOVAL
374385
/obj/item/skillchip/brainwashing = 1,
375386
/obj/item/skillchip/intj = 1,
387+
*/
376388
/obj/item/tattoo_kit = 1,
377389
/obj/item/folder/ancient_paperwork = 1,
378390
) = 1,

‎code/_globalvars/traits/_traits.dm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
675675
"TRAIT_SPACE_ANT_IMMUNITY" = TRAIT_SPACE_ANT_IMMUNITY,
676676
"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
677677
"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
678+
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
678679
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
679680
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
680681
"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
@@ -694,6 +695,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
694695
"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
695696
"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
696697
"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
698+
"TRAIT_DISFIGURED_APPEARANCE" = TRAIT_DISFIGURED_APPEARANCE, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
697699
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
698700
"TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS_FLAWS
699701
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, //DARKPACK EDIT ADD
@@ -707,7 +709,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
707709
"TRAIT_FORCED_EMOTION" = TRAIT_FORCED_EMOTION, // DARKPACK EDIT ADD - Melpominee
708710
"TRAIT_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
709711
"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
712+
"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
710713
"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
714+
"TRAIT_GRAVE_SMELL" = TRAIT_GRAVE_SMELL, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
711715
"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
712716
"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
713717
"TRAIT_HIDDEN_DIABLERIE" = TRAIT_HIDDEN_DIABLERIE, //DARKPACK EDIT ADD
@@ -761,6 +765,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
761765
"TRAIT_THIRD_EYE" = TRAIT_THIRD_EYE, // DARKPACK EDIT ADD - Tremere & Salubri Quirk
762766
"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
763767
"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS
768+
"TRAIT_TOOTH_PULLED" = TRAIT_TOOTH_PULLED, // DARKPACK EDIT ADD
764769
"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
765770
"TRAIT_TOUGH_FLESH" = TRAIT_TOUGH_FLESH, // DARKPACK EDIT ADD
766771
"TRAIT_TRANSFORM_UPDATES_ICON" = TRAIT_TRANSFORM_UPDATES_ICON, // DARKPACK EDIT ADD - WEREWOLF

‎code/_globalvars/traits/admin_tooling.dm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
363363
"TRAIT_LEFT_EYE_SCAR" = TRAIT_LEFT_EYE_SCAR,
364364
"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
365365
"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
366+
"TRAIT_ACUTE_HEARING" = TRAIT_ACUTE_HEARING, // DARKPACK EDIT ADD - MERITS_FLAWS - ACUTE SENSE
366367
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
367368
"TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
368369
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
@@ -380,6 +381,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
380381
"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
381382
"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
382383
"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
384+
"TRAIT_DISFIGURED_APPEARANCE" = TRAIT_DISFIGURED_APPEARANCE, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
383385
"TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
384386
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, // DARKPACK EDIT ADD
385387
"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
@@ -389,7 +391,9 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
389391
"TRAIT_FERA_RENOWN" = TRAIT_FERA_RENOWN, // DARKPACK EDIT ADD - WEREWOLF
390392
"TRAIT_FRENETIC_AURA" = TRAIT_FRENETIC_AURA, // DARKPACK EDIT ADD
391393
"TRAIT_GHOST_VISION" = TRAIT_GHOST_VISION, // DARKPACK EDIT ADD - POWERS - (Necromancy)
394+
"TRAIT_GLOWING_EYES" = TRAIT_GLOWING_EYES, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
392395
"TRAIT_GOLD_WEAKNESS" = TRAIT_GOLD_WEAKNESS, // DARKPACK EDIT ADD - WEREWOLF - (corax)
396+
"TRAIT_GRAVE_SMELL" = TRAIT_GRAVE_SMELL, // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
393397
"TRAIT_GRIP_OF_THE_DAMNED" = TRAIT_GRIP_OF_THE_DAMNED, // DARKPACK EDIT ADD
394398
"TRAIT_GULLET" = TRAIT_GULLET, // DARKPACK EDIT ADD
395399
"TRAIT_HIDDEN_DIABLERIE" = TRAIT_HIDDEN_DIABLERIE, //DARKPACK EDIT ADD
@@ -435,6 +439,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
435439
"TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD
436440
"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
437441
"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS
442+
"TRAIT_TOOTH_PULLED" = TRAIT_TOOTH_PULLED, // DARKPACK EDIT ADD
438443
"TRAIT_TORPOR" = TRAIT_TORPOR, // DARKPACK EDIT ADD
439444
"TRAIT_TOUGH_FLESH" = TRAIT_TOUGH_FLESH, // DARKPACK EDIT ADD
440445
"TRAIT_TRANSFORM_UPDATES_ICON" = TRAIT_TRANSFORM_UPDATES_ICON, // DARKPACK EDIT ADD - WEREWOLF

‎code/_onclick/click.dm‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,13 @@
176176
else
177177
if(LAZYACCESS(modifiers, RIGHT_CLICK))
178178
ranged_secondary_attack(A, modifiers)
179+
/* // DARKPACK EDIT REMOVAL - COMBAT
179180
else
180181
RangedAttack(A, modifiers)
182+
*/
183+
// DARKPACK EDIT ADD START - COMBAT
184+
RangedAttack(A, modifiers)
185+
// DARKPACK EDIT ADD END
181186

182187
/// Is the atom obscured by a PREVENT_CLICK_UNDER_1 object above it
183188
/atom/proc/IsObscured()

‎code/_onclick/hud/hud.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// The default UI style is the first one in the list
88
GLOBAL_LIST_INIT(available_ui_styles, list(
9-
"World of Darkness" = 'modular_darkpack/master_files/icons/hud/screen_darkness_new.dmi', // DARKPACK EDIT ADD - (Put at the top because it has almost full coverage now!)
9+
"World-of-Darkness" = 'modular_darkpack/master_files/icons/hud/screen_darkness_new.dmi', // DARKPACK EDIT ADD - (Put at the top because it has almost full coverage now!)
1010
"Pentex-Knox" = 'modular_darkpack/master_files/icons/hud/screen_pentexknox.dmi', // DARKPACK EDIT ADD - (Trasen-Knox logo with a Pentex logo)
1111
/* // DARKPACK EDIT REMOVAL
1212
"Midnight" = 'icons/hud/screen_midnight.dmi',

‎code/controllers/subsystem/processing/quirks.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
3333
list(/datum/quirk/darkpack/thaumaturgically_inept, /datum/quirk/darkpack/mage_blood), // DARKPACK EDIT ADD - MERITS_FLAWS
3434
list(/datum/quirk/mute, /datum/quirk/darkpack/the_largest_maw), // DARKPACK EDIT ADD - MERITS_FLAWS
3535
list(/datum/quirk/mute, /datum/quirk/darkpack/speech_impediment), // DARKPACK EDIT ADD - MERITS_FLAWS
36+
list(/datum/quirk/darkpack/monstrous, /datum/quirk/darkpack/disfigured), // DARKPACK EDIT ADD - MERITS_FLAWS - PHYSICAL FLAWS
3637
))
3738

3839
GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist())

0 commit comments

Comments
 (0)