font awesome update (#17991)

* font awesome

* .

* .

* deps

* libcurl

* .

* fix color particle

Dockerfile

@@ -14,7 +14,8 @@ RUN apt-get install -y --no-install-recommends \
 	curl \
 	unzip \
 	make \
-	libstdc++6:i386
+	libstdc++6:i386 \
+    libcurl4:i386
 
 COPY dependencies.sh .
 
@@ -34,7 +35,8 @@ FROM byond AS build
 WORKDIR /vorestation
 
 RUN apt-get install -y --no-install-recommends \
-	curl
+	curl \
+    unzip
 
 COPY . .
 
@@ -68,7 +70,8 @@ WORKDIR /vorestation
 
 RUN apt-get install -y --no-install-recommends \
         libssl3 \
-        zlib1g:i386
+        zlib1g:i386 \
+        libcurl4:i386
 
 COPY --from=build /vorestation/ ./
 COPY --from=rust_g /rust_g/target/i686-unknown-linux-gnu/release/librust_g.so ./librust_g.so

code/_helpers/generators.dm

@@ -4,8 +4,32 @@
  * * flat list of strings for args given to the generator.
  * * Note: this means things like "list(1,2,3)" will need to be processed
  */
-/proc/return_generator_args(generator/target)
+/proc/return_generator_args(generator/target, has_lists = FALSE)
 	var/string_repr = "[target]" //the name of the generator is the string representation of its _binobj, which also contains its args
 	string_repr = copytext(string_repr, 11, length(string_repr)) // strips extraneous data
 	string_repr = replacetext(string_repr, "\"", "") // removes the " around the type
-	return splittext(string_repr, ", ")
+	var/list/splitted = splittext(string_repr, ", ")
+	if(has_lists)
+		var/list/real_list = list()
+		var/last_index = 0
+		var/combine = FALSE
+		for(var/entry in splitted)
+			if(findtext(entry, "list"))
+				real_list += entry
+				combine = TRUE
+				last_index++
+				continue
+			else if(findtext(entry, ")"))
+				combine = FALSE
+				real_list[last_index] += ", [entry]"
+				continue
+
+			if(combine)
+				real_list[last_index] += ", [entry]"
+				continue
+
+			real_list += entry
+			last_index++
+		return real_list
+
+	return splitted

code/modules/admin/view_variables/particle_editor.dm

@@ -62,7 +62,7 @@
 	else
 		data["fadein"] = fadein //float
 	if(isgenerator(color))
-		data["color"] = return_generator_args(color)
+		data["color"] = return_generator_args(color, TRUE)
 	else
 		data["color"] = color //float OR string
 	if(isgenerator(color_change))

code/modules/tooltip/tooltip.html

@@ -80,6 +80,9 @@
 		.operative .wrap {border-color: #13121b;}
 		.operative .content {color: #b01232; border-color: #13121b; background-color: #282831;}
 
+		.clockwork .wrap {border-color: #170800;}
+		.clockwork .content {color: #B18B25; border-color: #000000; background-color: #5F380E;}
+
 		.trasen-knox .wrap {border-color: #998e81;}
 		.trasen-knox .content {color: #3ce375; border-color: #998e81; background-color: #1e1d21;}
 

html/font-awesome/README.MD

@@ -1,6 +1,4 @@
-Due to the fact browse_rsc can't create subdirectories, every time you update font-awesome you'll need to change relative webfont references in all.min.css
-eg ../webfonts/fa-regular-400.ttf => fa-regular-400.ttf (or whatever you call it in asset datum)
+Due to the fact browse_rsc can't create subdirectories, every time you update font-awesome you'll need to ensure the relative webfont references in all.min.css
+are correct eg ../webfonts/fa-regular-400.ttf => fa-regular-400.ttf (or whatever you call it in asset datum)
 
-Second change is ripping out file types other than woff and eot(ie8) from the css
-
-Finally, removing brand related css.
+Finally, removing brand related css. You can do this by formatting the css, removing them manually (or some regex?) and then minifying it.

tools/tgs_scripts/PreCompile.sh

@@ -29,7 +29,7 @@ fi
 echo "Deploying rust-g..."
 git checkout "$RUST_G_VERSION"
 env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --ignore-rust-version --release --target=i686-unknown-linux-gnu
-mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so"
+cp -f target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so"
 cd ..
 
 #
@@ -50,10 +50,10 @@ fi
 echo "Deploying Dreamlaua..."
 git checkout "$DREAMLUAU_VERSION"
 env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --ignore-rust-version --release --target=i686-unknown-linux-gnu
-mv target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so"
+cp -f target/i686-unknown-linux-gnu/release/libdreamluau.so "$1/libdreamluau.so"
 cd ..
 
 # compile tgui
 echo "Compiling tgui..."
 cd "$1"
-env TG_BOOTSTRAP_CACHE="$original_dir" CBT_BUILD_MODE="TGS" tools/bootstrap/javascript.sh tools/build/build.js
+env TG_BOOTSTRAP_CACHE="$original_dir" CBT_BUILD_MODE="TGS" tools/bootstrap/javascript.sh tools/build/build.ts