Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station.dm
#	icons/mob/screen_alert.dmi

code/__DEFINES/role_preferences.dm

@@ -37,6 +37,7 @@
 #define ROLE_MORPH				"morph"
 #define ROLE_ERT				"emergency response team"
 #define ROLE_NYMPH				"Dionaea"
+#define ROLE_GSPIDER				"giant spider"
 
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
@@ -69,4 +70,5 @@ var/global/list/special_roles = list(
 	ROLE_GUARDIAN,
 	ROLE_MORPH,
 	ROLE_TRADER,
+	ROLE_GSPIDER,
 )

code/__DEFINES/rolebans.dm

@@ -17,6 +17,7 @@ var/global/list/antag_roles = list(
 	ROLE_REVENANT,
 	ROLE_GUARDIAN,
 	ROLE_MORPH,
+	ROLE_GSPIDER,
 )
 
 // Bannable other roles
@@ -26,4 +27,4 @@ var/global/list/other_roles = list(
 	ROLE_ERT,
 	"AntagHUD",
 	"Records"
-)
+)