Merge branch 'master' into upstream-mirror-4683

Fluffy-Frontier · Dec 19, 2024 · a2cbcee · a2cbcee
2 parents 0ebc258 + 5a49626
commit a2cbcee
Show file tree

Hide file tree

Showing 837 changed files with 5,915 additions and 4,329 deletions.
diff --git a/SQL/optimisations_2017-02-19.sql b/SQL/optimisations_2017-02-19.sql
@@ -124,7 +124,7 @@ ALTER TABLE `library`
 , CHANGE COLUMN `deleted` `deleted` TINYINT(1) UNSIGNED NULL DEFAULT NULL;
 
 ALTER TABLE `messages`
- CHANGE COLUMN `type` `type` ENUM('memo', 'message', 'message sent', 'note', 'watchlist entry') NOT NULL
+ CHANGE COLUMN `type` `type` ENUM('memo', 'message', 'message sent', 'note', 'watchlist entry', 'eventmaker note') NOT NULL
 , CHANGE COLUMN `text` `text` VARCHAR(2048) NOT NULL
 , CHANGE COLUMN `secret` `secret` TINYINT(1) UNSIGNED NOT NULL;
 

diff --git a/SQL/tgstation_schema.sql b/SQL/tgstation_schema.sql
@@ -307,7 +307,7 @@ DROP TABLE IF EXISTS `messages`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `messages` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `type` enum('memo','message','message sent','note','watchlist entry') NOT NULL,
+  `type` enum('memo','message','message sent','note','watchlist entry', 'eventmaker note') NOT NULL,
   `targetckey` varchar(32) NOT NULL,
   `adminckey` varchar(32) NOT NULL,
   `text` varchar(2048) NOT NULL,

diff --git a/SQL/tgstation_schema_prefixed.sql b/SQL/tgstation_schema_prefixed.sql
@@ -305,7 +305,7 @@ DROP TABLE IF EXISTS `SS13_messages`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `SS13_messages` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `type` enum('memo','message','message sent','note','watchlist entry') NOT NULL,
+  `type` enum('memo','message','message sent','note','watchlist entry', 'eventmaker note') NOT NULL,
   `targetckey` varchar(32) NOT NULL,
   `adminckey` varchar(32) NOT NULL,
   `text` varchar(2048) NOT NULL,

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -467,7 +467,7 @@
 	pixel_y = 4
 	},
 /obj/item/bodypart/chest,
-/obj/item/organ/internal/heart,
+/obj/item/organ/heart,
 /obj/item/multitool,
 /turf/open/floor/iron/freezer,
 /area/ruin/powered)

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm
@@ -142,7 +142,7 @@
 /turf/open/misc/ice/icemoon,
 /area/icemoon/underground/explored)
 "sp" = (
-/obj/item/organ/internal/monster_core/regenerative_core/legion{
+/obj/item/organ/monster_core/regenerative_core/legion{
 	time_to_decay = 0;
 	pixel_x = 11;
 	pixel_y = 4;
@@ -273,7 +273,7 @@
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
 "JP" = (
-/obj/item/organ/internal/monster_core/regenerative_core/legion{
+/obj/item/organ/monster_core/regenerative_core/legion{
 	time_to_decay = 0;
 	pixel_x = -12;
 	pixel_y = -4;
@@ -365,7 +365,7 @@
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "VT" = (
-/obj/item/organ/internal/monster_core/regenerative_core/legion{
+/obj/item/organ/monster_core/regenerative_core/legion{
 	time_to_decay = 0;
 	pixel_x = 4;
 	pixel_y = 3;