Merge branch 'master' into translate

ss220club · May 20, 2024 · 2ffad6e · 2ffad6e
2 parents 5c1f353 + bc91410
commit 2ffad6e
Show file tree

Hide file tree

Showing 178 changed files with 3,212 additions and 1,336 deletions.
diff --git a/.github/workflows/merge_upstream_master.yml b/.github/workflows/merge_upstream_master.yml
@@ -113,7 +113,7 @@ jobs:
 
       - name: Rebuild TGUI
         run: |
-          if git diff-tree --name-only -r $(git rev-parse HEAD~2) | grep "tgui/public/"
+          if git diff-tree --name-only -r $(git rev-parse HEAD~2) | grep "tgui/public/" ; then
             bash tgui/bin/tgui
             git commit -m "Rebuild TGUI"
             git push origin

diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql
@@ -406,8 +406,11 @@ CREATE TABLE `notes` (
   `server` varchar(50) NOT NULL,
   `crew_playtime` mediumint(8) UNSIGNED DEFAULT '0',
   `automated` TINYINT(3) UNSIGNED NULL DEFAULT '0',
+  `deleted` TINYINT(4) NOT NULL DEFAULT '0',
+  `deletedby` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
   PRIMARY KEY (`id`),
-  KEY `ckey` (`ckey`)
+  KEY `ckey` (`ckey`),
+  KEY `deleted` (`deleted`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 /*!40101 SET character_set_client = @saved_cs_client */;
 

diff --git a/SQL/updates/55-56.sql b/SQL/updates/55-56.sql
@@ -0,0 +1,7 @@
+# Updating DB from 55-56 ~AffectedArc07
+# Adds a new column to the notes table for tracking deleted notes
+ALTER TABLE `notes`
+	ADD COLUMN `deleted` TINYINT NOT NULL DEFAULT 0 AFTER `automated`,
+	ADD COLUMN `deletedby` VARCHAR(32) NULL DEFAULT NULL AFTER `deleted`,
+	ADD INDEX `deleted` (`deleted`);
+
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
@@ -490,6 +490,11 @@
 	icon_state = "green"
 	},
 /area/holodeck/source_emptycourt)
+"cb" = (
+/obj/structure/closet/abductor,
+/obj/item/storage/belt/janitor/abductor/full,
+/turf/simulated/floor/plating/abductor,
+/area/abductor_ship)
 "cc" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -46742,7 +46747,7 @@ aN
 aN
 lz
 lz
-nr
+cb
 bK
 nr
 lz
@@ -46756,7 +46761,7 @@ aN
 aN
 lz
 lz
-nr
+cb
 bK
 nr
 lz
@@ -50340,7 +50345,7 @@ aN
 aN
 lz
 lz
-nr
+cb
 bK
 nr
 lz
@@ -50354,7 +50359,7 @@ aN
 aN
 lz
 lz
-nr
+cb
 bK
 nr
 lz

diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
@@ -52327,12 +52327,6 @@
 	icon_state = "vault"
 	},
 /area/station/engineering/gravitygenerator)
-"dCJ" = (
-/obj/structure/transit_tube/cap{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/station/turret_protected/aisat/interior)
 "dCM" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -57689,10 +57683,12 @@
 	layer = 4;
 	pixel_y = 32
 	},
-/obj/structure/transit_tube/station,
 /obj/structure/transit_tube_pod{
 	dir = 4
 	},
+/obj/structure/transit_tube/station/reverse/flipped{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -64056,9 +64052,6 @@
 	name = "north bump";
 	pixel_y = 24
 	},
-/obj/structure/transit_tube/cap{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -72430,11 +72423,11 @@
 /turf/simulated/floor/plasteel,
 /area/station/supply/storage)
 "nrh" = (
-/obj/structure/transit_tube/station,
 /obj/structure/transit_tube_pod{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/obj/structure/transit_tube/station/reverse,
 /turf/simulated/floor/plating,
 /area/station/turret_protected/aisat/interior)
 "nrD" = (
@@ -131948,7 +131941,7 @@ aab
 aaa
 cQp
 wza
-dCJ
+dnW
 dnv
 dnW
 diz

diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
@@ -87549,9 +87549,6 @@
 /area/station/maintenance/starboard)
 "rjL" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/transit_tube/cap{
-	dir = 8
-	},
 /obj/item/radio/intercom{
 	name = "south bump";
 	pixel_y = -28
@@ -97341,9 +97338,7 @@
 /obj/machinery/ai_status_display{
 	pixel_y = -32
 	},
-/obj/structure/transit_tube/station{
-	dir = 1
-	},
+/obj/structure/transit_tube/station/reverse/flipped,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"

diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
@@ -19446,10 +19446,12 @@
 /turf/simulated/floor/wood,
 /area/station/command/office/captain/bedroom)
 "bsI" = (
-/obj/structure/transit_tube/station,
 /obj/structure/sign/securearea{
 	pixel_y = 32
 	},
+/obj/structure/transit_tube/station/reverse/flipped{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "darkbluecorners"
@@ -53883,9 +53885,6 @@
 	},
 /area/station/medical/virology)
 "hkm" = (
-/obj/structure/transit_tube/cap{
-	dir = 4
-	},
 /obj/machinery/status_display{
 	layer = 4;
 	pixel_y = 32

diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
@@ -41614,9 +41614,6 @@
 /area/station/maintenance/turbine)
 "dgT" = (
 /obj/machinery/firealarm/directional/north,
-/obj/structure/transit_tube/cap{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "darkblue"
@@ -58643,7 +58640,9 @@
 /area/station/maintenance/aft)
 "iuO" = (
 /obj/machinery/status_display/directional/north,
-/obj/structure/transit_tube/station,
+/obj/structure/transit_tube/station/reverse/flipped{
+	dir = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "darkbluefull"
 	},
@@ -82397,9 +82396,6 @@
 /area/station/maintenance/asmaint)
 "raN" = (
 /obj/effect/turf_decal/stripes/end,
-/obj/structure/transit_tube/cap{
-	dir = 1
-	},
 /turf/simulated/floor/plating,
 /area/station/turret_protected/aisat/interior)
 "raP" = (
@@ -91643,8 +91639,8 @@
 /turf/simulated/floor/plating,
 /area/station/maintenance/asmaint)
 "uwh" = (
-/obj/structure/transit_tube/station{
-	dir = 4
+/obj/structure/transit_tube/station/reverse/flipped{
+	dir = 8
 	},
 /obj/structure/transit_tube_pod{
 	dir = 1

diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
@@ -50395,9 +50395,6 @@
 "eJn" = (
 /obj/item/radio/intercom/directional/south,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/transit_tube/cap{
-	dir = 8
-	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"
@@ -58052,9 +58049,7 @@
 /area/station/supply/miningdock)
 "hgg" = (
 /obj/machinery/ai_status_display/south,
-/obj/structure/transit_tube/station{
-	dir = 1
-	},
+/obj/structure/transit_tube/station/reverse/flipped,
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "vault"

diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
@@ -19028,7 +19028,9 @@
 /turf/simulated/floor/wood,
 /area/station/command/office/captain/bedroom)
 "bsI" = (
-/obj/structure/transit_tube/station,
+/obj/structure/transit_tube/station/reverse/flipped{
+	dir = 1
+	},
 /obj/structure/sign/securearea{
 	pixel_y = 32
 	},
@@ -52918,9 +52920,6 @@
 	},
 /area/station/medical/virology)
 "hkm" = (
-/obj/structure/transit_tube/cap{
-	dir = 4
-	},
 /obj/machinery/status_display/directional/north,
 /obj/effect/turf_decal/stripes/corner{
 	dir = 1

diff --git a/code/__DEFINES/atmospherics_defines.dm b/code/__DEFINES/atmospherics_defines.dm
@@ -141,6 +141,9 @@
 
 //LAVALAND
 #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50 //what pressure you have to be under to increase the effect of equipment meant for lavaland
+#define LAVALAND_TEMPERATURE 500
+#define LAVALAND_OXYGEN 8
+#define LAVALAND_NITROGEN 14
 
 // Reactions
 #define N2O_DECOMPOSITION_MIN_ENERGY		1400

diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -342,6 +342,8 @@
 #define COMSIG_MIND_TRANSER_TO "mind_transfer_to"
 ///called on the mob instead of the mind
 #define COMSIG_BODY_TRANSFER_TO "body_transfer_to"
+///called when the mind is initialized (called every time the mob logins)
+#define COMSIG_MIND_INITIALIZE "mind_initialize"
 
 // /mob signals
 

diff --git a/code/__DEFINES/emotes_defines.dm b/code/__DEFINES/emotes_defines.dm
@@ -57,6 +57,8 @@
 #define EMOTE_TARGET_BHVR_RAW 4
 /// The emote target should be just a number. Anything else will be rejected.
 #define EMOTE_TARGET_BHVR_NUM 5
+/// The emote target is used elsewhere, and processing should be skipped.
+#define EMOTE_TARGET_BHVR_IGNORE 6
 
 // This set determines the type of target that we want to check for.
 
@@ -75,3 +77,12 @@
 
 /// List of emotes useable by ghosties
 #define USABLE_DEAD_EMOTES list("*flip", "*spin")
+
+// Strings used for the rock paper scissors emote and status effect
+#define RPS_EMOTE_ROCK 		"rock"
+#define RPS_EMOTE_PAPER 	"paper"
+#define RPS_EMOTE_SCISSORS 	"scissors"
+
+#define RPS_EMOTE_THEY_WIN		"aww"
+#define RPS_EMOTE_WE_WIN		"yay"
+#define RPS_EMOTE_TIE			"tie"
diff --git a/code/__DEFINES/food_defines.dm b/code/__DEFINES/food_defines.dm
@@ -1,5 +1,13 @@
-// Used for secondary goals.
+/// Used for secondary goals.
+/// TOO easy, not accepted for variety goals.
 #define FOOD_GOAL_SKIP 0
+/// Easy food, ask for a lot for single goals.
 #define FOOD_GOAL_EASY 1
+/// Normal food, ask for a middling amount for single goals.
 #define FOOD_GOAL_NORMAL 2
+/// Hard reagent, ask for a little for single goals.
 #define FOOD_GOAL_HARD 3
+/// TOO hard, accepted for variety goals, but never used for single goals.
+#define FOOD_GOAL_EXCESSIVE 4
+/// Same as FOOD_GOAL_EXCESSIVE, just different name to indicate that there's another version of this food that's used in variety goals.
+#define FOOD_GOAL_DUPLICATE FOOD_GOAL_EXCESSIVE
diff --git a/code/__DEFINES/mecha_hides.dm b/code/__DEFINES/mecha_hides.dm
@@ -0,0 +1,6 @@
+#define HIDES_COVERED_FULL 3
+#define PLATES_COVERED_FULL 3
+
+#define DRAKE_HIDES_COVERED_SLIGHT 1
+#define DRAKE_HIDES_COVERED_MODERATE 2
+#define DRAKE_HIDES_COVERED_FULL 3
diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm
@@ -250,6 +250,10 @@
 							0.4,0.6,0.0,\
 							0.2,0.2,0.6)
 
+#define MATRIX_STANDARD list(1.0,0.0,0.0,\
+							0.0,1.0,0.0,\
+							0.0,0.0,1.0)
+
 /*
 	Used for wire name appearances. Replaces the color name on the left with the one on the right.
 	The color on the left is the one used as the actual color of the wire, but it doesn't look good when written.
@@ -398,7 +402,7 @@
 #define INVESTIGATE_BOMB "bombs"
 
 // The SQL version required by this version of the code
-#define SQL_VERSION 552206 // SS220 EDIT
+#define SQL_VERSION 562206 // SS220 EDIT
 
 // Vending machine stuff
 #define CAT_NORMAL (1<<0)

diff --git a/code/__DEFINES/particle_defines.dm b/code/__DEFINES/particle_defines.dm
@@ -5,3 +5,16 @@
 #define DEBRIS_GLASS "glass"
 #define DEBRIS_LEAF "leaf"
 #define DEBRIS_SNOW "snow"
+
+/*
+ * Generator defines
+ */
+
+#define GEN_NUM "num"
+#define GEN_VECTOR "vector"
+#define GEN_BOX "box"
+#define GEN_COLOR "color"
+#define GEN_CIRCLE "circle"
+#define GEN_SPHERE "sphere"
+#define GEN_SQUARE "square"
+#define GEN_CUBE "cube"
diff --git a/code/__DEFINES/reagents_defines.dm b/code/__DEFINES/reagents_defines.dm
@@ -34,7 +34,13 @@
 #define BLOOD_TYPE_FAKE_BLOOD	"Vh Null"
 
 /// Used for secondary goals.
+/// TOO easy, not accepted for variety goals.
 #define REAGENT_GOAL_SKIP 0
+/// Easy reagent, ask for a lot for single goals.
 #define REAGENT_GOAL_EASY 1
+/// Normal reagent, ask for a middling amount for single goals.
 #define REAGENT_GOAL_NORMAL 2
+/// Hard reagent, ask for a little for single goals.
 #define REAGENT_GOAL_HARD 3
+/// TOO hard, accepted for variety goals, but never used for single goals.
+#define REAGENT_GOAL_EXCESSIVE 4
diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm
@@ -178,6 +178,7 @@
 #define STATUS_EFFECT_HIGHFIVE /datum/status_effect/high_five
 #define STATUS_EFFECT_DAP /datum/status_effect/high_five/dap
 #define STATUS_EFFECT_HANDSHAKE /datum/status_effect/high_five/handshake
+#define STATUS_EFFECT_RPS /datum/status_effect/high_five/rps
 
 #define STATUS_EFFECT_CHARGING /datum/status_effect/charging
 

diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
@@ -239,6 +239,8 @@ GLOBAL_LIST_EMPTY(radial_menus)
 				return
 			else
 				next_check = world.time + check_delay
+		// if you're wondering why your radial menus aren't clickable while debugging:
+		// it's probably the stoplag call here, try it again without any breakpoints
 		stoplag(1)
 
 /datum/radial_menu/Destroy()