Couple of fixes, almost ready to go

This commit is contained in:
keronshb
2021-05-18 22:12:02 -04:00
parent d2f69acaf8
commit b8b25662ff
5 changed files with 5 additions and 7 deletions

View File

@@ -71,8 +71,8 @@ GLOBAL_LIST_INIT(special_roles, list(
ROLE_SENTIENCE,
ROLE_GANG = /datum/game_mode/gang,
ROLE_HERETIC = /datum/game_mode/heretics,
ROLE_SPACE_DRAGON,
ROLE_BLOODSUCKER = /datum/game_mode/bloodsucker
ROLE_BLOODSUCKER = /datum/game_mode/bloodsucker,
ROLE_SPACE_DRAGON
//ROLE_MONSTERHUNTER Disabled for now
))

View File

@@ -14,7 +14,6 @@
Today, we will snuff out one of those lights.</b>")
to_chat(owner, "<span class='boldwarning'>You have five minutes to find a safe location to place down the first rift. If you take longer than five minutes to place a rift, you will be returned from whence you came.</span>")
owner.announce_objectives()
owner.announce_objectives()
SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg'))
/datum/antagonist/space_dragon/proc/forge_objectives()

View File

@@ -12,7 +12,6 @@
/datum/round_event/ghost_role/space_dragon/announce(fake)
priority_announce("A large organic energy flux has been recorded near of [station_name()], please stand-by.", "Lifesign Alert")
/datum/round_event/ghost_role/space_dragon/spawn_role()
var/list/spawn_locs = list()
@@ -25,11 +24,11 @@
message_admins("No valid spawn locations found, aborting...")
return MAP_ERROR
var/list/candidates = get_candidates(ROLE_SPACE_DRAGON, ROLE_SPACE_DRAGON)
var/list/candidates = get_candidates(ROLE_SPACE_DRAGON, null, ROLE_SPACE_DRAGON)
if(!candidates.len)
return NOT_ENOUGH_PLAYERS
var/mob/dead/selected = pick(candidates)
var/mob/dead/selected = pick_n_take(candidates)
var/datum/mind/player_mind = new /datum/mind(selected.key)
player_mind.active = TRUE

View File

@@ -495,7 +495,7 @@
to_chat(S, "<span class='warning'>Your death has left you unable to summon rifts!</span>")
return
var/area/A = get_area(S)
if(!(A.area_flags & VALID_TERRITORY))
if(!(A.area_flags & (VALID_TERRITORY | BLOBS_ALLOWED)))
to_chat(S, "<span class='warning'>You can't summon a rift here! Try summoning somewhere secure within the station!</span>")
return
for(var/obj/structure/carp_rift/rift in S.rift_list)