Skip to content

[TM ONLY] Improved whitelist and time locks - #111

Open
FalloutFalcon wants to merge 5 commits into
ApocryphaXIII:masterfrom
FalloutFalcon:whitelist-and-playtime-test-merge
Open

[TM ONLY] Improved whitelist and time locks#111
FalloutFalcon wants to merge 5 commits into
ApocryphaXIII:masterfrom
FalloutFalcon:whitelist-and-playtime-test-merge

Conversation

@FalloutFalcon

Copy link
Copy Markdown
Member

commit b40c4f8
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Fri Jul 31 00:17:59 2026 -0500

    minor mistake

commit 58a4baa
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Thu Jul 30 22:19:21 2026 -0500

    yea

commit de9cf3e
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Thu Jul 30 20:20:27 2026 -0500

    stuff

commit f880094
Merge: 673029c 36d9737
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Thu Jul 30 18:40:28 2026 -0500

    Merge branch 'master' of https://github.com/DarkPack13/SecondCity into whitelist-bullshit

commit 673029c
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Sun Jul 26 01:16:50 2026 -0500

    shit

commit d3cb70b
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Sat Jul 25 22:41:51 2026 -0500

    yea

commit e3aae16
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Sat Jul 25 22:40:11 2026 -0500

    renames disc editor cause it do 2 much

commit b87bc7f
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Sat Jul 25 22:26:55 2026 -0500

    shifts TFNadmin editeor back into darkpack one

commit c318a1d
Author: FalloutFalcon <falloutfalconplays@gmail.com>
Date:   Sat Jul 25 22:16:51 2026 -0500

    relabel comments and moves stuff out of tfn files

commit e5b5c48
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Wed Apr 29 17:18:48 2026 -0400

    offline save fix

commit e755dc0
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Wed Apr 29 07:59:12 2026 -0400

    oops

commit bfaaa44
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Tue Apr 28 08:44:01 2026 -0400

    Update whitelist.dm

commit 0384a12
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Tue Apr 28 08:04:31 2026 -0400

    Update whitelist_savefile.dm

commit 704a076
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Mon Apr 27 19:22:47 2026 -0400

    Update whitelist_savefile.dm

commit 9e7fcdf
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Mon Apr 27 19:19:15 2026 -0400

    Update whitelist_savefile.dm

commit f252a76
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Mon Apr 27 19:15:20 2026 -0400

    gd it

commit 1b2a307
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sun Apr 26 11:45:53 2026 -0400

    Update whitelist_savefile.dm

commit e20ce12
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 23:50:43 2026 -0400

    Update TFNAdminDisciplineEditor.tsx

commit 1278116
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 23:20:46 2026 -0400

    guh

    Co-authored-by: buffyuwu <buffyvrc@gmail.com>

commit c1a301c
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 23:15:45 2026 -0400

    1.0

commit c91acdd
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Tue Mar 31 18:07:50 2026 -0400

    Update darkpack_height.tsx

commit 797d447
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Tue Mar 31 18:07:37 2026 -0400

    ship of theseus with a darkpark file

commit 88d8bc4
Author: buffyuwu <42501819+buffyuwu@users.noreply.github.com>
Date:   Tue Mar 31 16:37:26 2026 -0400

    it should be its own component

commit 9de6351
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 22:57:05 2026 -0400

    this was a dumb idea

commit 46e31ba
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 20:06:09 2026 -0400

    the whitelistening

commit 67dc544
Author: Biplume <LucifersCoils@proton.me>
Date:   Wed Apr 15 19:32:30 2026 -0400

    Whitelists & Unwhitelists Bloodlines (DarkPack13#199)

    * whitelists

    * free nagaraja

    * Update tfn_trusted_whitelist.tsx

commit b64efa9
Author: XeonMations <62395746+XeonMations@users.noreply.github.com>
Date:   Tue Mar 31 18:35:01 2026 +0300

    Fixes for DarkPack13#116

commit 299d28c
Author: XeonMations <62395746+XeonMations@users.noreply.github.com>
Date:   Tue Mar 31 18:29:00 2026 +0300

    Update trusted_whitelist.dm

commit 9e77154
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 22:57:05 2026 -0400

    this was a dumb idea

commit 91e639c
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Sat Apr 25 20:06:09 2026 -0400

    the whitelistening

commit 8c945e3
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Fri Apr 10 18:05:02 2026 -0400

    admin disc menu redesign, save_character on matrix, clear discs on new char (DarkPack13#145)

    * revert to upstream

    * admin disc menu redesign, save_character on matrix, clear discs on new char

    * missing comment

    Co-authored-by: buffyuwu <buffyvrc@gmail.com>

    * Update modular_darkpack/modules/powers/code/discipline_pref_middleware.dm

    Co-authored-by: XeonMations <62395746+XeonMations@users.noreply.github.com>

    * Update modular_darkpack/modules/powers/code/admin_discipline_editor.dm

    Co-authored-by: XeonMations <62395746+XeonMations@users.noreply.github.com>

    * Update modular_darkpack/modules/powers/code/admin_discipline_editor.dm

    Co-authored-by: XeonMations <62395746+XeonMations@users.noreply.github.com>

    * Update preferences.dm

    * Revert "Update preferences.dm"

    This reverts commit ef827ce8dee2dd6db161d6f37a824046ed6444f8.

    * Update TFNAdminDisciplineEditor.tsx

    * sfgsdfhgfdah

    * e

    ---------

    Co-authored-by: XeonMations <62395746+XeonMations@users.noreply.github.com>

commit c6809fb
Author: buffyuwu <buffyvrc@gmail.com>
Date:   Mon Mar 30 17:53:29 2026 -0400

    Trusted whitelist (DarkPack13#105)

    * trusted whitelist maybe

    * admin abuse
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant