Skip to content

[TM ONLY] Hub Stuff #75

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

Open
FalloutFalcon wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[TM ONLY] Hub Stuff #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
992390a
hub stuff
FalloutFalcon Jul 18, 2026
a2175a9
show splats as well, why not
FalloutFalcon Jul 18, 2026
7cf9038
yea
FalloutFalcon Jul 18, 2026
2ff6447
yea
FalloutFalcon Jul 18, 2026
8a83da7
tweaks
FalloutFalcon Jul 18, 2026
03d399c
Merge branch 'master' into hub-stuff
FalloutFalcon Jul 18, 2026
0a9e9f1
Merge branch 'master' into hub-stuff
FalloutFalcon Jul 30, 2026
507b675
yea
FalloutFalcon Aug 1, 2026
c82a52b
yea
FalloutFalcon Aug 1, 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
24 changes: 23 additions & 1 deletion code/game/world.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,33 @@
var/server_name = CONFIG_GET(string/servername)
if (server_name)
new_status += "<b>[server_name]</b> "
// DARKPACK EDIT ADD START
new_status += "(<a href=\"[CONFIG_GET(string/forumurl)]\">Discord</a>)"
if(CONFIG_GET(string/servertagline))
new_status += "<br>[CONFIG_GET(string/servertagline)]<br>"
if(CONFIG_GET(flag/nsfw_content))
features += "18+"
if(CONFIG_GET(flag/usewhitelist))
features += "whitelisted"
// DARKPACK EDIT ADD END
/* // DARKPACK EDIT REMOVAL
if(CONFIG_GET(flag/allow_respawn))
features += "respawn" // show "respawn" regardless of "respawn as char" or "free respawn"
if(!CONFIG_GET(flag/allow_ai))
features += "AI disabled"
hostedby = CONFIG_GET(string/hostedby)
*/
// DARKPACK EDIT ADD START

var/static/splat_name
if(!splat_name)
var/splat_id = pick(get_selectable_splats())

Check failure on line 432 in code/game/world.dm

View workflow job for this annotation

GitHub Actions / Integration Tests / run (multiz_debug) / Run Tests (multiz_debug; 516)

MultiZ Debug: /datum/unit_test/nuke_cinematic 

[09:56:23] Runtime in code/game/world.dm,432: pick() from empty list
  proc name: update status (/world/proc/update_status)
  src: world
  call stack:
  world: update status()
  Lag Switch (/datum/controller/subsystem/lag_switch): set measure(5, 1)
  the nuclear fission explosive (/obj/machinery/nuclearbomb/syndicate): actually explode()
  /datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic): Run()
  RunUnitTest(/datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic), /list (/list))
  RunUnitTests()
  /datum/callback (/datum/callback): InvokeAsync()

Check failure on line 432 in code/game/world.dm

View workflow job for this annotation

GitHub Actions / Integration Tests / run (special_francisco) / Run Tests (special_francisco; 516)

Special Francisco: /datum/unit_test/nuke_cinematic 

[09:57:09] Runtime in code/game/world.dm,432: pick() from empty list
  proc name: update status (/world/proc/update_status)
  src: world
  call stack:
  world: update status()
  Lag Switch (/datum/controller/subsystem/lag_switch): set measure(5, 1)
  the nuclear fission explosive (/obj/machinery/nuclearbomb/syndicate): actually explode()
  /datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic): Run()
  RunUnitTest(/datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic), /list (/list))
  RunUnitTests()
  /datum/callback (/datum/callback): InvokeAsync()

Check failure on line 432 in code/game/world.dm

View workflow job for this annotation

GitHub Actions / Integration Tests / run (westfieldmall) / Run Tests (westfieldmall; 516)

Westfield Mall: /datum/unit_test/nuke_cinematic 

[09:56:39] Runtime in code/game/world.dm,432: pick() from empty list
  proc name: update status (/world/proc/update_status)
  src: world
  call stack:
  world: update status()
  Lag Switch (/datum/controller/subsystem/lag_switch): set measure(5, 1)
  the nuclear fission explosive (/obj/machinery/nuclearbomb/syndicate): actually explode()
  /datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic): Run()
  RunUnitTest(/datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic), /list (/list))
  RunUnitTests()
  /datum/callback (/datum/callback): InvokeAsync()

Check failure on line 432 in code/game/world.dm

View workflow job for this annotation

GitHub Actions / Alternate Tests / run (516, 1648, runtimestation) / Run Tests (516.1648; runtimestation; 516)

Runtime Station: /datum/unit_test/nuke_cinematic 

[09:55:34] Runtime in code/game/world.dm,432: pick() from empty list
  proc name: update status (/world/proc/update_status)
  src: world
  call stack:
  world: update status()
  Lag Switch (/datum/controller/subsystem/lag_switch): set measure(5, 1)
  the nuclear fission explosive (/obj/machinery/nuclearbomb/syndicate): actually explode()
  /datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic): Run()
  RunUnitTest(/datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic), /list (/list))
  RunUnitTests()
  /datum/callback (/datum/callback): InvokeAsync()

Check failure on line 432 in code/game/world.dm

View workflow job for this annotation

GitHub Actions / Integration Tests / run (runtimetown) / Run Tests (runtimetown; 516)

Runtime Town: /datum/unit_test/nuke_cinematic 

[09:54:40] Runtime in code/game/world.dm,432: pick() from empty list
  proc name: update status (/world/proc/update_status)
  src: world
  call stack:
  world: update status()
  Lag Switch (/datum/controller/subsystem/lag_switch): set measure(5, 1)
  the nuclear fission explosive (/obj/machinery/nuclearbomb/syndicate): actually explode()
  /datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic): Run()
  RunUnitTest(/datum/unit_test/nuke_cinemati... (/datum/unit_test/nuke_cinematic), /list (/list))
  RunUnitTests()
  /datum/callback (/datum/callback): InvokeAsync()
var/splats_type = GLOB.splat_list[splat_id]
var/datum/splat/splats = GLOB.splat_prototypes[splats_type]
splat_name = splats?.name
if(splat_name)
features += "try [splat_name]"
// DARKPACK EDIT ADD END

if (CONFIG_GET(flag/station_name_in_hub_entry))
new_status += " &#8212; <b>[station_name()]</b>"
Expand All @@ -426,7 +448,7 @@
features += "hosted by <b>[hostedby]</b>"

if(length(features))
new_status += ": [jointext(features, ", ")]"
new_status += "[jointext(features, ", ")]" // DARKPACK EDIT CHANGE

if(!SSticker || SSticker?.current_state == GAME_STATE_STARTUP)
new_status += "<br><b>STARTING</b>"
Expand Down
3 changes: 3 additions & 0 deletions config/darkpack_config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ ROLEPLAY_ONLY_MERITS 1
#DIRECTIONAL_COMBAT
SWING_COMBAT

## Server tagline: This will appear right below the server's title.
# SERVERTAGLINE A total conversion project to the WoD setting

## Configs for passive bloodpool drain, if this is enabled, then the below timer can be adjusted to make vampires and ghouls lose 1 blood point when the timer is up
#PASSIVE_BP_DRAIN
PASSIVE_BP_DRAIN_TIMER 12000
Expand Down
2 changes: 2 additions & 0 deletions modular_darkpack/master_files/code/controllers/configuration/entries/general.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
// url for the alternate web_sound server. you can safely leave this alone if you want, vampire
/// e.g. https://vampire-freaks.com/api
/datum/config_entry/string/music_server_url // Not an existing override, bite me.

/datum/config_entry/string/servertagline
Loading