From 0f224dcc1d6be53318088a6ae2b382fad7c38517 Mon Sep 17 00:00:00 2001
From: Icarus-The-Sun <119832971+Icarus-The-Sun@users.noreply.github.com>
Date: Sat, 13 Jun 2026 19:51:30 -0400
Subject: [PATCH 01/20] Physical Flaws (Part One) (#1122)
## About The Pull Request
Adds the Hemophiliac (VTM Ghouls and Revenants pg 136), Lame (VTM pg
482), Light Sensitive (VTM pg 495), Permanent Wound (VTM pg 482/483),
and Short (VTM page 481) flaws. Please tell me if anything can be done
better, I've been going insane.
Lame applies paralysis on the chosen leg, so a _cane_ won't help
movement, but crutches will (I'm not smart enough to figure out how to
make an uncurable wound for limping to apply). Short applies the dwarf
trait (please tell me if there's an easier way to set height to be below
a certain number). Permanent wound applies some damage when you first
spawn in.
Details
I wasn't really sure what to show for testing for this honestly.
Kindred character with lame, permanent wound, and light sensitive
selected.
Lame character.
Hemophiliac after being shanked with a glass shiv (blood loss worsens,
and was incredibly easy to begin bleeding)
Character with a tall height set with the short trait selected (reverts
to proper height on removal)
Light sensitive character being obliterated by the sun.
### Shadow Lords
**Aura of confidence** (so minor i gave them a second one)
**Fatal Flaw**
PERCEPTION + EMPATHY. Roll to spot a "weakness" which grants you a bonus
dice on any attack on them for a scene
### Silent Striders
**Speed of Thought**
1 Gnosis. Double run speed for 1 scene
### BSD
**Bane Protector**
STAMINA + LEADERSHIP. 1 Rage. Lets you tame any bane OR summon one if
you do not target one. The summoning will prob be phased out when banes
are a more common occurance
## Why It's Good For The Game
2/3s of tribes not having any features is bad acctually.
## Changelog
:cl: FalloutFalcon, Major00
add: Adds new gifts: Jam Weapon (Children of Gaia), Control Simple
Machine (Glasswalker), Hidden Killer (Red Talon), Aura of confidence &
Fatal Flaw (Shadow Lords), Speed of Thought (Silent Striders), Bane
Protector (BSD)
add: Adds some little lesser banes
qol: powers that spend willpower log it to chat
qol: removes pointless to_chat that just says "you cast gift" as most
have better built in feedback
image: "Tribe gifts: Part 1" gifts now have unique icons
code: adds signal that code can hook onto to change bonus dice of rolls
/:cl:
---------
Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
---
code/__DEFINES/~darkpack/auras.dm | 7 +-
.../dcs/signals_mob/signals_mob_living.dm | 4 +-
.../~darkpack/traits/declarations.dm | 3 +
code/_globalvars/traits/_traits.dm | 9 +-
code/_globalvars/traits/admin_tooling.dm | 3 +
code/_onclick/item_attack.dm | 10 +
code/modules/projectiles/gun.dm | 5 +
.../modules/doors/code/vampdoor.dm | 6 +-
.../code/discipline/auspex/aura_component.dm | 35 ++-
.../powers/code/discipline/protean/claws.dm | 1 +
.../modules/splats/code/powers/_power.dm | 14 +-
.../storyteller_dice/code/roll_datum.dm | 4 +-
.../code/basic_mobs/banes/_banes.dm | 33 +++
.../code/basic_mobs/banes/religion.dm | 12 +
.../code/basic_mobs/banes/suffocating.dm | 37 +++
.../code/gifts/_gift.dm | 8 -
.../code/gifts/auspices/galliard.dm | 1 +
.../code/gifts/auspices/ragabash.dm | 4 +-
.../code/gifts/auspices/theurge.dm | 5 +-
.../code/gifts/tribes/black_spiral_dancers.dm | 38 +++
.../code/gifts/tribes/bone_gnawers.dm | 3 +-
.../code/gifts/tribes/childrenofgaia.dm | 57 ++++
.../code/gifts/tribes/fianna.dm | 2 +-
...black_spiral_dancer.dm => galestalkers.dm} | 0
.../code/gifts/tribes/get_of_fenris.dm | 7 +-
.../code/gifts/tribes/ghostcouncil.dm | 0
.../tribes/glasswalkers/control_machine.dm | 277 ++++++++++++++++++
.../gifts/tribes/glasswalkers/glasswalkers.dm | 16 +
.../code/gifts/tribes/redtalons.dm | 54 ++++
.../code/gifts/tribes/shadowlords.dm | 119 ++++++++
.../code/gifts/tribes/silent_striders.dm | 41 +++
.../code/gifts/tribes/silver_fangs.dm | 0
.../code/gifts/tribes/star_gazers.dm | 0
.../code/subsplats/tribes/garou.dm | 100 +++----
.../icons/basic/banes.dmi | Bin 0 -> 1937 bytes
.../icons/werewolf_abilities.dmi | Bin 15811 -> 20008 bytes
tgstation.dme | 15 +-
37 files changed, 821 insertions(+), 109 deletions(-)
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/_banes.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/religion.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/suffocating.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/black_spiral_dancers.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/childrenofgaia.dm
rename modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/{black_spiral_dancer.dm => galestalkers.dm} (100%)
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/ghostcouncil.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/control_machine.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/glasswalkers.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/redtalons.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/shadowlords.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silent_striders.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silver_fangs.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/star_gazers.dm
create mode 100644 modular_darkpack/modules/werewolf_the_apocalypse/icons/basic/banes.dmi
diff --git a/code/__DEFINES/~darkpack/auras.dm b/code/__DEFINES/~darkpack/auras.dm
index 663c4938eafb..960a2672f80a 100644
--- a/code/__DEFINES/~darkpack/auras.dm
+++ b/code/__DEFINES/~darkpack/auras.dm
@@ -21,6 +21,7 @@
#define AURA_SAD COLOR_SILVER // Silver
#define AURA_SPIRITUAL COLOR_GOLD // Gold
#define AURA_SUSPICIOUS COLOR_STRONG_BLUE // Dark Blue
+#define AURA_CONFIDENCE COLOR_VIVID_YELLOW // Primarly for the Shadow Lords gift "Aura of Confidence"
// Modifier auras.
#define AURA_ANXIOUS "Anxious" // Auras appear scrambled like static or white noise
@@ -65,7 +66,8 @@ GLOBAL_LIST_INIT(aura_list, sort_list(list(
"Anxious" = AURA_ANXIOUS,
"Confused" = AURA_CONFUSED,
"Daydreaming" = AURA_DAYDREAMING,
- "Psychotic" = AURA_PSYCHOTIC
+ "Psychotic" = AURA_PSYCHOTIC,
+ "Confidence" = AURA_CONFIDENCE,
)))
GLOBAL_LIST_INIT(emotion_to_quality, sort_list(list(
@@ -94,5 +96,6 @@ GLOBAL_LIST_INIT(emotion_to_quality, sort_list(list(
"Anxious" = "anxiety",
"Confused" = "confusion",
"Daydreaming" = "absentmindedness",
- "Psychotic" = "psychosis"
+ "Psychotic" = "psychosis",
+ "Confidence" = "confidence",
)))
diff --git a/code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm b/code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm
index 3a96936550da..95c19115e7af 100644
--- a/code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm
+++ b/code/__DEFINES/~darkpack/dcs/signals_mob/signals_mob_living.dm
@@ -7,5 +7,7 @@
//from base of living/CanAllowThrough(): (atom/movable/mover, border_dir)
#define COMSIG_LIVING_CAN_ALLOW_THROUGH "living_can_allow_through"
#define COMPONENT_LIVING_PASSABLE (1<<0)
-//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, output)
+//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, atom/target)
+#define COMSIG_LIVING_PRE_DICE_ROLLED "living_pre_dice_rolled"
+//from base of /datum/storyteller_roll/proc/st_roll(): (mob/living/roller, datum/storyteller_roll/roll_datum, atom/target, output)
#define COMSIG_LIVING_DICE_ROLLED "living_dice_rolled"
diff --git a/code/__DEFINES/~darkpack/traits/declarations.dm b/code/__DEFINES/~darkpack/traits/declarations.dm
index 4ef7a8b1e544..59a10181749b 100644
--- a/code/__DEFINES/~darkpack/traits/declarations.dm
+++ b/code/__DEFINES/~darkpack/traits/declarations.dm
@@ -152,6 +152,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_SMALL_HANDS "small_hands"
// Traits granted via gifts
#define TRAIT_RAZOR_CLAWS "razor_claws"
+#define TRAIT_JAMMING_WEAPONS "jamming_weapons"
+#define TRAIT_NATURAL "natural"
+#define TRAIT_AURA_OF_CONFIDENCE "aura_of_confidence"
/// Sixth sense restricted to view range
#define TRAIT_LOCAL_SIXTHSENSE "local_sixth_sense"
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 8926c5af804f..3239f43454ac 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -39,6 +39,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
"TRAIT_UNLINKABLE_FISHING_SPOT" = TRAIT_UNLINKABLE_FISHING_SPOT,
"TRAIT_TETHER_ATTACHED" = TRAIT_TETHER_ATTACHED,
+ "TRAIT_NATURAL" = TRAIT_NATURAL, // DARKPACK EDIT ADD - WEREWOLF
),
/atom/movable = list(
"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,
@@ -675,6 +676,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_BRAIN_TRAUMA_IMMUNITY" = TRAIT_BRAIN_TRAUMA_IMMUNITY,
"TRAIT_NECROPOLIS_WORSHIP" = TRAIT_NECROPOLIS_WORSHIP,
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
+ "TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BETRAYERS_MARK" = TRAIT_BETRAYERS_MARK, // DARKPACK EDIT ADD - MERITS_FLAWS - (Tremere)
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
@@ -692,8 +694,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_DIFFICULT_FRENZY" = TRAIT_DIFFICULT_FRENZY, // DARKPACK EDIT ADD - FRENZY
"TRAIT_DIFFICULT_RAGE" = TRAIT_DIFFICULT_RAGE, // DARKPACK EDIT ADD - FRENZY
"TRAIT_DISCO_DANCER" = TRAIT_DISCO_DANCER, // DARKPACK EDIT ADD
- "TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS/FLAWS
- "TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS/FLAWS
+ "TRAIT_DULLFANGS" = TRAIT_DULLFANGS, // DARKPACK EDIT ADD - MERITS_FLAWS
+ "TRAIT_EAT_FOOD" = TRAIT_EAT_FOOD, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_EFFICIENT_DIGESTION" = TRAIT_EFFICIENT_DIGESTION, //DARKPACK EDIT ADD
"TRAIT_ENHANCED_MELEE_DODGE" = TRAIT_ENHANCED_MELEE_DODGE, // DARKPACK EDIT ADD
"TRAIT_FAIR_GLABRO" = TRAIT_FAIR_GLABRO, // DARKPACK EDIT ADD - MERITS_FLAWS
@@ -718,6 +720,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
+ "TRAIT_JAMMING_WEAPONS" = TRAIT_JAMMING_WEAPONS, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
"TRAIT_LIGHT_WEAKNESS" = TRAIT_LIGHT_WEAKNESS, // DARKPACK EDIT ADD - Setite Flaw
"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
@@ -754,7 +757,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_STAKE_IMMUNE" = TRAIT_STAKE_IMMUNE, // DARKPACK EDIT ADD
"TRAIT_STAKE_RESISTANT" = TRAIT_STAKE_RESISTANT, // DARKPACK EDIT ADD
"TRAIT_STILLNESS_OF_DEATH" = TRAIT_STILLNESS_OF_DEATH, // DARKPACK EDIT ADD - Gargoyle Quirk
- "TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD - MERITS/FLAWS
+ "TRAIT_THE_LARGEST_MAW" = TRAIT_THE_LARGEST_MAW, // DARKPACK EDIT ADD - MERITS_FLAWS
"TRAIT_THIRD_EYE" = TRAIT_THIRD_EYE, // DARKPACK EDIT ADD - Tremere & Salubri Quirk
"TRAIT_TIMEWARPER" = TRAIT_TIMEWARPER, // DARKPACK EDIT ADD
"TRAIT_TIME_SENSE" = TRAIT_TIME_SENSE, // DARKPACK EDIT ADD - MERITS_FLAWS
diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
index fd17092644bc..e1208f161f76 100644
--- a/code/_globalvars/traits/admin_tooling.dm
+++ b/code/_globalvars/traits/admin_tooling.dm
@@ -9,6 +9,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_RUSTIMMUNE" = TRAIT_RUSTIMMUNE,
"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
+ "TRAIT_NATURAL" = TRAIT_NATURAL, // DARKPACK EDIT ADD - WEREWOLF
),
/atom/movable = list(
"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,
@@ -363,6 +364,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_RIGHT_EYE_SCAR" = TRAIT_RIGHT_EYE_SCAR,
"TRAIT_CARPOTOXIN_IMMUNE" = TRAIT_CARPOTOXIN_IMMUNE,
"TRAIT_ANIMAL_MUSK" = TRAIT_ANIMAL_MUSK, // DARKPACK EDIT ADD - MERITS_FLAWS
+ "TRAIT_AURA_OF_CONFIDENCE" = TRAIT_AURA_OF_CONFIDENCE, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_BLOODY_LOVER" = TRAIT_BLOODY_LOVER, // DARKPACK EDIT ADD
"TRAIT_BLOODY_SUCKER" = TRAIT_BLOODY_SUCKER, // DARKPACK EDIT ADD
"TRAIT_BLUSH_OF_HEALTH" = TRAIT_BLUSH_OF_HEALTH, // DARKPACK EDIT ADD
@@ -399,6 +401,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_INVISIBLE_TO_CAMERA" = TRAIT_INVISIBLE_TO_CAMERA, // DARKPACK EDIT ADD
"TRAIT_IN_FRENZY" = TRAIT_IN_FRENZY, // DARKPACK EDIT ADD
"TRAIT_IRRESISTIBLE_VITAE" = TRAIT_IRRESISTIBLE_VITAE, // DARKPACK EDIT ADD
+ "TRAIT_JAMMING_WEAPONS" = TRAIT_JAMMING_WEAPONS, // DARKPACK EDIT ADD - WEREWOLF
"TRAIT_LAZY" = TRAIT_LAZY, // DARKPACK EDIT ADD
"TRAIT_LIGHT_WEAKNESS" = TRAIT_LIGHT_WEAKNESS, // DARKPACK EDIT ADD - Setite Flaw
"TRAIT_LOCAL_SIXTHSENSE" = TRAIT_LOCAL_SIXTHSENSE, // DARKPACK EDIT ADD
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index 618868072488..ae36b8552164 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -235,6 +235,11 @@
return FALSE
var/final_force = CALCULATE_FORCE(src, attack_modifiers)
+ // DARKPACK EDIT ADD START - WEREWOLF
+ if(HAS_TRAIT(user, TRAIT_JAMMING_WEAPONS) && !HAS_TRAIT(src, TRAIT_NATURAL))
+ to_chat(user, span_warning("[src] ineffectively jams or malfunctions!"))
+ return FALSE
+ // DARKPACK EDIT ADD END
if(damtype != STAMINA && final_force && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm other living beings!"))
return FALSE
@@ -288,6 +293,11 @@
user.changeNext_move(attack_speed)
if(get(src, /mob/living) == user) // telekinesis.
user.do_attack_animation(attacked_atom)
+ // DARKPACK EDIT ADD START - WEREWOLF
+ if(HAS_TRAIT(user, TRAIT_JAMMING_WEAPONS) && !HAS_TRAIT(src, TRAIT_NATURAL))
+ to_chat(user, span_warning("[src] ineffectively jams or malfunctions!"))
+ return FALSE
+ // DARKPACK EDIT ADD END
if(attacked_atom.attacked_by(src, user, modifiers, attack_modifiers) == ATTACK_FAILED)
return TRUE
SEND_SIGNAL(src, COMSIG_ITEM_AFTERATTACK, attacked_atom, user, modifiers, attack_modifiers)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index d0f61730727d..c7a76d851536 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -452,6 +452,11 @@
/obj/item/gun/can_trigger_gun(mob/living/user, akimbo_usage)
. = ..()
+ // DARKPACK EDIT ADD START - WEREWOLF
+ if(HAS_TRAIT(user, TRAIT_JAMMING_WEAPONS) && !HAS_TRAIT(src, TRAIT_NATURAL))
+ to_chat(user, span_warning("[src] ineffectively jams or malfunctions!"))
+ return FALSE
+ // DARKPACK EDIT ADD END
if(!handle_pins(user))
return FALSE
diff --git a/modular_darkpack/modules/doors/code/vampdoor.dm b/modular_darkpack/modules/doors/code/vampdoor.dm
index 1158f4192fdd..8d55a1924410 100644
--- a/modular_darkpack/modules/doors/code/vampdoor.dm
+++ b/modular_darkpack/modules/doors/code/vampdoor.dm
@@ -365,10 +365,12 @@
/obj/structure/vampdoor/proc/toggle_lock(mob/living/user)
playsound(src, lock_sound, 75, TRUE)
if(!locked)
- to_chat(user, span_notice("[src] is now locked."))
+ if(user)
+ to_chat(user, span_notice("[src] is now locked."))
locked = TRUE
else
- to_chat(user, span_notice("[src] is now unlocked."))
+ if(user)
+ to_chat(user, span_notice("[src] is now unlocked."))
proc_unlock("key")
locked = FALSE
return TRUE
diff --git a/modular_darkpack/modules/powers/code/discipline/auspex/aura_component.dm b/modular_darkpack/modules/powers/code/discipline/auspex/aura_component.dm
index 8b8ed738a0c3..4d030c687f05 100644
--- a/modular_darkpack/modules/powers/code/discipline/auspex/aura_component.dm
+++ b/modular_darkpack/modules/powers/code/discipline/auspex/aura_component.dm
@@ -65,6 +65,9 @@
/datum/component/aura/proc/update_emotions(mob/changed_mob, new_emotion)
SIGNAL_HANDLER
+ if(HAS_TRAIT(changed_mob, TRAIT_AURA_OF_CONFIDENCE))
+ new_emotion = "Confidence"
+
if(current_aura == new_emotion)
return
@@ -94,6 +97,10 @@
/datum/component/aura/proc/update_examine_message(mutable_appearance/aura_appearance)
var/mob/parent_mob = parent
+ if(HAS_TRAIT(parent_mob, TRAIT_AURA_OF_CONFIDENCE))
+ examine_message = "[parent_mob.p_Their()] aura is swamped in so much superiority nothing else can be made out."
+ return
+
switch(current_aura)
if(AURA_AFRAID)
examine_message = "[parent_mob.p_Their()] aura burns a bright orange, tense and flickering at the edges."
@@ -214,6 +221,9 @@
holder.color = null
var/mob/parent_mob = parent
+ if(HAS_TRAIT(parent_mob, TRAIT_AURA_OF_CONFIDENCE))
+ return
+
if(output_color && has_pale_aura(parent_mob))
var/list/hsv_color_value = rgb2hsv(output_color)
hsv_color_value[2] = hsv_color_value[2] * 0.7 // Reduce saturation for kindred
@@ -273,6 +283,20 @@
aura_smoke_image.color = aura_appearance.color
aura_smoke_image.alpha = 50
+ var/matrix/smoke_transform = matrix()
+ smoke_transform.Scale(1, pick(1.25, 1.5))
+ aura_smoke_image.transform = smoke_transform
+
+ var/matrix/classic_aura_transform = matrix()
+ classic_aura_transform.Scale(pick(0.65, 0.75), 1)
+ aura_classic_image.transform = classic_aura_transform
+
+ holder.vis_contents += aura_classic_image
+ holder.vis_contents += aura_smoke_image
+
+ if(HAS_TRAIT(parent_mob, TRAIT_AURA_OF_CONFIDENCE))
+ return
+
if(HAS_TRAIT(parent_mob, TRAIT_DIABLERIE) && !HAS_TRAIT(parent_mob, TRAIT_HIDDEN_DIABLERIE))
var/mutable_appearance/diablerie_image = mutable_appearance('modular_darkpack/modules/powers/icons/auras.dmi', "diab", ABOVE_MOB_LAYER + 1, parent_mob, ABOVE_GAME_PLANE)
holder.add_overlay(diablerie_image)
@@ -300,17 +324,6 @@
if(isavatar(parent_mob) || isobserver(parent_mob))
holder.opacity = holder.opacity * 0.5
- var/matrix/smoke_transform = matrix()
- smoke_transform.Scale(1, pick(1.25, 1.5))
- aura_smoke_image.transform = smoke_transform
-
- var/matrix/classic_aura_transform = matrix()
- classic_aura_transform.Scale(pick(0.65, 0.75), 1)
- aura_classic_image.transform = classic_aura_transform
-
- holder.vis_contents += aura_classic_image
- holder.vis_contents += aura_smoke_image
-
/datum/component/aura/proc/update_aura_filters(mutable_appearance/aura_appearance, image/holder)
remove_wibbly_filters(holder)
diff --git a/modular_darkpack/modules/powers/code/discipline/protean/claws.dm b/modular_darkpack/modules/powers/code/discipline/protean/claws.dm
index fb4799c83acf..0e6186356fc7 100644
--- a/modular_darkpack/modules/powers/code/discipline/protean/claws.dm
+++ b/modular_darkpack/modules/powers/code/discipline/protean/claws.dm
@@ -16,6 +16,7 @@
/obj/item/gangrel_claws/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, INNATE_TRAIT)
+ ADD_TRAIT(src, TRAIT_NATURAL, INNATE_TRAIT)
/obj/item/gangrel_claws/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
. = ..()
diff --git a/modular_darkpack/modules/splats/code/powers/_power.dm b/modular_darkpack/modules/splats/code/powers/_power.dm
index d99530edb81d..2b6a9942b956 100644
--- a/modular_darkpack/modules/splats/code/powers/_power.dm
+++ b/modular_darkpack/modules/splats/code/powers/_power.dm
@@ -7,6 +7,11 @@
/// Means that this action is not a real power, but some sort of innate ability we represent as a power/disc/gift mechnaicly.
var/innate_ability = FALSE
+ /// If the power manually calls `StartCooldown`, otherwise handled by Activate
+ var/handles_cooldown = FALSE
+ /// If the power manually calls `spend_resources` itself, otherwise handled by Activate
+ var/handles_spend_resources = FALSE
+
/// How much temporary willpower is required to use this ability
var/willpower_cost = 0
@@ -17,9 +22,11 @@
return FALSE
/datum/action/cooldown/power/Activate(atom/target)
- . = ..()
+ if(!handles_cooldown)
+ . = ..()
- spend_resources()
+ if(!handles_spend_resources)
+ spend_resources()
/**
@@ -40,6 +47,9 @@
* when casting the power.
*/
/datum/action/cooldown/power/proc/spend_resources()
+ SHOULD_CALL_PARENT(TRUE)
+
if(willpower_cost && isliving(owner))
var/mob/living/living_owner = owner
living_owner.st_change_stat(STAT_TEMPORARY_WILLPOWER, -willpower_cost)
+ to_chat(owner, span_warning("You burn [willpower_cost] willpower."))
diff --git a/modular_darkpack/modules/storyteller_dice/code/roll_datum.dm b/modular_darkpack/modules/storyteller_dice/code/roll_datum.dm
index eb62e412dbbe..0963013cef57 100644
--- a/modular_darkpack/modules/storyteller_dice/code/roll_datum.dm
+++ b/modular_darkpack/modules/storyteller_dice/code/roll_datum.dm
@@ -54,6 +54,8 @@
var/auto_success_amount = calculate_auto_successes(roller)
var/used_difficulty = calculate_used_difficulty(roller)
+ bonus += SEND_SIGNAL(roller, COMSIG_LIVING_PRE_DICE_ROLLED, src, target)
+
var/list/rolled_dice = roll_dice(dice_amount, auto_success_amount)
var/dice_used_text = "[dice_amount] dice"
@@ -94,7 +96,7 @@
LAZYADDASSOC(mobs_last_rolled, WEAKREF(roller), list(world.time, output))
- SEND_SIGNAL(roller, COMSIG_LIVING_DICE_ROLLED, src, output)
+ SEND_SIGNAL(roller, COMSIG_LIVING_DICE_ROLLED, src, target, output)
return output
/datum/storyteller_roll/proc/create_balloon_alert(mob/living/roller, mob/player_mob, number)
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/_banes.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/_banes.dm
new file mode 100644
index 000000000000..34458348d8ee
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/_banes.dm
@@ -0,0 +1,33 @@
+/mob/living/basic/bane
+ name = "creature"
+ abstract_type = /mob/living/basic/bane
+ icon = 'modular_darkpack/modules/werewolf_the_apocalypse/icons/basic/banes.dmi'
+
+ mob_biotypes = MOB_SPIRIT
+ basic_mob_flags = DEL_ON_DEATH
+
+ speed = 0.35
+ maxHealth = 80
+ health = 80
+ melee_damage_lower = 10
+ melee_damage_upper = 20
+ obj_damage = 20
+
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
+ attack_sound = 'sound/items/weapons/bite.ogg'
+ speak_emote = list("gnashes")
+
+ faction = list("bane")
+
+ pressure_resistance = 200
+ bloodpool = 0
+ maxbloodpool = 0
+ bloodquality = BLOOD_QUALITY_LOW
+
+ ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile_obstacles
+
+/mob/living/basic/bane/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/ai_retaliate)
+ ADD_TRAIT(src, TRAIT_WYRMTAINTED, INNATE_TRAIT)
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/religion.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/religion.dm
new file mode 100644
index 000000000000..4e32c692f266
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/religion.dm
@@ -0,0 +1,12 @@
+/mob/living/basic/bane/religion
+ desc = "A strangly familiar looking creature that reminds you of your aunt."
+ icon_state = "religion_bane"
+ maxHealth = 50
+ health = 50
+ pass_flags = PASSMOB
+ mob_size = MOB_SIZE_SMALL
+
+/mob/living/basic/bane/religion/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/simple_flying)
+ AddComponent(/datum/component/swarming)
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/suffocating.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/suffocating.dm
new file mode 100644
index 000000000000..e935f9d81399
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/basic_mobs/banes/suffocating.dm
@@ -0,0 +1,37 @@
+/mob/living/basic/bane/suffocating
+ desc = "A disgusting gasping creature that writhes and contorts."
+ icon_state = "suffocating_bane"
+ maxHealth = 50
+ health = 50
+
+ ai_controller = /datum/ai_controller/basic_controller/suffocating_bane
+
+ mob_size = MOB_SIZE_SMALL
+
+/datum/ai_controller/basic_controller/suffocating_bane
+ blackboard = list(
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+ )
+
+ ai_movement = /datum/ai_movement/basic_avoidance
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/escape_captivity,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ /datum/ai_planning_subtree/random_speech/suffocating_bane
+ )
+
+
+/datum/ai_planning_subtree/random_speech/suffocating_bane
+ speech_chance = 15
+ speak = list("gasps")
+ sound = list(
+ 'sound/mobs/humanoids/human/gasp/gasp_female1.ogg',
+ 'sound/mobs/humanoids/human/gasp/gasp_female2.ogg',
+ 'sound/mobs/humanoids/human/gasp/gasp_female3.ogg',
+ 'sound/mobs/humanoids/human/gasp/gasp_male1.ogg',
+ 'sound/mobs/humanoids/human/gasp/gasp_male2.ogg',
+ )
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/_gift.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/_gift.dm
index dddbe9be9d7c..dc5b3ff86fb0 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/_gift.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/_gift.dm
@@ -10,8 +10,6 @@
check_flags = AB_CHECK_IMMOBILE|AB_CHECK_CONSCIOUS
- var/default_activate_message = TRUE
-
var/rage_cost = 0
var/gnosis_cost = 0
@@ -24,12 +22,6 @@
owner.balloon_alert(owner, "not a gift user!")
return FALSE
-/datum/action/cooldown/power/gift/Activate(atom/target)
- . = ..()
-
- if(default_activate_message)
- to_chat(owner, span_notice("You activate the [name]..."))
-
/datum/action/cooldown/power/gift/can_afford(feedback)
. = ..()
var/datum/splat/werewolf/casting_splat = get_werewolf_splat(owner)
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/galliard.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/galliard.dm
index 20544f098885..1320746e034e 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/galliard.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/galliard.dm
@@ -44,6 +44,7 @@
/datum/action/cooldown/power/gift/mindspeak/Activate(atom/target)
+ . = ..()
var/input = tgui_input_text(usr, "What do you want to tell to your Tribe?", name, max_length = MAX_MESSAGE_LEN)
if(!input || !IsAvailable(feedback = TRUE))
return
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm
index 0a0f7bfc8de2..1dc3575b9d27 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/ragabash.dm
@@ -77,11 +77,11 @@
return FALSE
/datum/action/cooldown/power/gift/infectious_laughter/Activate(atom/target)
- . = ..()
-
if(!last_spoken_message || (when_spoken + 3 TURNS < world.time))
return
+ . = ..()
+
owner.emote("laugh")
playsound(owner, 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/gifts/infectious_laughter.ogg', 50, FALSE)
var/list/hearers = oviewers(DEFAULT_MESSAGE_RANGE, owner)
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm
index bd0f90aaac4f..b92433961d1a 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/auspices/theurge.dm
@@ -26,9 +26,9 @@ the scar is received and an extra Gnosis point is spent.
/datum/action/cooldown/power/gift/mothers_touch/Activate(atom/target)
if(!isliving(target))
- return
+ return FALSE
if(!(target in range(1, owner)))
- return
+ return FALSE
. = ..()
@@ -40,7 +40,6 @@ the scar is received and an extra Gnosis point is spent.
living_target.heal_storyteller_health(successes, TRUE, TRUE, TRUE)
SEND_SIGNAL(owner, COMSIG_MASQUERADE_VIOLATION)
- StartCooldown()
return TRUE
/datum/action/cooldown/power/gift/sense_wyrm
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/black_spiral_dancers.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/black_spiral_dancers.dm
new file mode 100644
index 000000000000..3d95b08b5a61
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/black_spiral_dancers.dm
@@ -0,0 +1,38 @@
+/datum/storyteller_roll/gift/bane_protector
+ bumper_text = "Pact Binding"
+ applicable_stats = list(STAT_MANIPULATION, STAT_LEADERSHIP)
+
+/datum/action/cooldown/power/gift/bane_protector
+ name = "Bane Protector"
+ desc = "The Black Spiral Dancer binds a Bane in a pact of mutual alliance."
+ button_icon_state = "bane_protector"
+
+ click_to_activate = TRUE
+
+ rank = 1
+ rage_cost = 1
+
+/datum/action/cooldown/power/gift/bane_protector/Activate(atom/target)
+ . = ..()
+
+ var/mob/living/carbon/human/human_owner = astype(owner)
+ var/mob/living/basic/basic_target = astype(target)
+
+ var/datum/storyteller_roll/gift/bane_protector/roll_datum = new()
+ if(roll_datum.st_roll(owner, target) != ROLL_SUCCESS)
+ return TRUE
+
+ if(istype(basic_target, /mob/living/basic/bane))
+ qdel(basic_target.GetComponent(/datum/component/obeys_commands))
+ human_owner?.add_beastmaster_minion(target)
+ basic_target.ai_controller = new /datum/ai_controller/basic_controller/beastmaster_summon(basic_target)
+ return TRUE
+
+ // Just summon a random shitter.
+ human_owner.playsound_local(get_turf(human_owner), 'sound/effects/fire_puff.ogg')
+ human_owner?.add_beastmaster_minion(/mob/living/basic/bane/religion/summoned)
+ return TRUE
+
+
+/mob/living/basic/bane/religion/summoned
+ ai_controller = /datum/ai_controller/basic_controller/beastmaster_summon
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/bone_gnawers.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/bone_gnawers.dm
index 5782e5d09769..790a5b14ead1 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/bone_gnawers.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/bone_gnawers.dm
@@ -20,6 +20,7 @@
return FALSE
/datum/action/cooldown/power/gift/desperate_strength/Activate(atom/target)
+ . = ..()
var/mob/living/caster = owner
var/static/list/radial_menu_options = list(
"One" = icon('modular_darkpack/modules/werewolf_the_apocalypse/icons/gifts/tribes/bone_gnawers.dmi', "radial_one"),
@@ -71,7 +72,7 @@
/datum/status_effect/desperate_strength/proc/on_dice_rolled(mob/living/roller, datum/storyteller_roll/roll_datum, output)
SIGNAL_HANDLER
- if(STAT_STRENGTH in roll_datum.applicable_stats)
+ if(STAT_STRENGTH in roll_datum.using_stats(roller))
qdel(src)
/datum/status_effect/desperate_strength/on_remove()
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/childrenofgaia.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/childrenofgaia.dm
new file mode 100644
index 000000000000..1b745104ad7a
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/childrenofgaia.dm
@@ -0,0 +1,57 @@
+/datum/storyteller_roll/gift/jam_weapon
+ bumper_text = "Jam Weapon"
+ applicable_stats = list(STAT_TEMPORARY_WILLPOWER)
+ numerical = TRUE
+
+/datum/action/cooldown/power/gift/jam_weapon
+ name = "Jam Weapon"
+ desc = "The Child may stop any Weaver-born weapons from working within the range of his voice."
+ button_icon_state = "jam_weapon"
+ rank = 1
+ gnosis_cost = 1
+ var/list/datum/weakref/jammed_mobs = list()
+
+/datum/action/cooldown/power/gift/jam_weapon/Activate(atom/target)
+ . = ..()
+ // could use better flavor/sounds
+
+ // "The player rolls Willpower against a difficulty of highest Willpower of any armed individual within earshot. "
+ var/highest_willpower = 0
+ for(var/mob/living/carbon/human/guy in orange(DEFAULT_MESSAGE_RANGE, owner))
+ var/guy_willpower = guy.st_get_stat(STAT_TEMPORARY_WILLPOWER)
+ if(guy_willpower > highest_willpower)
+ highest_willpower = guy_willpower
+
+ var/datum/storyteller_roll/gift/jam_weapon/jam_roll = new()
+ jam_roll.difficulty = highest_willpower
+ var/roll_result = jam_roll.st_roll(owner)
+ if(roll_result > 0)
+ for(var/mob/living/carbon/human/guy in range(DEFAULT_MESSAGE_RANGE, owner))
+ guy.apply_status_effect(/datum/status_effect/jam_weapon, roll_result TURNS)
+
+
+/datum/status_effect/jam_weapon
+ id = "jam_weapon"
+ duration = STATUS_EFFECT_PERMANENT
+
+ status_type = STATUS_EFFECT_UNIQUE
+
+ alert_type = /atom/movable/screen/alert/status_effect/gift/jam_weapon
+
+/datum/status_effect/jam_weapon/on_creation(mob/living/owner, duration)
+ src.duration = duration
+ return ..()
+
+/datum/status_effect/jam_weapon/on_apply()
+ . = ..()
+ ADD_TRAIT(owner, TRAIT_JAMMING_WEAPONS, GIFT_TRAIT)
+
+/datum/status_effect/jam_weapon/on_remove()
+ REMOVE_TRAIT(owner, TRAIT_JAMMING_WEAPONS, GIFT_TRAIT)
+ return ..()
+
+
+/atom/movable/screen/alert/status_effect/gift/jam_weapon
+ name = /datum/action/cooldown/power/gift/jam_weapon::name
+ desc = /datum/action/cooldown/power/gift/jam_weapon::desc
+ overlay_state = /datum/action/cooldown/power/gift/jam_weapon::button_icon_state
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/fianna.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/fianna.dm
index 09d0206e5adb..e39bcd411556 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/fianna.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/fianna.dm
@@ -74,7 +74,7 @@
/datum/action/cooldown/power/gift/faerie_light
name = "Faerie Light"
desc = "Create a bobbing mote of light to light your way or attract targets for an ambush."
- button_icon_state = null // TODO: icon
+ button_icon_state = "faerie_light"
click_to_activate = TRUE
rank = 1
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/black_spiral_dancer.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/galestalkers.dm
similarity index 100%
rename from modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/black_spiral_dancer.dm
rename to modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/galestalkers.dm
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/get_of_fenris.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/get_of_fenris.dm
index 198c30aaced5..4a0644b788ba 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/get_of_fenris.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/get_of_fenris.dm
@@ -10,11 +10,10 @@
* TODO: less placeholder sound
*/
-/datum/storyteller_roll/visage_of_fenris
+/datum/storyteller_roll/gift/visage_of_fenris
bumper_text = "Visage of Fenris"
applicable_stats = list(STAT_CHARISMA, STAT_INTIMIDATION)
numerical = TRUE
- roll_output_type = ROLL_PUBLIC
/datum/movespeed_modifier/visage_of_fenris
multiplicative_slowdown = 0.75
@@ -31,7 +30,7 @@
. = ..()
var/datum/splat/werewolf/our_splat = get_werewolf_splat(owner)
- var/datum/storyteller_roll/visage_of_fenris/roll_datum = new()
+ var/datum/storyteller_roll/gift/visage_of_fenris/roll_datum = new()
var/successes = roll_datum.st_roll(owner)
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(owner.loc, owner)
@@ -39,7 +38,7 @@
playsound(owner, 'modular_darkpack/modules/werewolf_the_apocalypse/sounds/gifts/visage_of_fenris.ogg', 75, FALSE)
- for(var/mob/living/guy in viewers(world.view, owner))
+ for(var/mob/living/guy in viewers(DEFAULT_SIGHT_DISTANCE, owner))
if(guy == owner)
continue
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/ghostcouncil.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/ghostcouncil.dm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/control_machine.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/control_machine.dm
new file mode 100644
index 000000000000..cc9b1ca0d61e
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/control_machine.dm
@@ -0,0 +1,277 @@
+/datum/storyteller_roll/gift/control_simple_machine
+ bumper_text = "Control Simple Machine"
+ applicable_stats = list(STAT_MANIPULATION, STAT_CRAFTS)
+ difficulty = 7
+
+/datum/storyteller_roll/gift/control_complex_machine
+ bumper_text = "Control Complex Machine"
+ applicable_stats = list(STAT_MANIPULATION, STAT_SCIENCE) // or STAT_COMPUTER
+
+
+/datum/action/cooldown/power/gift/control_machine
+ abstract_type = /datum/action/cooldown/power/gift/control_machine
+
+ click_to_activate = TRUE
+
+ handles_spend_resources = TRUE
+ willpower_cost = 1
+
+ var/roll_type
+ var/datum/storyteller_roll/roll_datum
+ var/is_complex = FALSE
+
+ /// Stores the most recent target of the ability that succeeded
+ var/datum/weakref/last_target_ref
+ /// When the currently weakrefed target was first used.
+ var/first_target_use = 0
+
+ var/list/image/object_highlights
+
+/datum/action/cooldown/power/gift/control_machine/set_click_ability(mob/on_who)
+ . = ..()
+ if(!on_who.client)
+ return
+
+ var/existing_target = last_target_ref?.resolve()
+
+ // Movable cause i dont feel like checking EVERY EVERY atom.
+ for(var/atom/movable/nearby_atom in oview(on_who, DEFAULT_SIGHT_DISTANCE))
+ if(!length(nearby_atom.get_control_machine_options(on_who, is_complex)))
+ continue
+ var/color = COLOR_BLUE_LIGHT
+ if(nearby_atom == existing_target)
+ color = COLOR_BLUE
+
+ var/image/I = image(loc = nearby_atom)
+ I.appearance = nearby_atom.appearance
+ I.layer = nearby_atom.layer - 0.01
+ I.pixel_y = 0
+ I.pixel_x = 0
+ I.pixel_w = 0
+ I.pixel_z = 0
+
+ apply_wibbly_filters(I)
+
+ I.add_filter("control_machine", 1, outline_filter(size = 1, color = color))
+
+ LAZYINITLIST(object_highlights)
+ on_who.client.images += I
+ object_highlights += I
+
+ // Could probaly use a sound.
+
+/datum/action/cooldown/power/gift/control_machine/unset_click_ability(mob/on_who, refund_cooldown = TRUE)
+ . = ..()
+ if(!on_who.client || !object_highlights)
+ return
+ for(var/image/I in object_highlights)
+ if(I in on_who.client.images)
+ on_who.client.images -= I
+ QDEL_LAZYLIST(object_highlights)
+
+// could use sounds
+/datum/action/cooldown/power/gift/control_machine/Activate(atom/target)
+ var/choices = target.get_control_machine_options(owner, is_complex)
+ if(!length(choices))
+ return FALSE
+
+ var/choice = show_radial_menu(owner, target, choices, autopick_single_option = FALSE)
+ if(!choice)
+ return
+
+ . = ..()
+
+ if(!roll_datum)
+ roll_datum = new roll_type()
+
+ if(first_target_use + 1 SCENES < world.time) // Its been active for a whole scene. Clear it
+ last_target_ref = null
+ willpower_cost = 1
+
+ var/free_to_use = FALSE
+
+ var/last_target = last_target_ref?.resolve()
+ if(last_target == target)
+ free_to_use = TRUE
+ willpower_cost = 0
+
+ if(free_to_use)
+ target.run_control_machine(owner, choice, is_complex)
+ else if(roll_datum.st_roll(owner, target) == ROLL_SUCCESS)
+ target.run_control_machine(owner, choice, is_complex)
+ last_target_ref = WEAKREF(target)
+ first_target_use = world.time
+
+ spend_resources()
+
+ return TRUE
+
+
+/datum/action/cooldown/power/gift/control_machine/simple
+ name = "Control Simple Machine"
+ desc = "The Garou may command the spirits of the simplest machines, causing levers to flip, doors to unbolt, pulleys to roll, and so on."
+ button_icon_state = "control_simple_machine"
+
+ rank = 1
+
+ roll_type = /datum/storyteller_roll/gift/control_simple_machine
+
+// DARKPACK TODO - (gifts past rank 1)
+/datum/action/cooldown/power/gift/control_machine/complex
+ name = "Control Complex Machine"
+ desc = "Similar to Control Simple Machine, the Glass Walker may now converse with and command the spirits of electronic devices such as computers, smart phones, and cars."
+
+ rank = 3
+
+ roll_type = /datum/storyteller_roll/gift/control_complex_machine
+ is_complex = TRUE
+
+
+/atom/proc/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ RETURN_TYPE(/list)
+
+ . = list()
+
+/atom/proc/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ return
+
+
+/obj/item/grenade/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ .["prime"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_use")
+
+/obj/item/grenade/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("prime")
+ arm_grenade()
+
+
+/obj/item/lighter/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ .["light"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_use")
+
+/obj/item/lighter/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("light")
+ set_lit(!lit)
+
+
+/* Breaks due to requirng a user really hard.
+/obj/item/gun/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ .["fire"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_use")
+
+/obj/item/gun/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("fire")
+ process_fire(get_turf(src))
+*/
+
+
+/*
+/obj/machinery/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ .["unscrew"] = image(icon = 'icons/hud/radial.dmi', icon_state = "machine")
+
+/obj/machinery/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("unscrew")
+ toggle_panel_open()
+ balloon_alert(user, "maintenance hatch [panel_open ? "opened" : "closed"]")
+*/
+
+/obj/machinery/light/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ if(status != LIGHT_EMPTY)
+ .["unscrew"] = image(icon = 'icons/hud/radial.dmi', icon_state = "machine")
+
+/obj/machinery/light/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("unscrew")
+ var/obj/item/light/bulb = drop_light_tube()
+ bulb?.shatter()
+
+
+/obj/machinery/button/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ .["flick"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_use")
+
+/obj/machinery/button/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("flick")
+ attempt_press(user)
+
+
+/obj/machinery/shower/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ if(!is_complex)
+ .["turn"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_use")
+
+/obj/machinery/shower/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("turn")
+ interact(user)
+
+
+/obj/machinery/firealarm/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ if(!is_complex)
+ .["flip"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_use")
+
+/obj/machinery/firealarm/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("flip")
+ alarm(user)
+
+
+/obj/vehicle/ridden/scooter/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ if(!is_complex)
+ .["roll"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_rotate")
+
+/obj/vehicle/ridden/scooter/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("roll")
+ step(src, dir)
+
+
+/obj/structure/vampdoor/get_control_machine_options(mob/living/user, is_complex = FALSE)
+ . = ..()
+ if(!is_complex)
+ .["lock"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_rotate")
+
+/obj/structure/vampdoor/run_control_machine(mob/living/user, choice, is_complex = FALSE)
+ . = ..()
+ if(is_complex)
+ return
+ switch(choice)
+ if("lock")
+ if(!locked)
+ toggle_lock(user)
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/glasswalkers.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/glasswalkers.dm
new file mode 100644
index 000000000000..b89ef6e9f4d9
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/glasswalkers/glasswalkers.dm
@@ -0,0 +1,16 @@
+/*
+/datum/action/cooldown/power/gift/hands_full_of_thunder
+ name = "Hands Full of Thunder"
+ desc = "Invoke the machine spirits to support you in these trying times. Abstain from needing bullets when you fire a gun."
+ button_icon_state = "hands_full_of_thunder"
+ rank = 2
+ gnosis_cost = 1
+
+/datum/action/cooldown/power/gift/hands_full_of_thunder/Activate(atom/target)
+ . = ..()
+ ADD_TRAIT(owner, TRAIT_THUNDERSHOT, "thunder")
+ to_chat(owner, span_notice("You feel your fingers tingling with electricity...!"))
+ spawn(1 SCENES)
+ REMOVE_TRAIT(owner, TRAIT_THUNDERSHOT, "thunder")
+ to_chat(owner, span_notice("The buzz in your fingertips ebbs..."))
+*/
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/redtalons.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/redtalons.dm
new file mode 100644
index 000000000000..a6c015997227
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/redtalons.dm
@@ -0,0 +1,54 @@
+/datum/storyteller_roll/gift/hidden_killer
+ bumper_text = "Hidden Killer"
+ applicable_stats = list(STAT_INTELLIGENCE, STAT_LARCENY)
+
+/datum/action/cooldown/power/gift/hidden_killer
+ name = "Hidden Killer"
+ desc = "The Red Talons didn't survive for so long without learning ways to conceal themselves. This Gift allows a werewolf to leave behind no physical evidence that would betray her hand (or claws, or teeth) in a slaying."
+ button_icon_state = "hidden_killer"
+
+ click_to_activate = TRUE
+
+ rank = 1
+
+/datum/action/cooldown/power/gift/hidden_killer/Activate(atom/target)
+ var/mob/living/carbon/human/human_owner = astype(owner)
+ var/mob/living/dead_guy = astype(target)
+ if(!dead_guy || dead_guy.stat != DEAD)
+ return FALSE
+ if(!(target in range(1, owner)))
+ return FALSE
+
+ . = ..()
+
+ owner.visible_message("[src] presses a hand to [dead_guy]")
+
+ var/datum/storyteller_roll/gift/hidden_killer/roll_datum = new()
+ var/roll_result = roll_datum.st_roll(owner)
+
+ if(roll_result != ROLL_SUCCESS)
+ return TRUE
+
+ var/list/owner_blood_dna = human_owner?.get_blood_dna_list()
+ var/full_print = md5(human_owner.dna.unique_identity)
+
+ for(var/obj/effect/decal/cleanable/blood/blood_spot in range(12, owner))
+ for(var/blood_dna in GET_ATOM_BLOOD_DNA(blood_spot))
+ if(blood_dna in owner_blood_dna)
+ qdel(blood_spot)
+ break
+
+ for(var/atom/nearby_atom in range(8, owner))
+ var/datum/forensics/atom_forensics = nearby_atom.forensics
+ if(!atom_forensics)
+ continue
+
+ for(var/fingerprint in atom_forensics.fingerprints)
+ if(fingerprint == full_print)
+ atom_forensics.fingerprints -= fingerprint
+
+ for(var/bloodprint in atom_forensics.blood_DNA)
+ if(bloodprint in owner_blood_dna)
+ atom_forensics.blood_DNA -= bloodprint
+
+ return TRUE
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/shadowlords.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/shadowlords.dm
new file mode 100644
index 000000000000..16a605fd0e7d
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/shadowlords.dm
@@ -0,0 +1,119 @@
+/datum/action/cooldown/power/gift/aura_of_confidence
+ name = "Aura of Confidence"
+ desc = "The werewolf projects an aura of superiority, preventing attempts to find flaws or read auras."
+ button_icon_state = "aura_of_confidence"
+ rank = 1
+
+// Effect is permenent
+/datum/action/cooldown/power/gift/aura_of_confidence/Grant(mob/granted_to)
+ . = ..()
+ ADD_TRAIT(granted_to, TRAIT_AURA_OF_CONFIDENCE, GIFT_TRAIT)
+ SEND_SIGNAL(granted_to, COMSIG_MOB_UPDATE_AURA)
+
+/datum/action/cooldown/power/gift/aura_of_confidence/Remove(mob/removed_from)
+ . = ..()
+ REMOVE_TRAIT(removed_from, TRAIT_AURA_OF_CONFIDENCE, GIFT_TRAIT)
+ SEND_SIGNAL(removed_from, COMSIG_MOB_UPDATE_AURA)
+
+
+
+/datum/storyteller_roll/gift/fatal_flaw
+ bumper_text = "Fatal Flaw"
+ applicable_stats = list(STAT_PERCEPTION, STAT_EMPATHY)
+ numerical = TRUE
+
+
+/datum/action/cooldown/power/gift/fatal_flaw
+ name = "Fatal Flaw"
+ desc = "The Shadow Lord can spy a target's weakness, gaining an advantage in combat."
+ button_icon_state = "fatal_flaw"
+ rank = 1
+ click_to_activate = TRUE
+
+/datum/action/cooldown/power/gift/fatal_flaw/Activate(atom/target)
+ var/mob/living/living_owner = astype(owner)
+ var/mob/living/living_target = astype(target)
+ if(!living_target || (living_target == owner))
+ return FALSE
+ if(!(target in range(DEFAULT_SIGHT_DISTANCE, owner)))
+ return FALSE
+
+ . = ..()
+
+ if(!do_after(owner, 1 TURNS, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_HELD_ITEM)))
+ return TRUE
+
+ var/datum/storyteller_roll/gift/fatal_flaw/roll_datum = new()
+ roll_datum.difficulty = living_target.st_get_stats(list(STAT_WITS, STAT_SUBTERFUGE))
+ var/roll_result = roll_datum.st_roll(owner, target)
+
+ if(roll_result <= 0)
+ return TRUE
+
+ living_owner?.apply_status_effect(/datum/status_effect/fatal_flaw, target)
+ to_chat(owner, span_notice("You study [target] and discover a weakness granting you a bonus dice to attacks."))
+
+ return TRUE
+
+
+/datum/status_effect/fatal_flaw
+ id = "fatal_flaw"
+ duration = 1 SCENES
+
+ status_type = STATUS_EFFECT_REPLACE
+
+ alert_type = /atom/movable/screen/alert/status_effect/gift/fatal_flaw
+
+ var/datum/weakref/target_ref
+ var/image/highlight
+
+/datum/status_effect/fatal_flaw/on_creation(mob/living/new_owner, mob/living/target)
+ target_ref = WEAKREF(target)
+ . = ..()
+
+/datum/status_effect/fatal_flaw/on_apply()
+ RegisterSignal(owner, COMSIG_LIVING_PRE_DICE_ROLLED, PROC_REF(on_dice_rolled))
+
+ if(!owner?.client)
+ return
+
+ var/mob/living/target = target_ref?.resolve()
+
+ highlight = image(loc = target)
+ highlight.appearance = target.appearance
+ highlight.layer = target.layer - 0.01
+ highlight.pixel_y = 0
+ highlight.pixel_x = 0
+ highlight.pixel_w = 0
+ highlight.pixel_z = 0
+
+ apply_wibbly_filters(highlight)
+
+ highlight.add_filter("fatal_flaw", 1, outline_filter(size = 1, color = COLOR_PALE_GREEN_GRAY))
+
+ owner.client.images += highlight
+
+ return TRUE
+
+/datum/status_effect/fatal_flaw/on_remove()
+ owner.client?.images -= highlight
+ QDEL_NULL(highlight)
+
+ UnregisterSignal(owner, COMSIG_LIVING_PRE_DICE_ROLLED)
+
+/datum/status_effect/fatal_flaw/proc/on_dice_rolled(mob/living/roller, datum/storyteller_roll/roll_datum, atom/target)
+ SIGNAL_HANDLER
+
+ if(!istype(roll_datum, /datum/storyteller_roll/damage))
+ return
+
+ if(!target || (target != target_ref?.resolve()))
+ return
+
+ . += 1 // One extra dice
+
+
+/atom/movable/screen/alert/status_effect/gift/fatal_flaw
+ name = /datum/action/cooldown/power/gift/fatal_flaw::name
+ desc = /datum/action/cooldown/power/gift/fatal_flaw::desc
+ overlay_state = /datum/action/cooldown/power/gift/fatal_flaw::button_icon_state
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silent_striders.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silent_striders.dm
new file mode 100644
index 000000000000..37e0c0385111
--- /dev/null
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silent_striders.dm
@@ -0,0 +1,41 @@
+/datum/action/cooldown/power/gift/speed_of_thought
+ name = "Speed of Thought"
+ desc = "The Garou doubles her running speed."
+ button_icon_state = "smooth_move"
+
+ gnosis_cost = 1
+
+ rank = 1
+
+/datum/action/cooldown/power/gift/speed_of_thought/Activate(atom/target)
+ . = ..()
+ var/mob/living/living_owner = astype(owner)
+ living_owner?.apply_status_effect(/datum/status_effect/speed_of_thought)
+
+
+/datum/status_effect/speed_of_thought
+ id = "speed_of_thought"
+ duration = 1 SCENES
+
+ status_type = STATUS_EFFECT_UNIQUE
+
+ alert_type = /atom/movable/screen/alert/status_effect/gift/speed_of_thought
+
+/datum/status_effect/speed_of_thought/on_apply()
+ . = ..()
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/speed_of_thought)
+
+/datum/status_effect/speed_of_thought/on_remove()
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/speed_of_thought)
+ return ..()
+
+
+/atom/movable/screen/alert/status_effect/gift/speed_of_thought
+ name = /datum/action/cooldown/power/gift/speed_of_thought::name
+ desc = /datum/action/cooldown/power/gift/speed_of_thought::desc
+ overlay_state = /datum/action/cooldown/power/gift/speed_of_thought::button_icon_state
+
+
+/datum/movespeed_modifier/speed_of_thought
+ multiplicative_slowdown = -0.5
+
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silver_fangs.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/silver_fangs.dm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/star_gazers.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/gifts/tribes/star_gazers.dm
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm
index e5947e031686..02f75b986c38 100644
--- a/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm
+++ b/modular_darkpack/modules/werewolf_the_apocalypse/code/subsplats/tribes/garou.dm
@@ -1,4 +1,3 @@
-
/datum/subsplat/werewolf/tribe/garou
abstract_type = /datum/subsplat/werewolf/tribe/garou
fera_restriction = SPLAT_GAROU
@@ -6,21 +5,14 @@
/datum/subsplat/werewolf/tribe/garou/galestalkers
name = TRIBE_GALESTALKERS
desc = "Tireless trackers and peerless hunters, the galestalkers carry the namesake of the wind that crosses the tundra."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
- // )
+ gifts_provided = list()
subsplat_keys = /obj/item/vamp/keys/nps
/datum/subsplat/werewolf/tribe/garou/ghostcouncil
name = TRIBE_UKTENA
desc = "Seekers of mystery and highly secretive, the Uktena is one of the most misunderstood tribes. Their ranks include guides, academics and the religious."
gifts_provided = list(
- /datum/action/cooldown/power/gift/spirit_speech,
- // /datum/action/cooldown/power/gift/shroud,
- // /datum/action/cooldown/power/gift/coils_of_the_serpent,
- // /datum/action/cooldown/power/gift/banish_totem
+ // /datum/action/cooldown/power/gift/spirit_speech, // DARKPACK TODO - (Selectable Gifts)
)
subsplat_keys = /obj/item/vamp/keys/nps
@@ -29,20 +21,15 @@
desc = "Growing, creating, cultivating and maintaining the most natural of Gaia's creations, the Wardens are some of the closest to nature. Wherever they are, they coax Gaia's blessing out of whatever they can."
gifts_provided = list(
/datum/action/cooldown/power/gift/faerie_light,
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
)
subsplat_keys = /obj/item/vamp/keys/nps
/datum/subsplat/werewolf/tribe/garou/glasswalkers
name = TRIBE_GLASS_WALKERS
desc = "The closest to the Weaver, they find themselves deeply entrenched in modern human society, religion, technology and cities. Every new invention and every new discovery is one that aids the Glass Walkers, instead of impeding them."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/smooth_move,
- // /datum/action/cooldown/power/gift/digital_feelings,
- // /datum/action/cooldown/power/gift/elemental_improvement
- // )
+ gifts_provided = list(
+ /datum/action/cooldown/power/gift/control_machine/simple,
+ )
subsplat_keys = /obj/item/vamp/keys/techstore
/datum/subsplat/werewolf/tribe/garou/bonegnawers
@@ -50,9 +37,6 @@
desc = "Survivors and scavengers, often destitute and homeless. The Gnawers are seen as mongrels who live off scraps, but they know better. They're the true survivors, patiently waiting for their moment to strike against overconfident foes."
gifts_provided = list(
/datum/action/cooldown/power/gift/desperate_strength,
- // /datum/action/cooldown/power/gift/guise_of_the_hound,
- // /datum/action/cooldown/power/gift/infest,
- // /datum/action/cooldown/power/gift/gift_of_the_termite
)
subsplat_keys = /obj/item/vamp/keys/children_of_gaia
@@ -60,11 +44,9 @@
name = TRIBE_CHILDREN_OF_GAIA
desc = "Peacekeepers, negotiators, treaty-makers and philosophers. The Children of Gaia strive as hard as they can create an understanding and unity between the disparate tribes that will allow them to form a united front against their foes."
gifts_provided = list(
- /datum/action/cooldown/power/gift/mothers_touch,
- /datum/action/cooldown/power/gift/resist_pain,
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
+ /datum/action/cooldown/power/gift/jam_weapon
+ // /datum/action/cooldown/power/gift/mothers_touch, // DARKPACK TODO - (Selectable Gifts)
+ // /datum/action/cooldown/power/gift/resist_pain, // DARKPACK TODO - (Selectable Gifts)
)
subsplat_keys = /obj/item/vamp/keys/children_of_gaia
@@ -72,10 +54,9 @@
name = TRIBE_GET_OF_FENRIS
desc = "Warriors, compassionate and fierce. They view themselves are Gaia's strongest heroes, but the rest of the tribes view them with caution, their violence more famous than their courage."
gifts_provided = list(
+ // /datum/action/cooldown/power/gift/razor_claws, // DARKPACK TODO - (Selectable Gifts)
+ // /datum/action/cooldown/power/gift/resist_pain, // DARKPACK TODO - (Selectable Gifts)
/datum/action/cooldown/power/gift/visage_of_fenris,
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
)
subsplat_keys = /obj/item/vamp/keys/nps
@@ -84,68 +65,58 @@
desc = "An all-female tribe, and the matriarchs of the Garou. The Black Furies are known fondly for their honor, wisdom, pride and impressive prowess in battle."
gifts_provided = list(
/datum/action/cooldown/power/gift/breath_of_the_wyld,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
)
subsplat_keys = /obj/item/vamp/keys/nps
/datum/subsplat/werewolf/tribe/garou/silentstriders
name = TRIBE_SILENT_STRIDERS
desc = "Highly spiritual nomads, the Silent Striders have headed deeper and longer into the depths of the Umbra than any other tribe."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
- // )
+ gifts_provided = list(
+ // /datum/action/cooldown/power/gift/sense_wyrm, // DARKPACK TODO - (Selectable Gifts)
+ /datum/action/cooldown/power/gift/speed_of_thought,
+ )
subsplat_keys = /obj/item/vamp/keys/nps
/datum/subsplat/werewolf/tribe/garou/shadowlords
name = TRIBE_SHADOW_LORDS
desc = "The closest one could consider a Garou to being a 'politician'. They manipulate the tribes, and their enemies, and rely on cunning and wits more than physical strength. Not to say there aren't adept warriors in their ranks, but the tribe tends towards brains than brawn."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
- // )
+ gifts_provided = list(
+ /datum/action/cooldown/power/gift/aura_of_confidence,
+ /datum/action/cooldown/power/gift/fatal_flaw,
+ )
subsplat_keys = /obj/item/vamp/keys/techstore
/datum/subsplat/werewolf/tribe/garou/redtalons
name = TRIBE_RED_TALONS
desc = "Exclusively consisting of lupus, the Red Talons shun humanity and think of them as a blight on Gaia."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
- // )
+ gifts_provided = list(
+ // /datum/action/cooldown/power/gift/beast_speech, // DARKPACK TODO - (Selectable Gifts)
+ /datum/action/cooldown/power/gift/hidden_killer,
+ )
/datum/subsplat/werewolf/tribe/garou/silverfangs
name = TRIBE_SILVER_FANGS
desc = "Commonly known as the 'Alphas' of the Garou Nation, their ranks consist of traditional rulers and wartime leaders. Known for being honorable and having courage, odd mental quirks have begun plaguing their young members, and the tribe is beginning to suffer from diseases of the spirit and mind."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
- // )
+ gifts_provided = list(
+ // /datum/action/cooldown/power/gift/inspiration, // DARKPACK TODO - (Selectable Gifts)
+ )
subsplat_keys = /obj/item/vamp/keys/nps
/datum/subsplat/werewolf/tribe/garou/stargazers
name = TRIBE_STARGAZERS
desc = "The calmest of the Garou, they are well known for their introversion. They are the smallest of the remaining tribes, many of their kind wiped out by the Wyrm."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/freezing_wind,
- // /datum/action/cooldown/power/gift/bloody_feast
- // )
+ gifts_provided = list()
subsplat_keys = /obj/item/vamp/keys/nps
/datum/subsplat/werewolf/tribe/garou/blackspiraldancers
name = TRIBE_BLACK_SPIRAL_DANCERS
desc = "The lost tribe. The dreadwolves. Those who dance lockstep with the Wyrm. They who have entered the labyrinth and come back, changed.\n{THIS IS AN ADVANCED TRIBE AND NOT RECOMMENDED FOR BEGINNERS. LORE KNOWLEDGE IS REQUIRED TO PLAY THIS TRIBE}"
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/stinky_fur,
- // /datum/action/cooldown/power/gift/venom_claws,
- // /datum/action/cooldown/power/gift/burning_scars
- // )
+ gifts_provided = list(
+ /datum/action/cooldown/power/gift/bane_protector,
+ // /datum/action/cooldown/power/gift/resist_pain, // DARKPACK TODO - (Selectable Gifts)
+ // /datum/action/cooldown/power/gift/sense_wyrm, // DARKPACK TODO - (Selectable Gifts)
+ )
+ // tribe_trait = TRAIT_WYRMTAINTED_SPRITE
/datum/subsplat/werewolf/tribe/garou/blackspiraldancers/psychomania_effect(mob/living/target, mob/living/owner)
target.playsound_local(target, "modular_darkpack/modules/powers/sounds/daimonion_laughs/demonlaugh3.ogg", 50, FALSE)
@@ -155,9 +126,4 @@
/datum/subsplat/werewolf/tribe/garou/ronin
name = TRIBE_RONIN
desc = "Garou who, for one reason or another, find themselves as outcasts of the Nation."
- // gifts_provided = list(
- // /datum/action/cooldown/power/gift/guise_of_the_hound,
- // /datum/action/cooldown/power/gift/stoic_pose,
- // /datum/action/cooldown/power/gift/smooth_move,
- // /datum/action/cooldown/power/gift/shroud
- // )
+ gifts_provided = list()
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/basic/banes.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/basic/banes.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..76eafbcf10ca9e770c28e32686474887072c7d9f
GIT binary patch
literal 1937
zcmV;C2X6R@P)V=-0C=2T%drlEFcbyQx$i4(U^T`fYZn7C9pD#CwGVg+v`Jev{=I{P#_H|A_#oWWG%n6T#!C)WF_uBOc!eE8E;S0quAR1|g@V#cRYNeewAnx~
zfgF5s6#|JMhx(A(wFnVDg%S&IAYhP;z&ccqZ|
zK(M>g>b*B_X5O3KH-JDO5C{Z<_lqxYC6sg5?kXR;4oBr9D>t40?ST^R>%rDy9F1y#
zX3)V7xE*lr+FfO1AqD{GAD(SU12lsUcERm{t;IO{hi3r*r`pe;e|Q$b&%U)?v1Zr7
zF1Q^)hTr=6D{SXCajN|c)?X!TSFG7}unTSnygasI9zT0@1>5;eTNQd=bg&CcLHI*P
zkphMy1&n&HA4UuB4X@w6#k0jLytmm(BXy7h5&%Hf3x>L@djLRg@fma-T88WYxE;_a
zqSHGH0QmiR%q=fBL
zfQ(;%mB521Pw@Eu0Dw{^0u%$`H@~bY)BtwEHvYy!3>ynEv*9asSbvp(-=BvQdH_I5
zFPIIzG&65rr(-RnA*C0%{_{WwR2sjv7)QrYq-q1aJho!H@gzT)&Vm+R9Yc|tI&3V&
zFt@zys1u}sgc~pJ;l_)5$f>KysjKF>83#D1>40j+|Nh6{_~g{5W&_ZtV<_UN@o!%5
z006p2qxj+C#j=jT>Hs+F1a(*UXc-L;FHa-)e963?d%lE+m#3j+G*Do!mqVu@GM?>e
zttU>HJ+Wgbg000k0Oxz)=O2#%C^~|i!0K@6YRc3jna(<*
z_>-+(0L4JtKRkA-DL9PPrG6y>kl4H1~JPy^s?t
z2G2Bfr~@jE?`mhAP$HSm!i%%@%B_poq<1Phy`zNtdhq6T)Xad$36*pmzkqEx^H@TW
z0_I{%%V-#!7%NLfmuBYCDfc2W62w5Jt?soz%@`1y^iHjF1tuo;YJ^+=|(
zHRH_5y#&As`9Lua4EWl>I)aWAR1|WGeA=ifU*%l=e!OOSU_&^8FGuysC6z7
z2m}IwKp+qZ1OkCTAP@)yf=albT~mc{<(r>c*PWoU4&M!#PU*p2o^E%2JTGi{2qEhQ
zgZE|lQFTb^g?+W43cyvG4sh;}sjQEGdgr$B^v-P~G7>b4l&tI$sTXpzmeEXkq|4yM
zn4_`@MG6>$6Jua)COxEp1l|`jmN#hFRUglTx~qGT0ArxGPZzf!o7tE1DV_hFF!vrY
zdJ$c%Fv)6xDi7+e?xC09WVn@rsG~wMNr%Wt(9-*0t`R`OXzpX3Kt-#(8x*WS(+&W9
z{nsP_;Nj(I$K?{VCjbDXJ-LqUkYOPYR})6p+^Py7d6l*LZb5qjSY52Z9RsKYqngkG
zUmH|Sx2#OPOlcWUG1&2M39<{?6JWI>j^MuO&+&1i)?6PM3F5oCIak&JG!3%4xHbCN
zOoygID^+m-=Ln$s_?vRCxiu3g&i|B&@Ycs$ft42lGyS5o!bUb%0vby#sC24fBMyx5n!i$?lg31X1;2=8BeUZmJTk>%p<3+
zR?WuTf@Deo2|0Duvh8(GK~q}BqX1@od}R=(U<5eZ`vI78Slo01D~sB}YBInz0@#LS
z1+vF(J&!4^J_}`!Cfs2E3fOukW+@FV4*mW0@qp$^AXImCPbm{}KNYQJx7Civ9Rn&?
z!|bt}4N*-Gx3R-+OAq5Jhr64@zm{A#>+;oI-6Oa7j7HhrH1+X~uFG$
literal 0
HcmV?d00001
diff --git a/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_abilities.dmi b/modular_darkpack/modules/werewolf_the_apocalypse/icons/werewolf_abilities.dmi
index 115c799106edb865b9fa7dd19ccf3be8017d7a37..c7d80d11f83f2b9c6ca768040463a1dd8732e52b 100644
GIT binary patch
literal 20008
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
Date: Sun, 14 Jun 2026 19:10:24 +0000
Subject: [PATCH 06/20] Automatic changelog for PR #987 [ci skip]
---
html/changelogs/AutoChangeLog-pr-987.yml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-987.yml
diff --git a/html/changelogs/AutoChangeLog-pr-987.yml b/html/changelogs/AutoChangeLog-pr-987.yml
new file mode 100644
index 000000000000..645763b78351
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-987.yml
@@ -0,0 +1,9 @@
+author: "FalloutFalcon, Major00"
+delete-after: True
+changes:
+ - rscadd: "Adds new gifts: Jam Weapon (Children of Gaia), Control Simple Machine (Glasswalker), Hidden Killer (Red Talon), Aura of confidence & Fatal Flaw (Shadow Lords), Speed of Thought (Silent Striders), Bane Protector (BSD)"
+ - rscadd: "Adds some little lesser banes"
+ - qol: "powers that spend willpower log it to chat"
+ - qol: "removes pointless to_chat that just says \"you cast gift\" as most have better built in feedback"
+ - image: "\"Tribe gifts: Part 1\" gifts now have unique icons"
+ - code_imp: "adds signal that code can hook onto to change bonus dice of rolls"
\ No newline at end of file
From a98d42e6f38f350879fb35ff8c4eef08c5a20a43 Mon Sep 17 00:00:00 2001
From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Date: Sun, 14 Jun 2026 14:10:33 -0500
Subject: [PATCH 07/20] Reworks Melee to use rolls and stats (#1015)
## About The Pull Request
Mostly reproduces the same code as brawl.
This needs a followup pr with a ton of balance tweaks for the weapons,
we have some varibles that lets us replicate ttrpg stuff. (like attack
difficulty)
## Why It's Good For The Game
This has alot of balance effects but TTRPG accuraecy and parody with
brawl is good.
## Changelog
:cl:
balance: Reworks melee to roll damage based off two rolls (to parody the
TTRPG and brawl)
balance: Protean claws use brawl
refactor: Removes snowflake protean claws damage buff in favor of
generic melee code
/:cl:
---------
Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
---
code/_onclick/item_attack.dm | 37 +++++++++++++++----
code/modules/unit_tests/novaflower_burn.dm | 1 +
.../master_files/code/game/objects/items.dm | 6 +++
.../powers/code/discipline/protean/claws.dm | 7 +---
4 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index ae36b8552164..358aa249d23f 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -312,12 +312,16 @@
return ATTACK_FAILED
var/final_force = CALCULATE_FORCE(attacking_item, attack_modifiers)
-// DARKPACK EDIT ADD START
- if(isliving(user))
- var/mob/living/living_user = user
- var/stat_multiplier = living_user.st_get_stat(STAT_MELEE) * 0.4
- final_force *= stat_multiplier
-// DARKPACK EDIT ADD END
+ // DARKPACK EDIT ADD START - STORYTELLER_ROLLS/STORYTELLER_STATS
+ // This is pretty evil, but we are gonna convert all the tg force into the +# that melee weapons have listed.
+ // This means we can do stuff like set force of a baseball bat to 2 TTRPG_DAM and it just works.
+ if(isliving(user) && !HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER))
+ var/bonus_dice = round(final_force / (1 TTRPG_DAMAGE))
+ var/datum/storyteller_roll/damage/damage_roll = new()
+ damage_roll.applicable_stats = list(attacking_item.st_damage_stat)
+ var/damage_roll_result = damage_roll.st_roll(user, src, bonus_dice)
+ final_force = damage_roll_result TTRPG_DAMAGE
+ // DARKPACK EDIT ADD END
if(final_force <= 0)
return 0
@@ -358,8 +362,25 @@
if(mob_biotypes & (MOB_ROBOTIC|MOB_MINERAL|MOB_SKELETAL)) // this should probably check hit bodypart for humanoids
final_force *= attacking_item.get_demolition_modifier(src)
- // DARKPACK EDIT ADD START - (Makes Melee do Something)
- final_force += final_force * (user.st_get_stat(STAT_MELEE) * 0.1)
+ // DARKPACK EDIT ADD START - STORYTELLER_ROLLS/STORYTELLER_STATS
+ if(isliving(user) && !HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER))
+ var/datum/storyteller_roll/attack/attack_roll = new()
+ attack_roll.applicable_stats = list(attacking_item.st_attack_ability, attacking_item.st_attack_attribute)
+ attack_roll.difficulty = attacking_item.attack_difficulty
+ var/attack_roll_result = attack_roll.st_roll(user, src)
+
+ // What i want to do is acctually have it return if not success. But that creates bad visual feedback as all the FX still play. just give them them SOME damage..
+ if(attack_roll_result == ROLL_SUCCESS)
+ // This is pretty evil, but we are gonna convert all the tg force into the +# that melee weapons have listed.
+ // This means we can do stuff like set force of a baseball bat to 2 TTRPG_DAM and it just works.
+ var/bonus_dice = round(final_force / (1 TTRPG_DAMAGE))
+ var/datum/storyteller_roll/damage/damage_roll = new()
+ damage_roll.applicable_stats = list(attacking_item.st_damage_stat)
+ var/damage_roll_result = damage_roll.st_roll(user, src, bonus_dice)
+
+ final_force = max(damage_roll_result TTRPG_DAMAGE, 1 TTRPG_DAMAGE)
+ else
+ final_force = 1 TTRPG_DAMAGE // "SOME damage" in question
// DARKPACK EDIT ADD END
var/wounding = attacking_item.wound_bonus
diff --git a/code/modules/unit_tests/novaflower_burn.dm b/code/modules/unit_tests/novaflower_burn.dm
index 165a738fda30..a9903dfca37c 100644
--- a/code/modules/unit_tests/novaflower_burn.dm
+++ b/code/modules/unit_tests/novaflower_burn.dm
@@ -20,6 +20,7 @@
botanist.adjust_fire_loss(-100)
// And give them the plant safe trait so we don't have to worry about attacks being cancelled
ADD_TRAIT(botanist, TRAIT_PLANT_SAFE, "unit_test")
+ ADD_TRAIT(botanist, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS) // DARKPACK EDIT ADD - (Ensure melee rolls dont skew damage)
// Now, let's get a smack with the novaflower and see what happens.
weapon.melee_attack_chain(botanist, victim)
diff --git a/modular_darkpack/master_files/code/game/objects/items.dm b/modular_darkpack/master_files/code/game/objects/items.dm
index 0ba0a0b0bbaa..381615140712 100644
--- a/modular_darkpack/master_files/code/game/objects/items.dm
+++ b/modular_darkpack/master_files/code/game/objects/items.dm
@@ -2,3 +2,9 @@
var/onflooricon
var/onflooricon_state
var/masquerade_violating
+
+ // STORYTELLR_STATS
+ var/datum/st_stat/st_attack_ability = STAT_DEXTERITY
+ var/datum/st_stat/st_attack_attribute = STAT_MELEE
+ var/attack_difficulty = 6
+ var/datum/st_stat/st_damage_stat = STAT_STRENGTH
diff --git a/modular_darkpack/modules/powers/code/discipline/protean/claws.dm b/modular_darkpack/modules/powers/code/discipline/protean/claws.dm
index 0e6186356fc7..48569fad6a19 100644
--- a/modular_darkpack/modules/powers/code/discipline/protean/claws.dm
+++ b/modular_darkpack/modules/powers/code/discipline/protean/claws.dm
@@ -12,15 +12,10 @@
item_flags = DROPDEL
masquerade_violating = TRUE
obj_flags = NONE
+ st_attack_attribute = STAT_BRAWL
/obj/item/gangrel_claws/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_NODROP, INNATE_TRAIT)
ADD_TRAIT(src, TRAIT_NATURAL, INNATE_TRAIT)
-/obj/item/gangrel_claws/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
- . = ..()
- // Based on V20
- if(isliving(user))
- var/mob/living/living_user = user
- force = (living_user.st_get_stat(STAT_STRENGTH) + 1) TTRPG_DAMAGE
From a445abbb5c5f69e3c8bf4314921886e9e3d86199 Mon Sep 17 00:00:00 2001
From: "darkpack13-api[bot]"
<220339179+darkpack13-api[bot]@users.noreply.github.com>
Date: Sun, 14 Jun 2026 19:10:55 +0000
Subject: [PATCH 08/20] Automatic changelog for PR #1015 [ci skip]
---
html/changelogs/AutoChangeLog-pr-1015.yml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-1015.yml
diff --git a/html/changelogs/AutoChangeLog-pr-1015.yml b/html/changelogs/AutoChangeLog-pr-1015.yml
new file mode 100644
index 000000000000..bb8896daa5d3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1015.yml
@@ -0,0 +1,6 @@
+author: "FalloutFalcon"
+delete-after: True
+changes:
+ - balance: "Reworks melee to roll damage based off two rolls (to parody the TTRPG and brawl)"
+ - balance: "Protean claws use brawl"
+ - refactor: "Removes snowflake protean claws damage buff in favor of generic melee code"
\ No newline at end of file
From 394cfef1af871f7d634efe21ace5ee213737b8df Mon Sep 17 00:00:00 2001
From: dwinters99 <65516417+dwinters99@users.noreply.github.com>
Date: Sun, 14 Jun 2026 21:02:39 -0400
Subject: [PATCH 09/20] Mapping DLC 2026 (#1144)
## About The Pull Request
some new map goodies for mappers @DarkPack13/maptainers
all sprites except for torches, barrels, pallets, and trash by @Major00
barrels, pallets and trash by INFRARED_BARON
torches by me (@dwinters99)
## Why It's Good For The Game
decor !!
## Changelog
:cl: dwinters99, Major00, INFRARED_BARON
add: sleeping bags
add: carwash rollers, torches, and grates (2 kinds)
add: fallout shelter signs (2 kinds)
add: bollards (4 kinds)
image: new urinal sprite
add: new table type + addons
add: cigarette shelves
add: metal rack
add: commercial freezers
image: onfloors for ketchup, mustard, forks, knives, and spoons
add: new trash and alleyway sprites (all by INFRARED_BARON)
add: lectern and pulpit
/:cl:
---------
Co-authored-by: chazzyjazzy <33268885+chazzyjazzy@users.noreply.github.com>
---
code/__DEFINES/icon_smoothing.dm | 1 +
.../objects/effects/spawners/random/trash.dm | 2 +
.../objects/structures/beds_chairs/bed.dm | 3 +-
.../crates_lockers/closets/secure/freezer.dm | 3 +-
.../equipment/kitchen_utensils.dm | 7 ++
.../reagents/reagent_containers/condiment.dm | 2 +
.../darkpack/fastfood_table.dmi | Bin 0 -> 2543 bytes
.../darkpack/fastfood_table.png | Bin 0 -> 630 bytes
.../darkpack/fastfood_table.png.toml | 2 +
.../darkpack/fastfood_table_addon1.dmi | Bin 0 -> 2472 bytes
.../darkpack/fastfood_table_addon1.png | Bin 0 -> 634 bytes
.../darkpack/fastfood_table_addon1.png.toml | 2 +
.../darkpack/fastfood_table_addon2.dmi | Bin 0 -> 2616 bytes
.../darkpack/fastfood_table_addon2.png | Bin 0 -> 652 bytes
.../darkpack/fastfood_table_addon2.png.toml | 2 +
.../darkpack/fastfood_table_addon3.dmi | Bin 0 -> 2889 bytes
.../darkpack/fastfood_table_addon3.png | Bin 0 -> 685 bytes
.../darkpack/fastfood_table_addon3.png.toml | 2 +
.../master_files/icons/obj/bed.dmi | Bin 0 -> 5749 bytes
.../icons/obj/bed_inhand_left.dmi | Bin 0 -> 305 bytes
.../icons/obj/bed_inhand_right.dmi | Bin 0 -> 305 bytes
.../icons/obj/food/containers.dmi | Bin 0 -> 339 bytes
.../icons/obj/service/kitchen/kitchen.dmi | Bin 2572 -> 1738 bytes
.../icons/obj/storage/closet32x32.dmi | Bin 2539 -> 1864 bytes
.../master_files/icons/obj/watercloset.dmi | Bin 35499 -> 35900 bytes
.../modules/decor/code/bollards.dm | 18 +++++
.../modules/decor/code/carwash.dm | 16 ++++
.../modules/decor/code/cigarette_shelf.dm | 15 ++++
.../modules/decor/code/commercial_freezer.dm | 7 ++
modular_darkpack/modules/decor/code/decor.dm | 75 +++++++++++++++++-
.../decor/code/fallout_shelter_sign.dm | 11 +++
modular_darkpack/modules/decor/code/grate.dm | 25 ++++++
.../modules/decor/code/lectern.dm | 14 ++++
modular_darkpack/modules/decor/code/racks.dm | 3 +
.../modules/decor/code/sleeping_bag.dm | 71 +++++++++++++++++
modular_darkpack/modules/decor/code/tables.dm | 38 +++++++++
modular_darkpack/modules/decor/code/torch.dm | 12 +++
modular_darkpack/modules/decor/code/trash.dm | 20 ++++-
.../modules/decor/icons/alleyway.dmi | Bin 1398 -> 1858 bytes
.../modules/decor/icons/alleyway_32x48.dmi | Bin 0 -> 620 bytes
.../modules/decor/icons/barrels.dmi | Bin 4841 -> 6171 bytes
.../modules/decor/icons/bed_onfloor.dmi | Bin 0 -> 417 bytes
.../modules/decor/icons/bollards.dmi | Bin 0 -> 518 bytes
.../modules/decor/icons/carwash.dmi | Bin 0 -> 1065 bytes
.../modules/decor/icons/cigarette_shelf.dmi | Bin 0 -> 4292 bytes
.../decor/icons/fallout_shelter_sign.dmi | Bin 0 -> 329 bytes
.../modules/decor/icons/grate.dmi | Bin 0 -> 537 bytes
.../modules/decor/icons/lectern.dmi | Bin 0 -> 683 bytes
modular_darkpack/modules/decor/icons/rack.dmi | Bin 6180 -> 6585 bytes
.../modules/decor/icons/torch.dmi | Bin 0 -> 3056 bytes
.../modules/decor/icons/trash.dmi | Bin 6965 -> 11739 bytes
tgstation.dme | 9 +++
52 files changed, 353 insertions(+), 7 deletions(-)
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table.dmi
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table.png
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table.png.toml
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon1.dmi
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon1.png
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon1.png.toml
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon2.dmi
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon2.png
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon2.png.toml
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon3.dmi
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon3.png
create mode 100644 icons/obj/smooth_structures/darkpack/fastfood_table_addon3.png.toml
create mode 100644 modular_darkpack/master_files/icons/obj/bed.dmi
create mode 100644 modular_darkpack/master_files/icons/obj/bed_inhand_left.dmi
create mode 100644 modular_darkpack/master_files/icons/obj/bed_inhand_right.dmi
create mode 100644 modular_darkpack/master_files/icons/obj/food/containers.dmi
create mode 100644 modular_darkpack/modules/decor/code/bollards.dm
create mode 100644 modular_darkpack/modules/decor/code/carwash.dm
create mode 100644 modular_darkpack/modules/decor/code/cigarette_shelf.dm
create mode 100644 modular_darkpack/modules/decor/code/commercial_freezer.dm
create mode 100644 modular_darkpack/modules/decor/code/fallout_shelter_sign.dm
create mode 100644 modular_darkpack/modules/decor/code/grate.dm
create mode 100644 modular_darkpack/modules/decor/code/lectern.dm
create mode 100644 modular_darkpack/modules/decor/code/sleeping_bag.dm
create mode 100644 modular_darkpack/modules/decor/code/torch.dm
create mode 100644 modular_darkpack/modules/decor/icons/alleyway_32x48.dmi
create mode 100644 modular_darkpack/modules/decor/icons/bed_onfloor.dmi
create mode 100644 modular_darkpack/modules/decor/icons/bollards.dmi
create mode 100644 modular_darkpack/modules/decor/icons/carwash.dmi
create mode 100644 modular_darkpack/modules/decor/icons/cigarette_shelf.dmi
create mode 100644 modular_darkpack/modules/decor/icons/fallout_shelter_sign.dmi
create mode 100644 modular_darkpack/modules/decor/icons/grate.dmi
create mode 100644 modular_darkpack/modules/decor/icons/lectern.dmi
create mode 100644 modular_darkpack/modules/decor/icons/torch.dmi
diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm
index 21747c742922..9eb09cf8f2e2 100644
--- a/code/__DEFINES/icon_smoothing.dm
+++ b/code/__DEFINES/icon_smoothing.dm
@@ -244,6 +244,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
#define SMOOTH_GROUP_COLOR_COUNTERTOP S_OBJ(90) ///obj/structure/table/countertop/(color)
// DARKPACK EDIT END
#define SMOOTH_GROUP_CITY_LOW_WALL S_TURF(91) ///obj/structure/platform/lowwall // DARKPACK EDIT ADD - WALLS
+#define SMOOTH_GROUP_FF_TABLES S_OBJ(92) ///obj/structure/table/countertop/fastfood // DARKPACK EDIT ADD - DECOR
/// Performs the work to set smoothing_groups and canSmoothWith.
/// An inlined function used in both turf/Initialize and atom/Initialize.
diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
index d5a510a071d6..e80fde513eaf 100644
--- a/code/game/objects/effects/spawners/random/trash.dm
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -187,6 +187,8 @@
icon_state = "vomit"
loot = list(
/obj/effect/decal/cleanable/trash = 20, // DARKPACK EDIT ADD START
+ /obj/effect/decal/cleanable/trash/big = 6,
+ /obj/effect/decal/cleanable/trash/books = 6,
/obj/effect/decal/cleanable/litter = 6,
/obj/effect/decal/cleanable/cardboard = 6, // DARKPACK EDIT ADD END
/obj/effect/decal/cleanable/dirt = 6,
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index c6435e1973d7..c286b7fa2c8d 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -11,8 +11,7 @@
name = "bed"
desc = "This is used to lie in, sleep in or strap on."
icon_state = "bed"
- icon = 'icons/obj/bed.dmi'
- anchored = TRUE
+ icon = 'modular_darkpack/master_files/icons/obj/bed.dmi' // DARKPACK EDIT CHANGE
can_buckle = TRUE
buckle_lying = 90
buckle_dir = SOUTH
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index c9986bae481f..64628e508b5a 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -4,6 +4,7 @@
icon = 'modular_darkpack/master_files/icons/obj/storage/closet32x32.dmi' // DARKPACK EDIT ADD
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
// DARKPACK EDIT CHANGE START
+ base_icon_state = "freezer"
door_anim_time = 0
enable_door_overlay = FALSE
has_opened_overlay = FALSE
@@ -23,7 +24,7 @@
// DARKPACK EDIT ADD START - handles fridge open/close states since parent type handles it alot differently
/obj/structure/closet/secure_closet/freezer/update_icon_state()
. = ..()
- icon_state = opened ? "freezeropen" : "freezer"
+ icon_state = opened ? "[base_icon_state]open" : "[base_icon_state]"
// DARKPACK EDIT ADD END
/obj/structure/closet/secure_closet/freezer/process_internal_air(seconds_per_tick)
diff --git a/code/modules/food_and_drinks/equipment/kitchen_utensils.dm b/code/modules/food_and_drinks/equipment/kitchen_utensils.dm
index 4991cffe03ce..920cec2408a5 100644
--- a/code/modules/food_and_drinks/equipment/kitchen_utensils.dm
+++ b/code/modules/food_and_drinks/equipment/kitchen_utensils.dm
@@ -22,6 +22,7 @@
/obj/item/kitchen/fork
name = "fork"
+ ONFLOOR_ICON_HELPER('modular_darkpack/master_files/icons/obj/service/kitchen/kitchen.dmi') // DARKPACK EDIT ADD
desc = "Pointy."
icon_state = "fork"
icon_angle = -90
@@ -90,6 +91,7 @@
/obj/item/knife/kitchen
name = "kitchen knife"
+ ONFLOOR_ICON_HELPER('modular_darkpack/master_files/icons/obj/service/kitchen/kitchen.dmi') // DARKPACK EDIT ADD
desc = "A general purpose Chef's Knife made by Cookoff Incorporated. Guaranteed to stay sharp for years to come." // DARKPACK EDIT CHANGE
/obj/item/knife/plastic
@@ -197,6 +199,7 @@
/obj/item/kitchen/spoon
name = "spoon"
+ ONFLOOR_ICON_HELPER('modular_darkpack/master_files/icons/obj/service/kitchen/kitchen.dmi') // DARKPACK EDIT ADD
desc = "Just be careful your food doesn't melt the spoon first."
icon_state = "spoon"
base_icon_state = "spoon"
@@ -245,6 +248,10 @@
/obj/item/kitchen/spoon/update_overlays()
. = ..()
+ // DARKPACK EDIT ADD START - WORLD_ICON
+ if(item_flags & ACTIVE_WORLD_ICON) // World icons have nothing but the base state atm
+ return
+ // DARKPACK EDIT ADD END
if(reagents.total_volume <= 0)
return
var/mutable_appearance/filled_overlay = mutable_appearance(icon, "[base_icon_state]_filled")
diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm
index bcf0cc7e76c0..565f1539b32c 100644
--- a/code/modules/reagents/reagent_containers/condiment.dm
+++ b/code/modules/reagents/reagent_containers/condiment.dm
@@ -331,6 +331,7 @@
/obj/item/reagent_containers/condiment/ketchup
name = "ketchup"
+ ONFLOOR_ICON_HELPER('modular_darkpack/master_files/icons/obj/food/containers.dmi') // DARKPACK EDIT ADD
// At time of writing, "ketchup" mechanically, is just ground tomatoes,
// rather than // tomatoes plus vinegar plus sugar.
desc = "A tomato slurry in a tall plastic bottle. Somehow still vaguely American."
@@ -340,6 +341,7 @@
/obj/item/reagent_containers/condiment/mustard
name = "mustard"
+ ONFLOOR_ICON_HELPER('modular_darkpack/master_files/icons/obj/food/containers.dmi') // DARKPACK EDIT ADD
desc = "A spicy and tangy sauce made out of the mustard plant. Great on hotdogs!"
icon_state = "mustard"
list_reagents = list(/datum/reagent/consumable/mustard = 50)
diff --git a/icons/obj/smooth_structures/darkpack/fastfood_table.dmi b/icons/obj/smooth_structures/darkpack/fastfood_table.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..0762bebba22d1f4086a8ef0112ff8000ec2a0106
GIT binary patch
literal 2543
zcmb7GXH-+!7EXeYNRhViA&vyF!AS8T&w!N6AR=HvDT+!F5wIWu0qK{3z=%NtLs0<<
zAP6WWf=H8M5D`Hm(z{V0KuAy%l91#klX>&rk2imw^W&Vo_Bnf>z1IG|Z?BVj;`m_&
zSq)hj45r{UVVAK%Fj!>4gWRXG4LpuMcr;^EKY4cJ^%H(
z>5FY!X5Cl1zBGSt`k4?Hxw5^-t+(LPy-Wr7*0C)pMZ2Du5R2!=Ge=&>Q1|JXDYj;p
zd)}VJ>@&`p#0-wt4fW8e;$A-7RQG-3aUic6218Xl*#6=gS-_ZndetpJz2_TdY0FgW
zXm=6*-pRV=TWZ}7kF}m0t0{Jlk641Y*mNImZz0@is9$mzT5pv7YH4fqZOV@Q6t?c%yzsG(b~b)`&px7J3IC
z%(@#~W3wKK^Ye(FbO!pGRdLGdH^`gYE?q{vCv$W7ilD>1;e^h6Y-I}e%j#MPY;=aO
z;1w7YSgr4^7hqJNcX(-?|9P&uyXOvaet4q7BaU6AZ%|M;rGPIadI}ig;P12}a(j5O
zAN!5S9v&XEUcBhy53Kr7F?wYHtq4eyyh}
z^9@9)p!XP(*-)VLP(;_sVOO>3cXy*8%L@?1Lbu5}GI=5kT&(<@aD`4Ns+pFQ`+J!D
z37wKgXKsY9RRx+f?92Noq!Jr8`+)xLFac;nCduF<J}!dlf7EiFC?j?G|V)0k)qL-?S<|(tlXWbc$E6(nhQa
zlKOs4-7-(1KG@G!
z`$_^$qpjk$6c##R#Y@0dOEiG+zYC%6c{X9mV@`L^J%rCyZwW9=Ydb^
zYo@}eA7k`ii9eJH1w+Stme$?c4)=d8FWJW)IdsN1336Jh0GoUOEz6Eo`Zkx{?b_;!Itt-w4Yej0y*`Z1DbFzg!(J$@QC5ij5G)r26(67J-t6>GE6h`5|&jHnB`Xu
zYyjT{n)h&~Q;Pj`Wc>kzhzPcf=&<+sgCaLgxGJ6`Vju1-v8>}tO%TR%;ZtrM8?&CG
zGnll#sbkLJb6MKX7_Zm4r6?$ElH^~4GD`BChPzr02Gg<(4ut{Q#opLyrZRuMuEBLp
zfR2%y;IeXH##~jqMWlX)=+nU(v?a1%Bm!&zpAoQA#Ms>i8jw%IyPU=_^bK@Wr3Vf#$xS`a1LMQB1
zrX+Sj`2>Orf2N(9Be}G|f$}fE%j))RFFM?*lTQ1yz6CDx0Akcy=bGab4DVlL2C?-~5VH~RPSWkoHh#JF`pzgdSDU}`;Qx-sOECH|pI(8p
zKe6@(W|tE
zw^79H1BLfNd1{YRDSgi0>&H#V
zK-&foYmF=I9~Qx@@UtM|0^{g7EnuWkb%1gH@@(QJ!IJTNis4(1Q`{!|4v59ry@$-<
z>ZJWW4*Z8I%Q{m9xpvh6d16mAbRU~OHJn#9$qn*ROk51ex2x({MW*4r07$r<7SVua
ze2Zg>)NO&uRu{P#QNDZptfFalIK*ZV3J63gVuVpJ2_*8PN{jgHF^=;e;o?H!C4zz?D?>byS>u~3Y_DY8zlsI0Czxn
zo^r;5a_3qWIZpLaIB?EH@}`2Obqnzh6ZxiHw9-O-uk}GP(F5Ns?WvQM^ZX;l9nhGj
zY%W8mtN1|}L!$vBYh3|6tB$x=MgUi32?;cc)Q>9Ue}q)D{+oK7%PFi}?K60(U|nZT
z>UP$CoM4URmshK9fy}n9q)0e2m`aoAqimDbbXr#1eMeCKq&+CFO~9qn@HDf33siT_
kOlw-_k
zUi02apcrR?M`SSr1K(i~W;~w1A_XWYS>hT|5}cn_Ql40p$`Fv4nOCCc=Nh75s%NNY
zXe7+&UIJ9KBQ?S^&C^qhfdj~4WsqWIWncudynt95$_9BugOM35&IDu|GBPm;0_i9q
z&TMA^i{}8@AdmpWApI~J-Btz$W(I}{>ob+uWXO%oSFr-48FFtJ~t&U?J~fHQ`-0+ZLZ43R3-nO_5#(-kfQg
z2X$0uEM?g|C1IM-nNMtvrV?zoPO}QWY4%{hwAT1c=i%mqb3z0r+ATc9;T|4h(8RTF
zt3Z~*TzLe4F!S_cYgR
zJH3sim+QoX>#y%~{rmJ(x$pDGZ{XS0pvqqFJ5CXSMwjuRYM
hBtL!?+x_R&Uv8)Q@{5JV_Z|a-pXHAJ=_7_wyv%9VKE`;Z^|v
zfU&kRw-?9ZUkfcQ-f=quMgTx!MYN;yIrB3SUg7>>=lnxM03hn&O9Dut+o`m>stP>V(
z=tVM$YA)zkcfGwP$YiG`!ZOkaN`s
zeV1cI9!7;rhp!J`6R!AGsLs+@#Ma*LP?a@HU0Za`&NsnE>oe{TM)HDRA&`*~KrPD1
zn3~vSL`zk?jxi#VT)EF2Nvw%Ul|YxGn48CqOAC!X_a~3_j~r0F&RDg0a^yhyto>Nf
z&a?aOaxhB5LrrTk7paB}7@6W#^MMURR(88fNE`q_yIGqba*TR7Gf*C);-vg~-Yf7b
zhjZ@uZ1V}g-~N`Sykl*A-fG1yBhvQq3G3{(u3OpvIKs?K>7CO=ZTxPZw3$jHHG1!j
zs18y3ps4KU9lDiZHk0Y=>%++M-6|2o=2rW<$8gUmO-?Yt_B1fI`h;W{a*+Xci>S)k
zfMz|gN?pL;7NC4uT3FmcV1VgQNPhSDYt|*h_&TAFLYyfzFoaFzk}Tw312*bXI`ONs
zQM=;g+m;9Xl$-eC_PDPgL*Gx<+L9?k2mZ+j&eC+xps8waav%c%Y6$vy#oQ=Vzp|{qaKn~mZ*59u1U|4xwy|u
z)BU2c;KnQW>fX)0JuqHA!DH5n-qeJnrb{9p%!+9G{~>CBJkYZhxwVuICDcwfmYIOR
zErMRk2WeD-jf36sS<(EIa`W@7?Gd1ANr+5^b{j%3gx?5pIowJ`JNQa&5p^r=fi9b`
z?1{{9(}erwYsdN`0iH@5kIBFva;+m{|IbGJw_hKD>o3gaOQEJ?^pSkt*Hllf_w?1W
z9xzdhgT%E)+@qHTn>eC1|A!>=F4q~_B=9mv7;#lOR1LnwB#)`l*9gl@uVpXF77qQa
zKa8BKd)}N;U=YBAlmC
za^nD&NKfN(k8-a5U5iqmv%Ph65;CgDfjj?bF=17*W&PR*=^2RXK2uQL^_ZoPhZtJ!?XvU$
zhgVEp{JFSn^Zvu*ewu=j-Xp(H^17F<6e~r;ImP-fg$0Kl!P7%nD|%>bEKwU4PYZFQt{>7EqJMfRE5&D705
zUdd6Fb-iqVWnqdlbzUluI9>pp=%43eDjp}z5;i^K_ROd~qUfHob?Os++2RMYwn=!;
z60Uv3I;+nNo0a10rQbtB{3D89An5TMlE;`!)LZUA_@}0gO_~D_4RfdAf)R=0RO7EH
zaap8y4G>PPDFreu)e&1ojP5hy