Fix: fucked up merge

SQL/database_changelog.md

@@ -16,17 +16,15 @@ INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 27);
 In any query remember to add a prefix to the table names if you use one.
 -----------------------------------------------------
 Version 5.27, 26 April 2024, by zephyrtfa
-Add the ip intel table
+Add the ip intel whitelist table
 ```sql
-DROP TABLE IF EXISTS `ipintel`;
+DROP TABLE IF EXISTS `ipintel_whitelist`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ipintel` (
-  `ip` int(10) unsigned NOT NULL,
-  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `intel` double NOT NULL DEFAULT '0',
-  PRIMARY KEY (`ip`),
-  KEY `idx_ipintel` (`ip`,`intel`,`date`)
+CREATE TABLE `ipintel_whitelist` (
+	`ckey` varchar(32) NOT NULL,
+	`admin_ckey` varchar(32) NOT NULL,
+	PRIMARY KEY (`ckey`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 ```

SQL/tgstation_schema_prefixed.sql

@@ -214,6 +214,19 @@ CREATE TABLE `SS13_ipintel` (
   KEY `idx_ipintel` (`ip`,`intel`,`date`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
+--
+-- Table structure for table `ipintel_whitelist`
+--
+
+DROP TABLE IF EXISTS `SS13_ipintel_whitelist`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `SS13_ipintel_whitelist` (
+	`ckey` varchar(32) NOT NULL,
+	`admin_ckey` varchar(32) NOT NULL,
+	PRIMARY KEY (`ckey`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
 
 --
 -- Table structure for table `SS13_legacy_population`

code/controllers/subsystem/ipintel.dm

@@ -119,10 +119,10 @@ SUBSYSTEM_DEF(ipintel)
 	var/datum/db_query/query = SSdbcore.NewQuery(
 		"INSERT INTO [format_table_name("ipintel")] ( \
 			ip, \
-			intel, \
+			intel \
 		) VALUES ( \
-			INET_ATON(:address) \
-			:result, \
+			INET_ATON(:address), \
+			:result \
 		)", list(
 			"address" = intel.address,
 			"result" = intel.result,

code/controllers/subsystem/lua.dm

@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(lua)
 	world.SetConfig("env", "LUAU_PATH", jointext(lua_path, ";"))
 
 /datum/controller/subsystem/lua/Shutdown()
-	AUXTOOLS_SHUTDOWN(AUXLUA)
+	AUXTOOLS_FULL_SHUTDOWN(AUXLUA)
 
 /datum/controller/subsystem/lua/proc/queue_resume(datum/lua_state/state, index, arguments)
 	if(!initialized)

code/modules/cargo/packs/security.dm

@@ -169,6 +169,7 @@
 					/obj/item/clothing/mask/whistle,
 					/obj/item/conversion_kit,
 				)
+	crate_name = "traditional equipment crate"
 	discountable = SUPPLY_PACK_RARE_DISCOUNTABLE
 
 /// Armory packs

code/modules/mod/mod_types.dm

@@ -596,6 +596,7 @@
 		/obj/item/mod/module/storage/bluespace,
 		/obj/item/mod/module/emp_shield/advanced,
 		/obj/item/mod/module/welding,
+		/obj/item/mod/module/rad_protection,
 		/obj/item/mod/module/stealth/ninja,
 		/obj/item/mod/module/quick_carry/advanced,
 		/obj/item/mod/module/magboot/advanced,

code/modules/pai/pai.dm

@@ -119,6 +119,9 @@
 		"mouse" = TRUE,
 		"rabbit" = TRUE,
 		"repairbot" = TRUE,
+		"kitten" = TRUE,
+		"puppy" = TRUE,
+		"spider" = TRUE,
 	)
 	/// List of all available card overlays.
 	var/static/list/possible_overlays = list(

html/changelogs/AutoChangeLog-pr-83038.yml

@@ -0,0 +1,4 @@
+author: "CandleJaxx"
+delete-after: True
+changes:
+  - rscadd: "'puppy' 'kitten' and 'spider' pai skins"

html/changelogs/archive/2024-05.yml

@@ -139,3 +139,8 @@
   larentoun:
   - bugfix: Materials are now correctly applied to crafted items (chairs, toilets,
       etc)
+2024-05-06:
+  improvedname:
+  - bugfix: fixes traditional equipment crate name
+  paganiy:
+  - qol: Admin modsuit now has a radiation protect module