Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

code/__DEFINES/gamemode.dm

@@ -32,7 +32,6 @@
 #define SPECIAL_ROLE_FREE_GOLEM "Free Golem"
 #define SPECIAL_ROLE_GOLEM "Golem"
 #define SPECIAL_ROLE_HEAD_REV "Head Revolutionary"
-#define SPECIAL_ROLE_HONKSQUAD "Honksquad"
 #define SPECIAL_ROLE_REV "Revolutionary"
 #define SPECIAL_ROLE_MORPH "Morph"
 #define SPECIAL_ROLE_MULTIVERSE "Multiverse Traveller"

code/__DEFINES/is_helpers.dm

@@ -22,8 +22,6 @@
 
 #define iseffect(A) (istype(A, /obj/effect))
 
-#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable
-
 #define isclothing(A) (istype(A, /obj/item/clothing))
 
 #define is_pen(W) (istype(W, /obj/item/pen))

code/__DEFINES/role_preferences.dm

@@ -39,11 +39,16 @@
 #define ROLE_ERT				"emergency response team"
 #define ROLE_NYMPH				"Dionaea"
 #define ROLE_GSPIDER			"giant spider"
+#define ROLE_TSPIDER			"terror spider"
 #define ROLE_DRONE				"drone"
 #define ROLE_DEATHSQUAD			"deathsquad"
 #define ROLE_EVENTMISC			"eventmisc"
 #define ROLE_GHOST				"ghost role"
 
+// Misc jobban categories
+#define ROLEBAN_AHUD			"AntagHUD"
+#define ROLEBAN_RECORDS			"Records"
+
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
 //The gamemode specific ones are just so the gamemodes can query whether a player is old enough
 //(in game days played) to play that role

code/__DEFINES/rolebans.dm

@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(antag_roles, list(
 	ROLE_GUARDIAN,
 	ROLE_MORPH,
 	ROLE_GSPIDER,
+	ROLE_TSPIDER,
 ))
 
 // Bannable other roles
@@ -26,6 +27,6 @@ GLOBAL_LIST_INIT(other_roles, list(
 	ROLE_NYMPH,
 	ROLE_ERT,
 	ROLE_GHOST,
-	"AntagHUD",
-	"Records"
+	ROLEBAN_AHUD,
+	ROLEBAN_RECORDS
 ))