Merge branch 'master' into cosmetics

Foundation-19 · Mar 8, 2024 · c9b023c · c9b023c
2 parents 1b59efb + 03d8a7e
commit c9b023c
Show file tree

Hide file tree

Showing 68 changed files with 541,762 additions and 153,505 deletions.
diff --git a/_maps/map_files/Pahrump/Dungeons.dmm b/_maps/map_files/Pahrump/Dungeons.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm b/_maps/map_files/Pahrump/Pahrump-Surface-2.dmm
diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
diff --git a/_maps/map_files/Pahrump/old/Dungeons-old.dmm b/_maps/map_files/Pahrump/old/Dungeons-old.dmm
diff --git a/_maps/map_files/Pahrump/old/Dungeons.dmm b/_maps/map_files/Pahrump/old/Dungeons.dmm
diff --git a/_maps/map_files/Pahrump/old/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/old/Pahrump-Above-3.dmm
diff --git a/_maps/map_files/Pahrump/old/Pahrump-Surface-2.dmm b/_maps/map_files/Pahrump/old/Pahrump-Surface-2.dmm
diff --git a/_maps/map_files/Pahrump/old/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/old/Pahrump-Underground-1.dmm
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -9847,13 +9847,6 @@
 /obj/effect/turf_decal,
 /turf/open/floor/plasteel,
 /area/centcom/supplypod/loading/one)
-"Vy" = (
-/obj/machinery/door/airlock/centcom{
-	name = "CentCom Supply";
-	req_access_txt = "106"
-	},
-/turf/open/floor/plasteel/dark,
-/area/tdome/tdomeobserve)
 "VD" = (
 /obj/effect/landmark/thunderdome/two,
 /turf/open/floor/plasteel,
@@ -27502,15 +27495,15 @@ ix
 ix
 ix
 ix
-Vy
+VT
 ix
 ix
 ix
 ix
 ix
 ix
 ix
-Vy
+VT
 ix
 ix
 ix
@@ -27763,14 +27756,14 @@ IM
 Tt
 iE
 iE
-iK
+iE
 iE
 iE
 JX
 IM
 Tt
 iE
-iK
+iE
 iE
 VT
 Ut
@@ -28020,14 +28013,14 @@ xY
 Tt
 iE
 iE
-iL
+iE
 iE
 iE
 JX
 xY
 Tt
 iE
-iL
+iE
 iE
 VT
 Ut
@@ -28273,15 +28266,15 @@ ix
 ix
 ix
 ix
-Vy
+VT
 ix
 ix
 ix
 ix
 ix
 ix
 ix
-Vy
+VT
 ix
 ix
 ix

diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
@@ -118,6 +118,9 @@
 #define CAT_MISCCLOTHING "Misc Clothing"
 #define CAT_DRINK "Drinks"
 #define CAT_EXPLOSIVE "Explosives"
+#define CAT_CARPARTS "Vehicle Equipment"
+#define CAT_CARPART "Vehicle parts"
+#define CAT_CAREQUIP "Vehicle equipment"
 
 #define RCD_FLOORWALL 1
 #define RCD_AIRLOCK 2

diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
@@ -70,9 +70,10 @@
 // The numbers just define the ordering, they are meaningless otherwise.
 
 #define INIT_ORDER_PROFILER			100
-#define INIT_ORDER_FAIL2TOPIC		99
-#define INIT_ORDER_TITLE			98
-#define INIT_ORDER_GARBAGE			95
+#define INIT_ORDER_FAIL2TOPIC		98
+#define INIT_ORDER_TITLE			97
+#define INIT_ORDER_GARBAGE			96
+#define INIT_ORDER_BCCM 			95
 #define INIT_ORDER_DBCORE			94
 #define INIT_ORDER_STATPANELS		93
 #define INIT_ORDER_BLACKBOX			92

diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
@@ -355,6 +355,7 @@
 #define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
 #define MARTIAL_ARTIST_TRAIT "martial_artist"
 #define BERSERKER_TRAIT "berserker"
+#define WRESTLING_TRAIT "wrestling"
 #define SLEEPING_CARP_TRAIT "sleeping_carp"
 #define RISING_BASS_TRAIT "rising_bass"
 #define ABDUCTOR_ANTAGONIST "abductor-antagonist"

diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm
@@ -826,3 +826,21 @@ GLOBAL_LIST_INIT(hex_muted3, list("0","2"))
 	if(prob(15))
 		corrupted_text += pick(corruption_options)
 	return corrupted_text
+
+
+/proc/sql_sanitize_text(text)
+	text = replacetext(text, "'", "''")
+	text = replacetext(text, ";", "")
+	text = replacetext(text, "&", "")
+	return text
+
+/proc/new_sql_sanitize_text(text)
+	text = replacetext(text, "'", "")
+	text = replacetext(text, ";", "")
+	text = replacetext(text, "&", "")
+	text = replacetext(text, "`", "")
+	return text
+
+/proc/remove_all_spaces(text)
+	text = replacetext(text, " ", "")
+	return text
diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm
@@ -79,7 +79,7 @@
 /obj/item/Adjacent(atom/neighbor, atom/target, atom/movable/mover, recurse = 1)
 	if(neighbor == loc)
 		return 1
-	if(isitem(loc))
+	if(isitem(loc) || istype(loc, /obj/mecha))
 		if(recurse > 0)
 			for(var/obj/item/item_loc as anything in get_locs())
 				if(item_loc.Adjacent(neighbor, target, mover, recurse - 1))

diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
@@ -18,7 +18,7 @@
 	var/list/mode_names
 	var/list/mode_reports
 	var/list/mode_false_report_weight
-
+	var/bccm = FALSE
 	var/motd
 	// var/policy
 
@@ -57,6 +57,8 @@
 
 	if (Master)
 		Master.OnConfigLoad()
+	if (CONFIG_GET(flag/use_bccm))
+		config.bccm = TRUE
 
 /datum/controller/configuration/proc/full_wipe()
 	if(IsAdminAdvancedProcCall())

diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm
@@ -394,6 +394,8 @@
 
 /datum/config_entry/flag/allow_map_voting
 
+/datum/config_entry/flag/use_bccm
+
 /datum/config_entry/number/client_warn_version
 	config_entry_value = null
 	min_val = 500