Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1c3b574
Mapped glowshrooms are lazy (#844)
FalloutFalcon Apr 4, 2026
3670e75
Automatic changelog for PR #844 [ci skip]
darkpack13-api[bot] Apr 4, 2026
2b11c9d
Human/mortal QOL (#857)
lobotomypilled Apr 4, 2026
d615db7
Automatic changelog for PR #857 [ci skip]
darkpack13-api[bot] Apr 4, 2026
b655964
Gangrel claws no longer have armor penetration or block chance (#856)
Apr 4, 2026
c8e006f
Automatic changelog for PR #856 [ci skip]
darkpack13-api[bot] Apr 4, 2026
b928f83
blood heal even if down (#807)
Apr 5, 2026
665cad8
Automatic changelog for PR #807 [ci skip]
darkpack13-api[bot] Apr 5, 2026
30cc84e
Fixes stake onfloor (#870)
FalloutFalcon Apr 6, 2026
b6be14b
Automatic changelog for PR #870 [ci skip]
darkpack13-api[bot] Apr 6, 2026
4019837
Automatic changelog compile [ci skip]
tgstation-ci[bot] Apr 6, 2026
616787f
Library sells art supplies now! (#877)
WhereAmO Apr 7, 2026
12a8551
Automatic changelog for PR #877 [ci skip]
darkpack13-api[bot] Apr 7, 2026
b458e1f
Kills "ALL" defines for clans and splats (#871)
FalloutFalcon Apr 7, 2026
c1fc13b
Minor Updatepaths sanity (#864)
FalloutFalcon Apr 7, 2026
b33d59b
Automatic changelog for PR #871 [ci skip]
darkpack13-api[bot] Apr 7, 2026
c35692c
Glowing blood fix (#855)
lobotomypilled Apr 7, 2026
12714fa
Automatic changelog for PR #864 [ci skip]
darkpack13-api[bot] Apr 7, 2026
dbbf65a
Automatic changelog for PR #855 [ci skip]
darkpack13-api[bot] Apr 7, 2026
67c8fe2
V20 Core accurate Blood cost (#840)
Magisterium2022 Apr 7, 2026
944dac5
Zulu Form Icon Revert (#849)
SELFHELL Apr 7, 2026
e75ab96
Automatic changelog for PR #840 [ci skip]
darkpack13-api[bot] Apr 7, 2026
f96c46f
Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…
FalloutFalcon Apr 7, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 72 additions & 72 deletions _maps/map_files/Vampire/admin_central.dmm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _maps/map_files/Vampire/runtimetown.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@
/turf/open/floor/plating/concrete,
/area/vtm/interior/shop)
"vO" = (
/obj/structure/chair/greyscale{
/obj/structure/chair/darkpack{
dir = 8
},
/turf/open/floor/plating/rough/cave,
Expand Down Expand Up @@ -2999,7 +2999,7 @@
/turf/open/openspace,
/area/vtm/outside/pacificheights)
"Yz" = (
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 8
},
/turf/open/floor/plating/sidewalk/poor,
Expand Down
46 changes: 23 additions & 23 deletions _maps/map_files/Vampire/westfield_mall/westfield_mall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@
/turf/open/floor/plating/rough,
/area/vtm/interior/sewer)
"acc" = (
/obj/structure/chair/plastic{
/obj/structure/chair/plastic/darkpack{
dir = 8
},
/turf/open/misc/dirt,
Expand Down Expand Up @@ -1146,7 +1146,7 @@
/turf/open/floor/carpet/darkpack/bluesilver,
/area/vtm/westfield_mall/interior/theatre)
"adX" = (
/obj/structure/chair/plastic,
/obj/structure/chair/plastic/darkpack,
/turf/open/misc/dirt,
/area/vtm/westfield_mall/forest)
"adY" = (
Expand Down Expand Up @@ -1921,7 +1921,7 @@
"agI" = (
/obj/effect/decal/rugs,
/obj/effect/decal/rugs,
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 1
},
/obj/effect/landmark/start/darkpack/primogen/nosferatu,
Expand Down Expand Up @@ -2072,7 +2072,7 @@
/turf/open/floor/carpet/darkpack/orangesilver,
/area/vtm/interior/supply)
"ahf" = (
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 4
},
/obj/effect/landmark/start/darkpack/chantry/archivist,
Expand Down Expand Up @@ -2406,7 +2406,7 @@
/turf/open/floor/carpet/darkpack/bluegold,
/area/vtm/interior/police)
"aif" = (
/obj/structure/chair/office,
/obj/structure/chair/office/darkpack/green,
/obj/effect/landmark/start/darkpack/chantry/archivist,
/turf/open/floor/wood/smooth/old,
/area/vtm/westfield_mall/interior/chantry)
Expand Down Expand Up @@ -4143,7 +4143,7 @@
/turf/open/floor/wood/smooth/old,
/area/vtm/interior/church)
"anQ" = (
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 8
},
/turf/open/floor/carpet/darkpack/redsilver,
Expand Down Expand Up @@ -9001,7 +9001,7 @@
/turf/open/floor/city/factory,
/area/vtm/westfield_mall/interior/theatre)
"aDK" = (
/obj/structure/chair/plastic{
/obj/structure/chair/plastic/darkpack{
dir = 4;
pixel_y = 7
},
Expand Down Expand Up @@ -9640,7 +9640,7 @@
/area/vtm/interior/shop)
"aFH" = (
/obj/effect/decal/cleanable/trash,
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 8
},
/turf/open/floor/plating/concrete,
Expand Down Expand Up @@ -9713,7 +9713,7 @@
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/westfield_mall/skatepark)
"aFW" = (
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 4
},
/turf/open/floor/carpet/darkpack/redsilver,
Expand Down Expand Up @@ -11510,7 +11510,7 @@
/turf/closed/wall/vampwall/painted,
/area/vtm/westfield_mall/interior)
"aLX" = (
/obj/structure/chair/plastic,
/obj/structure/chair/plastic/darkpack,
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/interior/sewer)
Expand Down Expand Up @@ -11917,7 +11917,7 @@
/turf/open/floor/city/gummaguts,
/area/vtm/westfield_mall/interior/foodcourt/restaurant)
"aNn" = (
/obj/structure/chair/plastic{
/obj/structure/chair/plastic/darkpack{
dir = 1
},
/turf/open/floor/plating/sidewalk/poor,
Expand Down Expand Up @@ -12779,7 +12779,7 @@
/turf/open/floor/carpet/darkpack/old,
/area/vtm/interior/shop)
"aQe" = (
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 8
},
/obj/effect/landmark/start/darkpack/chantry/archivist,
Expand Down Expand Up @@ -13530,7 +13530,7 @@
/turf/open/floor/city/plating,
/area/vtm/westfield_mall/interior/camarilla)
"aSs" = (
/obj/structure/chair/plastic,
/obj/structure/chair/plastic/darkpack,
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/interior/sewer)
"aSt" = (
Expand Down Expand Up @@ -14668,11 +14668,11 @@
/turf/open/floor/plating/concrete,
/area/vtm/westfield_mall/interior/supply)
"aWz" = (
/obj/item/chair/plastic,
/obj/item/chair/plastic{
/obj/item/chair/plastic/darkpack,
/obj/item/chair/plastic/darkpack{
pixel_y = 2
},
/obj/item/chair/plastic{
/obj/item/chair/plastic/darkpack{
pixel_y = 4
},
/obj/machinery/light/dim/directional/west,
Expand Down Expand Up @@ -14742,7 +14742,7 @@
/turf/open/floor/plating/rough,
/area/vtm/interior/shop)
"aWI" = (
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 8
},
/turf/open/floor/plating/concrete,
Expand Down Expand Up @@ -15028,7 +15028,7 @@
/area/vtm/westfield_mall/interior)
"aXB" = (
/mob/living/carbon/human/npc/shop,
/obj/structure/chair/office,
/obj/structure/chair/office/darkpack/green,
/obj/effect/mapping_helpers/mob_buckler,
/obj/machinery/light/directional/north,
/turf/open/floor/city/plating,
Expand Down Expand Up @@ -15499,7 +15499,7 @@
/area/vtm/westfield_mall/forest)
"aZe" = (
/mob/living/carbon/human/npc/shop,
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 4
},
/obj/effect/mapping_helpers/mob_buckler,
Expand Down Expand Up @@ -15600,7 +15600,7 @@
/area/vtm/westfield_mall/interior/clothing_store)
"aZv" = (
/mob/living/carbon/human/npc/shop,
/obj/structure/chair/office{
/obj/structure/chair/office/darkpack/green{
dir = 1
},
/obj/effect/mapping_helpers/mob_buckler,
Expand Down Expand Up @@ -17401,7 +17401,7 @@
/turf/open/floor/carpet/green,
/area/vtm/westfield_mall/interior/law_office)
"ngU" = (
/obj/structure/chair/plastic{
/obj/structure/chair/plastic/darkpack{
dir = 4
},
/turf/open/floor/plating/sidewalk/poor,
Expand Down Expand Up @@ -17756,7 +17756,7 @@
/turf/open/floor/plating/sidewalk/poor,
/area/vtm/interior/sewer)
"qhs" = (
/obj/structure/chair/office,
/obj/structure/chair/office/darkpack/green,
/obj/machinery/light/directional/north,
/turf/open/floor/wood/smooth/old,
/area/vtm/westfield_mall/interior/skatepark)
Expand Down Expand Up @@ -18263,7 +18263,7 @@
/turf/open/floor/wood/smooth/old,
/area/vtm/westfield_mall/interior)
"uMr" = (
/obj/structure/chair/plastic{
/obj/structure/chair/plastic/darkpack{
dir = 8
},
/obj/effect/turf_decal/bordur{
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files/Vampire/westfield_mall/westfield_umbra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@
/turf/open/misc/grass,
/area/vtm/outside/penumbra)
"pA" = (
/obj/structure/chair/greyscale,
/obj/structure/chair/darkpack,
/turf/open/floor/plating/rough,
/area/vtm/outside/penumbra)
"pC" = (
Expand Down Expand Up @@ -2222,7 +2222,7 @@
/area/vtm/outside/penumbra)
"Fj" = (
/obj/effect/decal/cleanable/trash,
/obj/structure/chair/greyscale,
/obj/structure/chair/darkpack,
/turf/open/floor/plating/rough,
/area/vtm/outside/penumbra)
"Fo" = (
Expand All @@ -2235,7 +2235,7 @@
/turf/open/floor/plating/canal,
/area/vtm/outside/penumbra)
"Fw" = (
/obj/structure/chair/greyscale{
/obj/structure/chair/darkpack{
dir = 1
},
/obj/structure/cable/layer1,
Expand Down Expand Up @@ -2264,7 +2264,7 @@
/obj/effect/decal/carpet{
pixel_x = -14
},
/obj/structure/chair/greyscale{
/obj/structure/chair/darkpack{
dir = 1
},
/turf/open/floor/plating/concrete,
Expand Down Expand Up @@ -2576,7 +2576,7 @@
/turf/open/misc/dirt,
/area/vtm/outside/penumbra)
"Kb" = (
/obj/structure/chair/plastic{
/obj/structure/chair/plastic/darkpack{
dir = 8
},
/turf/open/misc/beach/vamp,
Expand Down Expand Up @@ -2902,7 +2902,7 @@
/area/vtm/outside/penumbra)
"PE" = (
/obj/effect/decal/cleanable/cardboard,
/obj/structure/chair/greyscale{
/obj/structure/chair/darkpack{
dir = 4
},
/obj/structure/cable/layer1,
Expand Down Expand Up @@ -3051,7 +3051,7 @@
/area/vtm/outside/penumbra)
"Sm" = (
/obj/effect/decal/cleanable/litter,
/obj/structure/chair/greyscale{
/obj/structure/chair/darkpack{
dir = 1
},
/turf/open/floor/plating/rough,
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/~darkpack/splats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#define SPLAT_GAROU "splat_garou"
#define SPLAT_CORAX "splat_corax" // DARKPACK TODO - CORAX

#define SPLAT_ALL list(SPLAT_NONE, SPLAT_KINDRED, SPLAT_GHOUL, SPLAT_KINFOLK, SPLAT_GAROU)

#define SPLAT_PRIO_HALFSPLAT 100
#define SPLAT_PRIO_SPLAT 200

Expand Down
3 changes: 0 additions & 3 deletions code/__DEFINES/~darkpack/vampire_clan.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,3 @@
#define VAMPIRE_CLAN_VENTRUE "ventrue"
#define VAMPIRE_CLAN_SAMEDI "samedi"
#define VAMPIRE_CLAN_HARBINGER "harbinger_of_skulls"

//all of the playable clans
#define VAMPIRE_CLAN_ALL list(VAMPIRE_CLAN_BAALI, VAMPIRE_CLAN_BANU_HAQIM, VAMPIRE_CLAN_BRUJAH, VAMPIRE_CLAN_CAITIFF, VAMPIRE_CLAN_CAPPADOCIAN, VAMPIRE_CLAN_CITY_GANGREL, VAMPIRE_CLAN_DAUGHTERS_OF_CACOPHONY, VAMPIRE_CLAN_GANGREL, VAMPIRE_CLAN_GARGOYLE, VAMPIRE_CLAN_GIOVANNI, VAMPIRE_CLAN_KIASYD, VAMPIRE_CLAN_LASOMBRA, VAMPIRE_CLAN_MALKAVIAN, VAMPIRE_CLAN_NAGARAJA, VAMPIRE_CLAN_NOSFERATU, VAMPIRE_CLAN_OLD_CLAN_TZIMISCE, VAMPIRE_CLAN_HEALER_SALUBRI, VAMPIRE_CLAN_WARRIOR_SALUBRI, VAMPIRE_CLAN_SETITE, VAMPIRE_CLAN_TOREADOR, VAMPIRE_CLAN_TREMERE, VAMPIRE_CLAN_TRUE_BRUJAH, VAMPIRE_CLAN_TZIMISCE, VAMPIRE_CLAN_VENTRUE, VAMPIRE_CLAN_SAMEDI, VAMPIRE_CLAN_HARBINGER)
5 changes: 4 additions & 1 deletion code/game/objects/effects/glowshroom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ GLOBAL_VAR_INIT(glowshrooms, 0)
AddElement(/datum/element/atmos_sensitive, mapload)
COOLDOWN_START(src, spread_cooldown, rand(min_delay_spread, max_delay_spread))

START_PROCESSING(SSobj, src)
// DARKPACK EDIT CHANGE START
if(!mapload)
START_PROCESSING(SSobj, src)
// DARKPACK EDIT CHANGE END

var/static/list/hovering_item_typechecks = list(
/obj/item/plant_analyzer = list(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/physiology.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

var/datum/armor/armor // internal armor datum

var/hunger_mod = 1 //% of hunger rate taken per tick.
var/hunger_mod = 0.2 //% of hunger rate taken per tick. //DARKPACK EDIT CHANGE - Original : var/hunger_mod = 1

/datum/physiology/New()
armor = new
2 changes: 1 addition & 1 deletion code/modules/movespeed/modifiers/mobs.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/movespeed_modifier/obesity
// large weight slows even if flying and floating
multiplicative_slowdown = 1.5
multiplicative_slowdown = 1.2 //DARKPACK EDIT CHANGE - Original : multiplicative_slowdown = 1.2

/datum/movespeed_modifier/monkey_reagent_speedmod
variable = TRUE
Expand Down
4 changes: 2 additions & 2 deletions code/modules/surgery/organs/internal/stomach/_stomach.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
var/metabolism_efficiency = 0.05 // the lowest we should go is 0.025

/// Multiplier for hunger rate
var/hunger_modifier = 1
var/hunger_modifier = 0.2 // DARKPACK EDIT CHANGE - Original : var/hunger_modifier = 1
/// Whether the stomach's been repaired with surgery and can be fixed again or not
var/operated = FALSE
/// List of all atoms within the stomach
Expand Down Expand Up @@ -201,7 +201,7 @@
/obj/item/organ/stomach/proc/handle_hunger_slowdown(mob/living/carbon/human/human)
var/hungry = (500 - human.nutrition) / 5 //So overeat would be 100 and default level would be 80
if(hungry >= 70)
human.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (hungry / 50))
human.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (hungry / 80)) // DARKPACK EDIT CHANGE - ORIGINAL : human.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/hunger, multiplicative_slowdown = (hungry / 50))
else
human.remove_movespeed_modifier(/datum/movespeed_modifier/hunger)

Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-840.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Magisterium2022"
delete-after: True
changes:
- balance: "Removed BP costs for abilities that are free in V20 Core."
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-855.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "lobotomypilled"
delete-after: True
changes:
- bugfix: "fixing vitae's properties"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-864.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "FalloutFalcon"
delete-after: True
changes:
- map: "Some maps now use darkpack chairs"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-871.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "FalloutFalcon"
delete-after: True
changes:
- code_imp: "Restructures code to prevent oversights from failure to add clans and splats to a list"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-877.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "WhereAmO"
delete-after: True
changes:
- rscadd: "adds canvases and paper to the library shop"
9 changes: 9 additions & 0 deletions html/changelogs/archive/2026-04.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
2026-04-06:
FalloutFalcon:
- image: Stakes now have onfloors
- map: mapped glowshrooms no longer spread around
LucifersCoils:
- bugfix: You can now bloodheal without rolling while incapacitated.
- balance: Gangrel claws no longer have armor penetration or block chance
lobotomypilled:
- qol: Playing mortals shouldnt require constant mechanical upkeep.
4 changes: 2 additions & 2 deletions modular_darkpack/modules/jobs/code/_job_assignment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
else
player_splat_id = splat_pref

if(!(player_splat_id in possible_job.allowed_splats))
if(possible_job.allowed_splats && !(player_splat_id in possible_job.allowed_splats))
job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPLAT, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
return JOB_UNAVAILABLE_SPLAT

if(possible_job.splat_slots[player_splat_id] == 0)
if(possible_job.splat_slots && (possible_job.splat_slots[player_splat_id] == 0))
job_debug("[debug_prefix] Error: [get_job_unavailable_error_message(JOB_UNAVAILABLE_SPLAT_SLOTS, possible_job.title)], Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
return JOB_UNAVAILABLE_SPLAT_SLOTS

Expand Down
Loading
Loading