Skip to content

Darkpack Upstream Pull 8/30/2025 #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chazzyjazzy merged 46 commits into from
Aug 31, 2026
Merged

Darkpack Upstream Pull 8/30/2025 #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1fc45c4
fix wall frill runtimes from north edge of the map (#1449)
Absolucy Aug 23, 2026
6e84bbb
Re-Adds Potence Throwing (Via Shoves) and Adds Strength-Based Disarmi…
Stutternov Aug 23, 2026
84ae1db
Automatic changelog for PR #1359 [ci skip]
darkpack13-api[bot] Aug 23, 2026
6fdc9a5
Fixes oversights from #1442 (#1454)
chazzyjazzy Aug 23, 2026
7279bba
Automatic changelog compile [ci skip]
tgstation-ci[bot] Aug 24, 2026
ede800e
Pride Flags DLC pack (#1406)
KCartridge Aug 25, 2026
0551c2e
Automatic changelog for PR #1406 [ci skip]
darkpack13-api[bot] Aug 25, 2026
f1915a6
Automatic changelog compile [ci skip]
tgstation-ci[bot] Aug 26, 2026
b4e8abe
High Medicine Skill Gives Better Wound Tending (#1430)
breadcrombs Aug 26, 2026
185b3a2
Automatic changelog for PR #1430 [ci skip]
darkpack13-api[bot] Aug 26, 2026
7638c1a
Automatic changelog compile [ci skip]
tgstation-ci[bot] Aug 27, 2026
71b87a4
Elevated flames wont set fire to turfs (#1456)
FalloutFalcon Aug 27, 2026
f56c3ef
Automatic changelog for PR #1456 [ci skip]
darkpack13-api[bot] Aug 27, 2026
b935ff7
Adds Anthropic Taste quirk (#1467)
drgnmstrc Aug 27, 2026
a6a25f8
Automatic changelog for PR #1467 [ci skip]
darkpack13-api[bot] Aug 27, 2026
932e6bb
fix the "No Sense of Taste" Flaw (#1463)
Absolucy Aug 27, 2026
3f77c7d
Some jobs and clans grant languages now (#1455)
kimesik Aug 27, 2026
eca6278
Automatic changelog for PR #1455 [ci skip]
darkpack13-api[bot] Aug 27, 2026
3984714
Upstreams a few items from TFN's loadouts (#1450)
chazzyjazzy Aug 27, 2026
d57609d
Automatic changelog for PR #1450 [ci skip]
darkpack13-api[bot] Aug 27, 2026
fe30f71
Gets rid of this irrelevant linter failure (#1475)
chazzyjazzy Aug 27, 2026
7ab6ef6
Nerf Dagger of Retribution (#1470)
dwinters99 Aug 27, 2026
dc831c9
Automatic changelog for PR #1470 [ci skip]
darkpack13-api[bot] Aug 27, 2026
6cd428e
Makes werewolf artifacts unique to fera (#1431)
Dusk-a Aug 28, 2026
129f64c
Automatic changelog for PR #1431 [ci skip]
darkpack13-api[bot] Aug 28, 2026
0eedf45
Automatic changelog compile [ci skip]
tgstation-ci[bot] Aug 28, 2026
48e0861
Ritual Logging (#1459)
chazzyjazzy Aug 28, 2026
0291288
Automatic changelog for PR #1459 [ci skip]
darkpack13-api[bot] Aug 28, 2026
1d72eeb
Fix Obfuscate MOTF showing clan specific examine text (#1473)
Psychodeath42 Aug 28, 2026
0719039
Automatic changelog for PR #1473 [ci skip]
darkpack13-api[bot] Aug 28, 2026
af23e63
Bogatyr armor reblance + resprite (#1464)
dwinters99 Aug 28, 2026
d84eafb
Automatic changelog for PR #1464 [ci skip]
darkpack13-api[bot] Aug 28, 2026
92be037
Refactoring lampposts (#1373)
chazzyjazzy Aug 29, 2026
80f9bce
Automatic changelog for PR #1373 [ci skip]
darkpack13-api[bot] Aug 29, 2026
f54323f
Mechanical Bawn (#1445)
FalloutFalcon Aug 29, 2026
f15a195
Automatic changelog for PR #1445 [ci skip]
darkpack13-api[bot] Aug 29, 2026
1f8fbc7
Automatic changelog compile [ci skip]
tgstation-ci[bot] Aug 29, 2026
1c3702e
better behavoir for registering stat signals (#1478)
FalloutFalcon Aug 29, 2026
2f7483c
Adds matching shop areas for most existing retail vendors (#1411)
FalloutFalcon Aug 29, 2026
2d84bbb
Clamp Stats instead of subtracting them to 0 (#1480)
FalloutFalcon Aug 30, 2026
9bbb294
Automatic changelog for PR #1480 [ci skip]
darkpack13-api[bot] Aug 30, 2026
d06ff1b
Garou Drip Update (#1440)
SixplyDev Aug 30, 2026
cb84843
Automatic changelog for PR #1440 [ci skip]
darkpack13-api[bot] Aug 30, 2026
fb20b88
Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…
chazzyjazzy Aug 30, 2026
5468a4e
bang
chazzyjazzy Aug 31, 2026
c443113
Update sanfangsisco.dmm
chazzyjazzy Aug 31, 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
208 changes: 104 additions & 104 deletions _maps/map_files/Vampire/oakland/bomby_oakland.dmm
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions _maps/map_files/Vampire/oakland/oakland_umbra.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
/turf/open/floor/mineral/plastitanium,
/area/vtm/outside/penumbra)
"cd" = (
/obj/structure/lamppost/sidewalk/chinese{
/obj/machinery/light/floor/lamppost/sidewalk/chinese{
dir = 1;
density = 0
},
Expand Down Expand Up @@ -556,7 +556,7 @@
/obj/effect/decal/wallpaper/stone/low{
pixel_y = 16
},
/obj/structure/lamppost/sidewalk,
/obj/machinery/light/floor/lamppost/sidewalk,
/turf/open/floor/plating/sidewalkalt,
/area/vtm/outside/penumbra)
"gB" = (
Expand Down Expand Up @@ -1043,7 +1043,7 @@
/turf/open/floor/plating/rough,
/area/vtm/outside/penumbra)
"lP" = (
/obj/structure/lamppost/sidewalk{
/obj/machinery/light/floor/lamppost/sidewalk{
density = 1;
plane = -2.9
},
Expand Down Expand Up @@ -2104,7 +2104,7 @@
/turf/open/floor/plating/canalplating,
/area/vtm/outside/penumbra)
"zH" = (
/obj/structure/lamppost/sidewalk,
/obj/machinery/light/floor/lamppost/sidewalk,
/turf/open/floor/wood/old,
/area/vtm/outside/penumbra)
"zI" = (
Expand Down Expand Up @@ -2365,14 +2365,14 @@
/obj/structure/trad{
pixel_y = 32
},
/obj/structure/lamppost/sidewalk/chinese{
/obj/machinery/light/floor/lamppost/sidewalk/chinese{
dir = 1;
density = 0
},
/turf/open/floor/plating/sidewalkalt,
/area/vtm/outside/penumbra)
"DS" = (
/obj/structure/lamppost/sidewalk/chinese{
/obj/machinery/light/floor/lamppost/sidewalk/chinese{
dir = 4;
density = 0
},
Expand Down Expand Up @@ -2718,7 +2718,7 @@
},
/area/vtm/outside/penumbra)
"HM" = (
/obj/structure/lamppost/one{
/obj/machinery/light/floor/lamppost/one{
dir = 8
},
/turf/open/floor/plating/sidewalk,
Expand Down Expand Up @@ -4083,7 +4083,7 @@
/turf/open/floor/city/toilet/large,
/area/vtm/outside/penumbra)
"Zq" = (
/obj/structure/lamppost/sidewalk{
/obj/machinery/light/floor/lamppost/sidewalk{
density = 1
},
/obj/effect/turf_decal/bordur/end,
Expand Down
Loading
Loading