Skip to content

Commit

Permalink
Revert "[MIRROR] Admin Library Moderation (in-game edition) [MDB IGNO…
Browse files Browse the repository at this point in the history
…RE] (Skyrat-SS13#21565)"

This reverts commit 1b48ff4.
  • Loading branch information
Dimach committed Jun 21, 2023
1 parent c7b0494 commit b48f624
Show file tree
Hide file tree
Showing 17 changed files with 39 additions and 993 deletions.
6 changes: 3 additions & 3 deletions SQL/database_changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Any time you make a change to the schema files, remember to increment the databa

Make sure to also update `DB_MAJOR_VERSION` and `DB_MINOR_VERSION`, which can be found in `code/__DEFINES/subsystem.dm`.

The latest database version is 5.25 (5.24 for /tg/); The query to update the schema revision table is:
The latest database version is 5.26 (5.24 for /tg/); The query to update the schema revision table is:

```sql
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 25);
INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 26);
```
or

```sql
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 25);
INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 26);
```

In any query remember to add a prefix to the table names if you use one.
Expand Down
4 changes: 2 additions & 2 deletions SQL/tgstation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,10 @@ CREATE TABLE `library_action` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`book` int(10) unsigned NOT NULL,
`reason` longtext DEFAULT NULL,
`ckey` varchar(32) NOT NULL DEFAULT '',
`ckey` varchar(11) NOT NULL DEFAULT '',
`datetime` datetime NOT NULL DEFAULT current_timestamp(),
`action` varchar(11) NOT NULL DEFAULT '',
`ip_addr` int(10) unsigned NOT NULL,
`ip_addr` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
Expand Down
4 changes: 2 additions & 2 deletions SQL/tgstation_schema_prefixed.sql
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,10 @@ CREATE TABLE `SS13_library_action` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`book` int(10) unsigned NOT NULL,
`reason` longtext DEFAULT NULL,
`ckey` varchar(32) NOT NULL DEFAULT '',
`ckey` varchar(11) NOT NULL DEFAULT '',
`datetime` datetime NOT NULL DEFAULT current_timestamp(),
`action` varchar(11) NOT NULL DEFAULT '',
`ip_addr` int(10) unsigned NOT NULL,
`ip_addr` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
Expand Down
9 changes: 0 additions & 9 deletions code/__DEFINES/library.dm

This file was deleted.

13 changes: 1 addition & 12 deletions code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
/client/proc/view_opfors, /*OPFOR - SKYRAT EDIT ADDITION*/
/client/proc/lorecaster_story_manager, /* SKYRAT EDIT ADDITION */
)
GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/ban_panel, /client/proc/stickybanpanel, /client/proc/library_control))
GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/ban_panel, /client/proc/stickybanpanel))
GLOBAL_PROTECT(admin_verbs_ban)
GLOBAL_LIST_INIT(admin_verbs_sounds, list(/client/proc/play_local_sound, /client/proc/play_direct_mob_sound, /client/proc/play_sound, /client/proc/set_round_end_sound))
GLOBAL_PROTECT(admin_verbs_sounds)
Expand Down Expand Up @@ -1065,14 +1065,3 @@ GLOBAL_PROTECT(admin_verbs_poll)

message_admins("[key_name_admin(usr)] has loaded lazy template '[choice]'")
to_chat(usr, span_boldnicegreen("Template loaded, you have been moved to the bottom left of the reservation."))

/client/proc/library_control()
set name = "Library Management"
set category = "Admin"
if(!check_rights(R_BAN))
return

if(!holder.library_manager)
holder.library_manager = new()
holder.library_manager.ui_interact(usr)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Library Management") // If you are copy-pasting this, ensure the 4th parameter is unique to the new proc!
1 change: 0 additions & 1 deletion code/modules/admin/holder2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ GLOBAL_PROTECT(href_token)
var/datum/particle_editor/particle_test
var/datum/colorblind_tester/color_test = new
var/datum/plane_master_debug/plane_debug
var/obj/machinery/computer/libraryconsole/admin_only_do_not_map_in_you_fucker/library_manager

/// Whether or not the user tried to connect, but was blocked by 2FA
var/blocked_by_2fa = FALSE
Expand Down
Loading

0 comments on commit b48f624

Please sign in to comment.