Merge pull request #11 from yogstation13/master

War of the Underworld

Author: yacabo

.github/CODEOWNERS

@@ -23,6 +23,7 @@
 /code/controllers/failsafe.dm @AsV9
 /code/controllers/subsystem.dm @AsV9
 /code/controllers/subsystem/timer.dm @AsV9
+/code/datums/achievements/achievements.dm @AsV9
 
 #Identification
 

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+custom: ['https://www.yogstation.net/index.php?do=donate']

.gitignore

@@ -211,4 +211,8 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
 /_maps/templates.dm
 
 #KDIFF3 files
-*.orig
+*.orig
+
+#Debugging and other stuff
+byond-extools.dll
+extools.dll

Dockerfile

@@ -1,4 +1,4 @@
-FROM tgstation/byond:512.1470 as base
+FROM tgstation/byond:513.1490 as base
 
 FROM base as build_base
 

SQL/database_changelog.txt

@@ -1,15 +1,39 @@
 Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
 
-The latest database version is 5.2; The query to update the schema revision table is:
+The latest database version is 5.3; The query to update the schema revision table is:
 
-INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 2);
+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (5, 3);
 or
-INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 2);
+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (5, 3);
 
 In any query remember to add a prefix to the table names if you use one.
 
 ----------------------------------------------------
 
+version 5.3 10 Dec 2019, by Nichlas0010
+
+Added two tables for achievements, one for the metadata and one for storing achieved achievements, as well as a misc table which is essentially just a glorified assoc list
+
+CREATE TABLE `achievements` (
+	`name` VARCHAR(32) NOT NULL,
+	`id` INT UNSIGNED NOT NULL,
+	`descr` VARCHAR(2048) NOT NULL,
+	PRIMARY KEY (`id`)
+) ENGINE=InnoDB;
+
+CREATE TABLE `earned_achievements` (
+	`ckey` VARCHAR(32) NOT NULL,
+	`id` INT UNSIGNED NOT NULL
+) ENGINE=InnoDB;
+
+CREATE TABLE `misc` (
+	`key` VARCHAR(32) NOT NULL,
+	`value` VARCHAR(2048) NOT NULL,
+	PRIMARY KEY (`key`)
+) ENGINE=InnoDB;
+
+----------------------------------------------------
+
 Version 5.2, 28 Aug 2019, by AffectedArc07/TheGamer01
 
 Added a field to the `player` table to track ckey and discord ID relationships

SQL/tgstation_schema.sql

@@ -534,6 +534,16 @@ CREATE TABLE `earned_achievements` (
 	`id` INT UNSIGNED NOT NULL
 ) ENGINE=InnoDB;
 
+--
+-- Table structure for table `achievements`
+--
+DROP TABLE IF EXISTS `misc`;
+CREATE TABLE `misc` (
+	`key` VARCHAR(32) NOT NULL,
+	`value` VARCHAR(2048) NOT NULL,
+	PRIMARY KEY (`key`)
+) ENGINE=InnoDB;
+
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

SQL/tgstation_schema_prefixed.sql

@@ -534,6 +534,16 @@ CREATE TABLE `SS13_earned_achievements` (
 	`id` INT UNSIGNED NOT NULL
 ) ENGINE=InnoDB;
 
+--
+-- Table structure for table `achievements`
+--
+DROP TABLE IF EXISTS `SS13_misc`;
+CREATE TABLE `SS13_misc` (
+	`key` VARCHAR(32) NOT NULL,
+	`value` VARCHAR(2048) NOT NULL,
+	PRIMARY KEY (`key`)
+) ENGINE=InnoDB;
+
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

_maps/RandomRuins/LavaRuins/lavaland_surface_mimingdrill.dmm

@@ -7,7 +7,7 @@
 /area/ruin/unpowered)
 "c" = (
 /obj/structure/falsewall/titanium,
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/ruin/unpowered)
 "d" = (
 /obj/structure/window/shuttle,

_maps/RandomRuins/LavaRuins/lavaland_surface_russianbunker.dmm

@@ -216,7 +216,7 @@
 "aH" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/ruin/unpowered{
 	name = "\improper Russian Bunker";
 	noteleport = 1
@@ -309,7 +309,7 @@
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/turf/open/space/basic,
+/turf/open/floor/plating,
 /area/ruin/unpowered{
 	name = "\improper Russian Bunker";
 	noteleport = 1

_maps/RandomRuins/SpaceRuins/Academy.dmm

@@ -406,7 +406,7 @@
 /area/awaymission/academy/headmaster)
 "bw" = (
 /obj/structure/table/wood,
-/obj/item/guardiancreator/choose,
+/obj/item/guardiancreator,
 /turf/open/floor/engine/cult,
 /area/awaymission/academy/academyengine)
 "bx" = (
@@ -727,6 +727,7 @@
 "cF" = (
 /obj/effect/immovablerod{
 	dir = 4
+	notdebris = 1
 	},
 /obj/structure/cable,
 /obj/structure/cable{