mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 08:34:16 +01:00
Merge pull request #6125 from Crazylemon64/spiders_non_xeno
Giant Spiders no longer clog up the Alien role channel
This commit is contained in:
@@ -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,
|
||||
)
|
||||
|
||||
@@ -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"
|
||||
)
|
||||
)
|
||||
|
||||
@@ -201,7 +201,7 @@
|
||||
if(player_spiders && !selecting_player)
|
||||
selecting_player = 1
|
||||
spawn()
|
||||
var/list/candidates = pollCandidates("Do you want to play as a spider?", ROLE_ALIEN, 1)
|
||||
var/list/candidates = pollCandidates("Do you want to play as a spider?", ROLE_GSPIDER, 1)
|
||||
|
||||
if(candidates.len)
|
||||
var/mob/C = pick(candidates)
|
||||
|
||||
@@ -23,6 +23,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
|
||||
// ROLE_GANG = 21,
|
||||
ROLE_BORER = 21,
|
||||
ROLE_NINJA = 21,
|
||||
ROLE_GSPIDER = 21,
|
||||
ROLE_ABDUCTOR = 30,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user