Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware

2020-01-13 03:42:20 -05:00
parent 5f5c45c0ff d233a14d91
commit 92dc5e61c3
1371 changed files with 200178 additions and 202024 deletions
@@ -1,23 +1,23 @@
-// Tool types
-#define TOOL_CROWBAR 		"crowbar"
-#define TOOL_MULTITOOL 		"multitool"
-#define TOOL_SCREWDRIVER 	"screwdriver"
-#define TOOL_WIRECUTTER 	"wirecutter"
-#define TOOL_WRENCH 		"wrench"
-#define TOOL_WELDER 		"welder"
-#define TOOL_ANALYZER		"analyzer"
-#define TOOL_MINING			"mining"
-#define TOOL_SHOVEL			"shovel"
-#define TOOL_RETRACTOR	 	"retractor"
-#define TOOL_HEMOSTAT 		"hemostat"
-#define TOOL_CAUTERY 		"cautery"
-#define TOOL_DRILL			"drill"
-#define TOOL_SCALPEL		"scalpel"
-#define TOOL_SAW			"saw"
-//Glasswork Tools
-#define TOOL_BLOW			"blowing_rod"
-#define TOOL_GLASS_CUT		"glasskit"
-
-// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
-// tool sound is only played when op is started. If not, it's played twice.
-#define MIN_TOOL_SOUND_DELAY 20
+// Tool types
+#define TOOL_CROWBAR 		"crowbar"
+#define TOOL_MULTITOOL 		"multitool"
+#define TOOL_SCREWDRIVER 	"screwdriver"
+#define TOOL_WIRECUTTER 	"wirecutter"
+#define TOOL_WRENCH 		"wrench"
+#define TOOL_WELDER 		"welder"
+#define TOOL_ANALYZER		"analyzer"
+#define TOOL_MINING			"mining"
+#define TOOL_SHOVEL			"shovel"
+#define TOOL_RETRACTOR	 	"retractor"
+#define TOOL_HEMOSTAT 		"hemostat"
+#define TOOL_CAUTERY 		"cautery"
+#define TOOL_DRILL			"drill"
+#define TOOL_SCALPEL		"scalpel"
+#define TOOL_SAW			"saw"
+//Glasswork Tools
+#define TOOL_BLOW			"blowing_rod"
+#define TOOL_GLASS_CUT		"glasskit"
+
+// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
+// tool sound is only played when op is started. If not, it's played twice.
+#define MIN_TOOL_SOUND_DELAY 20