cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup of _HELPERS/game.dm (#61859)

Browse Source 
some more cleanup, game.dm this time
This commit is contained in:
Ghilker
2021-10-03 16:51:52 -04:00
committed by GitHub
parent 0017cc60dc
commit 682e7132b5
30 changed files with 304 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/game.dm
+270 -242
View File
@@ -1,60 +1,76 @@
//supposedly the fastest way to do this according to https://gist.github.com/Giacom/be635398926bb463b42a
///Returns a list of turf in a square
#define RANGE_TURFS(RADIUS, CENTER) \
block( \
locate(max(CENTER.x-(RADIUS),1), max(CENTER.y-(RADIUS),1), CENTER.z), \
locate(min(CENTER.x+(RADIUS),world.maxx), min(CENTER.y+(RADIUS),world.maxy), CENTER.z) \
)
///Returns all turfs in a zlevel
#define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL))
#define CULT_POLL_WAIT 2400
///Time before being allowed to select a new cult leader again
#define CULT_POLL_WAIT 240 SECONDS
/// Returns either the error landmark or the location of the room. Needless to say, if this is used, it means things have gone awry.
#define GET_ERROR_ROOM ((locate(/obj/effect/landmark/error) in GLOB.landmarks_list) || locate(4,4,1))
/proc/get_area_name(atom/X, format_text = FALSE)
var/area/A = isarea(X) ? X : get_area(X)
if(!A)
///Returns the name of the area the atom is in
/proc/get_area_name(atom/checked_atom, format_text = FALSE)
var/area/checked_area = isarea(checked_atom) ? checked_atom : get_area(checked_atom)
if(!checked_area)
return null
return format_text ? format_text(A.name) : A.name
return format_text ? format_text(checked_area.name) : checked_area.name
/proc/get_areas_in_range(dist=0, atom/center=usr)
if(!dist)
var/turf/T = get_turf(center)
return T ? list(T.loc) : list()
/**
* Returns a list with the names of the areas around a center at a certain distance
* Returns the local area if no distance is indicated
* Returns an empty list if the center is null
**/
/proc/get_areas_in_range(distance = 0, atom/center = usr)
if(!distance)
var/turf/center_turf = get_turf(center)
return center_turf ? list(center_turf.loc) : list()
if(!center)
return list()
var/list/turfs = RANGE_TURFS(dist, center)
var/list/turfs = RANGE_TURFS(distance, center)
var/list/areas = list()
for(var/V in turfs)
var/turf/T = V
areas |= T.loc
for(var/turf/checked_turf as anything in turfs)
areas |= checked_turf.loc
return areas
///Returns a list of all areas that are adjacent to the center atom's area, clear the list of nulls at the end.
/proc/get_adjacent_areas(atom/center)
. = list(get_area(get_ranged_target_turf(center, NORTH, 1)),
get_area(get_ranged_target_turf(center, SOUTH, 1)),
get_area(get_ranged_target_turf(center, EAST, 1)),
get_area(get_ranged_target_turf(center, WEST, 1)))
. = list(
get_area(get_ranged_target_turf(center, NORTH, 1)),
get_area(get_ranged_target_turf(center, SOUTH, 1)),
get_area(get_ranged_target_turf(center, EAST, 1)),
get_area(get_ranged_target_turf(center, WEST, 1))
)
listclearnulls(.)
///Returns the open turf next to the center in a specific direction
/proc/get_open_turf_in_dir(atom/center, dir)
var/turf/open/T = get_ranged_target_turf(center, dir, 1)
if(istype(T))
return T
var/turf/open/get_turf = get_ranged_target_turf(center, dir, 1)
if(istype(get_turf))
return get_turf
///Returns a list with all the adjacent open turfs. Clears the list of nulls in the end.
/proc/get_adjacent_open_turfs(atom/center)
. = list(get_open_turf_in_dir(center, NORTH),
get_open_turf_in_dir(center, SOUTH),
get_open_turf_in_dir(center, EAST),
get_open_turf_in_dir(center, WEST))
. = list(
get_open_turf_in_dir(center, NORTH),
get_open_turf_in_dir(center, SOUTH),
get_open_turf_in_dir(center, EAST),
get_open_turf_in_dir(center, WEST)
)
listclearnulls(.)
///Returns a list with all the adjacent areas by getting the adjacent open turfs
/proc/get_adjacent_open_areas(atom/center)
. = list()
var/list/adjacent_turfs = get_adjacent_open_turfs(center)
for(var/I in adjacent_turfs)
. |= get_area(I)
for(var/near_turf in adjacent_turfs)
. |= get_area(near_turf)
/**
* Get a bounding box of a list of atoms.
@@ -77,7 +93,7 @@
max(list_x),
max(list_y))
// Like view but bypasses luminosity check
/// Like view but bypasses luminosity check
/proc/get_hear(range, atom/source)
var/lum = source.luminosity
source.luminosity = 6
@@ -85,120 +101,125 @@
. = view(range, source)
source.luminosity = lum
///Checks if the mob provided (must_be_alone) is alone in an area
/proc/alone_in_area(area/the_area, mob/must_be_alone, check_type = /mob/living/carbon)
var/area/our_area = get_area(the_area)
for(var/C in GLOB.alive_mob_list)
if(!istype(C, check_type))
for(var/carbon in GLOB.alive_mob_list)
if(!istype(carbon, check_type))
continue
if(C == must_be_alone)
if(carbon == must_be_alone)
continue
if(our_area == get_area(C))
if(our_area == get_area(carbon))
return FALSE
return TRUE
//We used to use linear regression to approximate the answer, but Mloc realized this was actually faster.
//And lo and behold, it is, and it's more accurate to boot.
/proc/cheap_hypotenuse(Ax,Ay,Bx,By)
return sqrt(abs(Ax - Bx)**2 + abs(Ay - By)**2) //A squared + B squared = C squared
///Calculate the hypotenuse cheaply (this should be in maths.dm)
/proc/cheap_hypotenuse(Ax, Ay, Bx, By)
return sqrt(abs(Ax - Bx) ** 2 + abs(Ay - By) ** 2) //A squared + B squared = C squared
/proc/circlerange(center=usr,radius=3)
///Returns all atoms present in a circle around the center
/proc/circle_range(center = usr,radius = 3)
var/turf/centerturf = get_turf(center)
var/list/turfs = new/list()
var/rsq = radius * (radius+0.5)
for(var/atom/T in range(radius, centerturf))
var/dx = T.x - centerturf.x
var/dy = T.y - centerturf.y
if(dx*dx + dy*dy <= rsq)
turfs += T
//turfs += centerturf
return turfs
/proc/circleview(center=usr,radius=3)
var/turf/centerturf = get_turf(center)
var/turf/center_turf = get_turf(center)
var/list/atoms = new/list()
var/rsq = radius * (radius+0.5)
var/rsq = radius * (radius + 0.5)
for(var/atom/A in view(radius, centerturf))
var/dx = A.x - centerturf.x
var/dy = A.y - centerturf.y
if(dx*dx + dy*dy <= rsq)
atoms += A
for(var/atom/checked_atom as anything in range(radius, center_turf))
var/dx = checked_atom.x - center_turf.x
var/dy = checked_atom.y - center_turf.y
if(dx * dx + dy * dy <= rsq)
atoms += checked_atom
//turfs += centerturf
return atoms
/proc/get_dist_euclidian(atom/Loc1 as turf|mob|obj,atom/Loc2 as turf|mob|obj)
var/dx = Loc1.x - Loc2.x
var/dy = Loc1.y - Loc2.y
///Returns all atoms present in a circle around the center but uses view() instead of range() (Currently not used)
/proc/circle_view(center=usr,radius=3)
var/dist = sqrt(dx**2 + dy**2)
var/turf/center_turf = get_turf(center)
var/list/atoms = new/list()
var/rsq = radius * (radius + 0.5)
for(var/atom/checked_atom as anything in view(radius, center_turf))
var/dx = checked_atom.x - center_turf.x
var/dy = checked_atom.y - center_turf.y
if(dx * dx + dy * dy <= rsq)
atoms += checked_atom
return atoms
///Returns the distance between two atoms
/proc/get_dist_euclidian(atom/first_location as turf|mob|obj, atom/second_location as turf|mob|obj)
var/dx = first_location.x - second_location.x
var/dy = first_location.y - second_location.y
var/dist = sqrt(dx ** 2 + dy ** 2)
return dist
/proc/circlerangeturfs(center=usr,radius=3)
///Returns a list of turfs around a center based on RANGE_TURFS()
/proc/circle_range_turfs(center = usr, radius = 3)
var/turf/centerturf = get_turf(center)
var/turf/center_turf = get_turf(center)
var/list/turfs = new/list()
var/rsq = radius * (radius+0.5)
var/rsq = radius * (radius + 0.5)
for(var/turf/T as anything in RANGE_TURFS(radius, centerturf))
var/dx = T.x - centerturf.x
var/dy = T.y - centerturf.y
if(dx*dx + dy*dy <= rsq)
turfs += T
for(var/turf/checked_turf as anything in RANGE_TURFS(radius, center_turf))
var/dx = checked_turf.x - center_turf.x
var/dy = checked_turf.y - center_turf.y
if(dx * dx + dy * dy <= rsq)
turfs += checked_turf
return turfs
/proc/circleviewturfs(center=usr,radius=3) //Is there even a diffrence between this proc and circlerangeturfs()?
///Returns a list of turfs around a center based on view()
/proc/circle_view_turfs(center=usr,radius=3) //Is there even a diffrence between this proc and circle_range_turfs()?
var/turf/centerturf = get_turf(center)
var/turf/center_turf = get_turf(center)
var/list/turfs = new/list()
var/rsq = radius * (radius+0.5)
var/rsq = radius * (radius + 0.5)
for(var/turf/T in view(radius, centerturf))
var/dx = T.x - centerturf.x
var/dy = T.y - centerturf.y
if(dx*dx + dy*dy <= rsq)
turfs += T
for(var/turf/checked_turf in view(radius, center_turf))
var/dx = checked_turf.x - center_turf.x
var/dy = checked_turf.y - center_turf.y
if(dx * dx + dy * dy <= rsq)
turfs += checked_turf
return turfs
/** recursive_organ_check
* inputs: O (object to start with)
* inputs: first_object (object to start with)
* outputs:
* description: A pseudo-recursive loop based off of the recursive mob check, this check looks for any organs held
* within 'O', toggling their frozen flag. This check excludes items held within other safe organ
* within 'first_object', toggling their frozen flag. This check excludes items held within other safe organ
* storage units, so that only the lowest level of container dictates whether we do or don't decompose
*/
/proc/recursive_organ_check(atom/O)
/proc/recursive_organ_check(atom/first_object)
var/list/processing_list = list(O)
var/list/processing_list = list(first_object)
var/list/processed_list = list()
var/index = 1
var/obj/item/organ/found_organ
while(index <= length(processing_list))
var/atom/A = processing_list[index]
var/atom/object_to_check = processing_list[index]
if(istype(A, /obj/item/organ))
found_organ = A
if(istype(object_to_check, /obj/item/organ))
found_organ = object_to_check
found_organ.organ_flags ^= ORGAN_FROZEN
else if(istype(A, /mob/living/carbon))
var/mob/living/carbon/Q = A
for(var/organ in Q.internal_organs)
else if(istype(object_to_check, /mob/living/carbon))
var/mob/living/carbon/mob_to_check = object_to_check
for(var/organ in mob_to_check.internal_organs)
found_organ = organ
found_organ.organ_flags ^= ORGAN_FROZEN
for(var/atom/B in A) //objects held within other objects are added to the processing list, unless that object is something that can hold organs safely
if(!processed_list[B] && !istype(B, /obj/structure/closet/crate/freezer) && !istype(B, /obj/structure/closet/secure_closet/freezer))
processing_list+= B
for(var/atom/contained_to_check in object_to_check) //objects held within other objects are added to the processing list, unless that object is something that can hold organs safely
if(!processed_list[contained_to_check] && !istype(contained_to_check, /obj/structure/closet/crate/freezer) && !istype(contained_to_check, /obj/structure/closet/secure_closet/freezer))
processing_list+= contained_to_check
index++
processed_list[A] = A
processed_list[object_to_check] = object_to_check
return
@@ -217,19 +238,18 @@
SEND_SIGNAL(movable, COMSIG_ATOM_HEARER_IN_VIEW, .)
center_turf.luminosity = lum
/// Returns a list of mobs who can hear any of the radios given in @radios
/proc/get_mobs_in_radio_ranges(list/obj/item/radio/radios)
. = list()
// Returns a list of mobs who can hear any of the radios given in @radios
for(var/obj/item/radio/R in radios)
. |= get_hearers_in_view(R.canhear_range, R)
#define SIGNV(X) ((X<0)?-1:1)
for(var/obj/item/radio/this_radio in radios)
. |= get_hearers_in_view(this_radio.canhear_range, this_radio)
///Calculate if two atoms are in sight, returns TRUE or FALSE
/proc/inLineOfSight(X1,Y1,X2,Y2,Z=1,PX1=16.5,PY1=16.5,PX2=16.5,PY2=16.5)
var/turf/T
if(X1==X2)
if(Y1==Y2)
return 1 //Light cannot be blocked on same tile
return TRUE //Light cannot be blocked on same tile
else
var/s = SIGN(Y2-Y1)
Y1+=s
@@ -254,45 +274,47 @@
if(IS_OPAQUE_TURF(T))
return FALSE
return TRUE
#undef SIGNV
/proc/isInSight(atom/A, atom/B)
var/turf/Aturf = get_turf(A)
var/turf/Bturf = get_turf(B)
/proc/is_in_sight(atom/first_atom, atom/second_atom)
var/turf/first_turf = get_turf(first_atom)
var/turf/second_turf = get_turf(second_atom)
if(!Aturf || !Bturf)
if(!first_turf || !second_turf)
return FALSE
return inLineOfSight(Aturf.x,Aturf.y, Bturf.x,Bturf.y,Aturf.z)
return inLineOfSight(first_turf.x, first_turf.y, second_turf.x, second_turf.y, first_turf.z)
/proc/try_move_adjacent(atom/movable/AM, trydir)
var/turf/T = get_turf(AM)
///Tries to move an atom to an adjacent turf, return TRUE if successful
/proc/try_move_adjacent(atom/movable/atom_to_move, trydir)
var/turf/atom_turf = get_turf(atom_to_move)
if(trydir)
if(AM.Move(get_step(T, trydir)))
if(atom_to_move.Move(get_step(atom_turf, trydir)))
return TRUE
for(var/direction in (GLOB.cardinals-trydir))
if(AM.Move(get_step(T, direction)))
if(atom_to_move.Move(get_step(atom_turf, direction)))
return TRUE
return FALSE
///Return the mob type that is being controlled by a ckey
/proc/get_mob_by_key(key)
var/ckey = ckey(key)
for(var/i in GLOB.player_list)
var/mob/M = i
if(M.ckey == ckey)
return M
for(var/player in GLOB.player_list)
var/mob/player_mob = player
if(player_mob.ckey == ckey)
return player_mob
return null
/proc/considered_alive(datum/mind/M, enforce_human = TRUE)
if(M?.current)
///Returns true if the mob that a player is controlling is alive
/proc/considered_alive(datum/mind/player_mind, enforce_human = TRUE)
if(player_mind?.current)
if(enforce_human)
var/mob/living/carbon/human/H
if(ishuman(M.current))
H = M.current
return M.current.stat != DEAD && !issilicon(M.current) && !isbrain(M.current) && (!H || H.dna.species.id != SPECIES_ZOMBIE)
else if(isliving(M.current))
return M.current.stat != DEAD
var/mob/living/carbon/human/player_mob
if(ishuman(player_mind.current))
player_mob = player_mind.current
return player_mind.current.stat != DEAD && !issilicon(player_mind.current) && !isbrain(player_mind.current) && (!player_mob || player_mob.dna.species.id != SPECIES_ZOMBIE)
else if(isliving(player_mind.current))
return player_mind.current.stat != DEAD
return FALSE
/**
@@ -301,133 +323,141 @@
* Checks if the current body of the mind has an exile implant and is currently in
* an away mission. Returns FALSE if any of those conditions aren't met.
*/
/proc/considered_exiled(datum/mind/M)
if(!ishuman(M?.current))
/proc/considered_exiled(datum/mind/player_mind)
if(!ishuman(player_mind?.current))
return FALSE
for(var/obj/item/implant/I in M.current.implants)
if(istype(I, /obj/item/implant/exile && M.current.onAwayMission()))
for(var/obj/item/implant/implant_check in player_mind.current.implants)
if(istype(implant_check, /obj/item/implant/exile && player_mind.current.onAwayMission()))
return TRUE
/proc/considered_afk(datum/mind/M)
return !M || !M.current || !M.current.client || M.current.client.is_afk()
///Checks if a player is considered AFK
/proc/considered_afk(datum/mind/player_mind)
return !player_mind || !player_mind.current || !player_mind.current.client || player_mind.current.client.is_afk()
/proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480)
if(!isobj(O))
O = new /atom/movable/screen/text()
O.maptext = MAPTEXT(maptext)
O.maptext_height = maptext_height
O.maptext_width = maptext_width
O.screen_loc = screen_loc
return O
///Return an object with a new maptext (not currently in use)
/proc/screen_text(obj/object_to_change, maptext = "", screen_loc = "CENTER-7,CENTER-7", maptext_height = 480, maptext_width = 480)
if(!isobj(object_to_change))
object_to_change = new /atom/movable/screen/text()
object_to_change.maptext = MAPTEXT(maptext)
object_to_change.maptext_height = maptext_height
object_to_change.maptext_width = maptext_width
object_to_change.screen_loc = screen_loc
return object_to_change
/// Removes an image from a client's `.images`. Useful as a callback.
/proc/remove_image_from_client(image/image, client/remove_from)
remove_from?.images -= image
/proc/remove_image_from_client(image/image_to_remove, client/remove_from)
remove_from?.images -= image_to_remove
/proc/remove_images_from_clients(image/I, list/show_to)
for(var/client/C in show_to)
C.images -= I
///Like remove_image_from_client, but will remove the image from a list of clients
/proc/remove_images_from_clients(image/image_to_remove, list/show_to)
for(var/client/remove_from in show_to)
remove_from.images -= image_to_remove
/proc/flick_overlay(image/I, list/show_to, duration)
for(var/client/C in show_to)
C.images += I
addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, I, show_to), duration, TIMER_CLIENT_TIME)
///Add an image to a list of clients and calls a proc to remove it after a duration
/proc/flick_overlay(image/image_to_show, list/show_to, duration)
for(var/client/add_to in show_to)
add_to.images += image_to_show
addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, image_to_show, show_to), duration, TIMER_CLIENT_TIME)
/proc/flick_overlay_view(image/I, atom/target, duration) //wrapper for the above, flicks to everyone who can see the target atom
///wrapper for flick_overlay(), flicks to everyone who can see the target atom
/proc/flick_overlay_view(image/image_to_show, atom/target, duration)
var/list/viewing = list()
for(var/m in viewers(target))
var/mob/M = m
if(M.client)
viewing += M.client
flick_overlay(I, viewing, duration)
for(var/viewer in viewers(target))
var/mob/viewer_mob = viewer
if(viewer_mob.client)
viewing += viewer_mob.client
flick_overlay(image_to_show, viewing, duration)
///Get active players who are playing in the round
/proc/get_active_player_count(alive_check = 0, afk_check = 0, human_check = 0)
// Get active players who are playing in the round
var/active_players = 0
for(var/i = 1; i <= GLOB.player_list.len; i++)
var/mob/M = GLOB.player_list[i]
if(M?.client)
if(alive_check && M.stat)
var/mob/player_mob = GLOB.player_list[i]
if(!player_mob?.client)
if(alive_check && player_mob.stat)
continue
else if(afk_check && M.client.is_afk())
else if(afk_check && player_mob.client.is_afk())
continue
else if(human_check && !ishuman(M))
else if(human_check && !ishuman(player_mob))
continue
else if(isnewplayer(M)) // exclude people in the lobby
else if(isnewplayer(player_mob)) // exclude people in the lobby
continue
else if(isobserver(M)) // Ghosts are fine if they were playing once (didn't start as observers)
var/mob/dead/observer/O = M
if(O.started_as_observer) // Exclude people who started as observers
else if(isobserver(player_mob)) // Ghosts are fine if they were playing once (didn't start as observers)
var/mob/dead/observer/ghost_player = player_mob
if(ghost_player.started_as_observer) // Exclude people who started as observers
continue
active_players++
return active_players
/proc/showCandidatePollWindow(mob/M, poll_time, Question, list/candidates, ignore_category, time_passed, flashwindow = TRUE)
///Show the poll window to the candidate mobs
/proc/show_candidate_poll_window(mob/candidate_mob, poll_time, question, list/candidates, ignore_category, time_passed, flashwindow = TRUE)
set waitfor = 0
SEND_SOUND(M, 'sound/misc/notice2.ogg') //Alerting them to their consideration
SEND_SOUND(candidate_mob, 'sound/misc/notice2.ogg') //Alerting them to their consideration
if(flashwindow)
window_flash(M.client)
window_flash(candidate_mob.client)
var/list/answers = ignore_category ? list("Yes", "No", "Never for this round") : list("Yes", "No")
switch(tgui_alert(M, Question, "A limited-time offer!", answers, poll_time, autofocus = FALSE))
switch(tgui_alert(candidate_mob, question, "A limited-time offer!", answers, poll_time, autofocus = FALSE))
if("Yes")
to_chat(M, span_notice("Choice registered: Yes."))
to_chat(candidate_mob, span_notice("Choice registered: Yes."))
if(time_passed + poll_time <= world.time)
to_chat(M, span_danger("Sorry, you answered too late to be considered!"))
SEND_SOUND(M, 'sound/machines/buzz-sigh.ogg')
candidates -= M
to_chat(candidate_mob, span_danger("Sorry, you answered too late to be considered!"))
SEND_SOUND(candidate_mob, 'sound/machines/buzz-sigh.ogg')
candidates -= candidate_mob
else
candidates += M
candidates += candidate_mob
if("No")
to_chat(M, span_danger("Choice registered: No."))
candidates -= M
to_chat(candidate_mob, span_danger("Choice registered: No."))
candidates -= candidate_mob
if("Never for this round")
var/list/L = GLOB.poll_ignore[ignore_category]
if(!L)
var/list/ignore_list = GLOB.poll_ignore[ignore_category]
if(!ignore_list)
GLOB.poll_ignore[ignore_category] = list()
GLOB.poll_ignore[ignore_category] += M.ckey
to_chat(M, span_danger("Choice registered: Never for this round."))
candidates -= M
GLOB.poll_ignore[ignore_category] += candidate_mob.ckey
to_chat(candidate_mob, span_danger("Choice registered: Never for this round."))
candidates -= candidate_mob
else
candidates -= M
candidates -= candidate_mob
/proc/pollGhostCandidates(Question, jobbanType, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE)
///Wrapper to send all ghosts the poll to ask them if they want to be considered for a mob.
/proc/poll_ghost_candidates(question, jobban_type, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE)
var/list/candidates = list()
if(!(GLOB.ghost_role_flags & GHOSTROLE_STATION_SENTIENCE))
return candidates
for(var/mob/dead/observer/G in GLOB.player_list)
candidates += G
for(var/mob/dead/observer/ghost_player in GLOB.player_list)
candidates += ghost_player
return pollCandidates(Question, jobbanType, be_special_flag, poll_time, ignore_category, flashwindow, candidates)
return poll_candidates(question, jobban_type, be_special_flag, poll_time, ignore_category, flashwindow, candidates)
/proc/pollCandidates(Question, jobbanType, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE, list/group = null)
///Calls the show_candidate_poll_window() to all eligible ghosts
/proc/poll_candidates(question, jobban_type, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE, list/group = null)
var/time_passed = world.time
if (!Question)
Question = "Would you like to be a special role?"
if (!question)
question = "Would you like to be a special role?"
var/list/result = list()
for(var/m in group)
var/mob/M = m
if(!M.key || !M.client || (ignore_category && GLOB.poll_ignore[ignore_category] && (M.ckey in GLOB.poll_ignore[ignore_category])))
for(var/candidate in group)
var/mob/candidate_mob = candidate
if(!candidate_mob.key || !candidate_mob.client || (ignore_category && GLOB.poll_ignore[ignore_category] && (candidate_mob.ckey in GLOB.poll_ignore[ignore_category])))
continue
if(be_special_flag)
if(!(M.client.prefs) || !(be_special_flag in M.client.prefs.be_special))
if(!(candidate_mob.client.prefs) || !(be_special_flag in candidate_mob.client.prefs.be_special))
continue
var/required_time = GLOB.special_roles[be_special_flag] || 0
if (M.client && M.client.get_remaining_days(required_time) > 0)
if (candidate_mob.client && candidate_mob.client.get_remaining_days(required_time) > 0)
continue
if(jobbanType)
if(is_banned_from(M.ckey, list(jobbanType, ROLE_SYNDICATE)) || QDELETED(M))
if(jobban_type)
if(is_banned_from(candidate_mob.ckey, list(jobban_type, ROLE_SYNDICATE)) || QDELETED(candidate_mob))
continue
showCandidatePollWindow(M, poll_time, Question, result, ignore_category, time_passed, flashwindow)
show_candidate_poll_window(candidate_mob, poll_time, question, result, ignore_category, time_passed, flashwindow)
sleep(poll_time)
//Check all our candidates, to make sure they didn't log off or get deleted during the wait period.
for(var/mob/M in result)
if(!M.key || !M.client)
result -= M
for(var/mob/asking_mob in result)
if(!asking_mob.key || !asking_mob.client)
result -= asking_mob
listclearnulls(result)
@@ -437,7 +467,7 @@
* Returns a list of ghosts that are eligible to take over and wish to be considered for a mob.
*
* Arguments:
* * question - Question to show players as part of poll
* * question - question to show players as part of poll
* * jobban_type - Type of jobban to use to filter out potential candidates.
* * be_special_flag - Unknown/needs further documentation.
* * poll_time - Length of time in deciseconds that the poll input box exists before closing.
@@ -452,7 +482,7 @@
currently_polling_mobs += target_mob
var/list/possible_candidates = pollGhostCandidates(question, jobban_type, be_special_flag, poll_time, ignore_category)
var/list/possible_candidates = poll_ghost_candidates(question, jobban_type, be_special_flag, poll_time, ignore_category)
currently_polling_mobs -= target_mob
if(!target_mob || QDELETED(target_mob) || !target_mob.loc)
@@ -464,7 +494,7 @@
* Returns a list of ghosts that are eligible to take over and wish to be considered for a mob.
*
* Arguments:
* * question - Question to show players as part of poll
* * question - question to show players as part of poll
* * jobban_type - Type of jobban to use to filter out potential candidates.
* * be_special_flag - Unknown/needs further documentation.
* * poll_time - Length of time in deciseconds that the poll input box exists before closing.
@@ -472,7 +502,7 @@
* * ignore_category - Unknown/needs further documentation.
*/
/proc/poll_candidates_for_mobs(question, jobban_type, be_special_flag = 0, poll_time = 30 SECONDS, list/mobs, ignore_category = null)
var/list/candidate_list = pollGhostCandidates(question, jobban_type, be_special_flag, poll_time, ignore_category)
var/list/candidate_list = poll_ghost_candidates(question, jobban_type, be_special_flag, poll_time, ignore_category)
for(var/mob/potential_mob as anything in mobs)
if(QDELETED(potential_mob) || !potential_mob.loc)
@@ -483,52 +513,56 @@
return candidate_list
/proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
if(!G_found || !G_found.key)
///Uses stripped down and bastardized code from respawn character
/proc/make_body(mob/dead/observer/ghost_player)
if(!ghost_player || !ghost_player.key)
return
//First we spawn a dude.
var/mob/living/carbon/human/new_character = new//The mob being spawned.
SSjob.SendToLateJoin(new_character)
G_found.client.prefs.safe_transfer_prefs_to(new_character)
ghost_player.client.prefs.safe_transfer_prefs_to(new_character)
new_character.dna.update_dna_identity()
new_character.key = G_found.key
new_character.key = ghost_player.key
return new_character
/proc/send_to_playing_players(thing) //sends a whatever to all playing players; use instead of to_chat(world, where needed)
for(var/M in GLOB.player_list)
if(M && !isnewplayer(M))
to_chat(M, thing)
///sends a whatever to all playing players; use instead of to_chat(world, where needed)
/proc/send_to_playing_players(thing)
for(var/player_mob in GLOB.player_list)
if(player_mob && !isnewplayer(player_mob))
to_chat(player_mob, thing)
/proc/window_flash(client/C, ignorepref = FALSE)
if(ismob(C))
var/mob/M = C
if(M.client)
C = M.client
if(!C || (!C.prefs.read_preference(/datum/preference/toggle/window_flashing) && !ignorepref))
///Flash the window of a player
/proc/window_flash(client/flashed_client, ignorepref = FALSE)
if(ismob(flashed_client))
var/mob/player_mob = flashed_client
if(player_mob.client)
flashed_client = player_mob.client
if(!flashed_client || (!flashed_client.prefs.read_preference(/datum/preference/toggle/window_flashing) && !ignorepref))
return
winset(C, "mainwindow", "flash=5")
winset(flashed_client, "mainwindow", "flash=5")
//Recursively checks if an item is inside a given type, even through layers of storage. Returns the atom if it finds it.
///Recursively checks if an item is inside a given type, even through layers of storage. Returns the atom if it finds it.
/proc/recursive_loc_check(atom/movable/target, type)
var/atom/A = target
if(istype(A, type))
return A
var/atom/atom_to_find = target
if(istype(atom_to_find, type))
return atom_to_find
while(!istype(A.loc, type))
if(!A.loc)
while(!istype(atom_to_find.loc, type))
if(!atom_to_find.loc)
return
A = A.loc
atom_to_find = atom_to_find.loc
return A.loc
return atom_to_find.loc
/proc/AnnounceArrival(mob/living/carbon/human/character, rank)
///Send a message in common radio when a player arrives
/proc/announce_arrival(mob/living/carbon/human/character, rank)
if(!SSticker.IsRoundInProgress() || QDELETED(character))
return
var/area/A = get_area(character)
deadchat_broadcast("<span class='game'> has arrived at the station at <span class='name'>[A.name]</span>.</span>", "<span class='game'><span class='name'>[character.real_name]</span> ([rank])</span>", follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE)
var/area/player_area = get_area(character)
deadchat_broadcast("<span class='game'> has arrived at the station at <span class='name'>[player_area.name]</span>.</span>", "<span class='game'><span class='name'>[character.real_name]</span> ([rank])</span>", follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE)
if(!character.mind)
return
if(!GLOB.announcement_systems.len)
@@ -539,26 +573,19 @@
var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
announcer.announce("ARRIVAL", character.real_name, rank, list()) //make the list empty to make it announce it in common
/proc/lavaland_equipment_pressure_check(turf/T)
///Check if the turf pressure allows specialized equipment to work
/proc/lavaland_equipment_pressure_check(turf/turf_to_check)
. = FALSE
if(!istype(T))
if(!istype(turf_to_check))
return
var/datum/gas_mixture/environment = T.return_air()
var/datum/gas_mixture/environment = turf_to_check.return_air()
if(!istype(environment))
return
var/pressure = environment.return_pressure()
if(pressure <= LAVALAND_EQUIPMENT_EFFECT_PRESSURE)
. = TRUE
/proc/ispipewire(item)
var/static/list/pire_wire = list(
/obj/machinery/atmospherics,
/obj/structure/disposalpipe,
/obj/structure/cable
)
return (is_type_in_list(item, pire_wire))
// Find an obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type.
///Find an obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type.
/proc/find_obstruction_free_location(range, atom/center, area/specific_area)
var/list/possible_loc = list()
@@ -577,15 +604,16 @@
return pick(possible_loc)
///Disable power in the station APCs
/proc/power_fail(duration_min, duration_max)
for(var/P in GLOB.apcs_list)
var/obj/machinery/power/apc/C = P
if(C.cell && SSmapping.level_trait(C.z, ZTRAIT_STATION))
var/area/A = C.area
if(GLOB.typecache_powerfailure_safe_areas[A.type])
continue
for(var/obj/machinery/power/apc/current_apc as anything in GLOB.apcs_list)
if(!current_apc.cell || !SSmapping.level_trait(current_apc.z, ZTRAIT_STATION))
continue
var/area/apc_area = current_apc.area
if(GLOB.typecache_powerfailure_safe_areas[apc_area.type])
continue
C.energy_fail(rand(duration_min,duration_max))
current_apc.energy_fail(rand(duration_min,duration_max))
/**
* Sends a round tip to a target. If selected_tip is null, a random tip will be sent instead (5% chance of it being silly).
code/datums/components/spirit_holding.dm
+1 -1
View File
@@ -57,7 +57,7 @@
attempting_awakening = TRUE
to_chat(awakener, span_notice("You attempt to wake the spirit of [parent]..."))
var/list/candidates = pollGhostCandidates("Do you want to play as the spirit of [awakener.real_name]'s blade?", ROLE_PAI, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
var/list/candidates = poll_ghost_candidates("Do you want to play as the spirit of [awakener.real_name]'s blade?", ROLE_PAI, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
if(!LAZYLEN(candidates))
to_chat(awakener, span_warning("[parent] is dormant. Maybe you can try again later."))
attempting_awakening = FALSE
code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+2 -2
View File
@@ -102,7 +102,7 @@
message_admins("Polling [possible_volunteers.len] players to apply for the [name] ruleset.")
log_game("DYNAMIC: Polling [possible_volunteers.len] players to apply for the [name] ruleset.")
candidates = pollGhostCandidates("The mode is looking for volunteers to become [antag_flag] for [name]", antag_flag_override, antag_flag || antag_flag_override, poll_time = 300)
candidates = poll_ghost_candidates("The mode is looking for volunteers to become [antag_flag] for [name]", antag_flag_override, antag_flag || antag_flag_override, poll_time = 300)
if(!candidates || candidates.len <= 0)
mode.dynamic_log("The ruleset [name] received no applications.")
@@ -146,7 +146,7 @@
notify_ghosts("[new_character] has been picked for the ruleset [name]!", source = new_character, action = NOTIFY_ORBIT, header="Something Interesting!")
/datum/dynamic_ruleset/midround/from_ghosts/proc/generate_ruleset_body(mob/applicant)
var/mob/living/carbon/human/new_character = makeBody(applicant)
var/mob/living/carbon/human/new_character = make_body(applicant)
new_character.dna.remove_all_mutations()
return new_character
code/modules/admin/verbs/admingame.dm
+1 -1
View File
@@ -318,7 +318,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
GLOB.data_core.manifest_inject(new_character)
if(tgui_alert(new_character,"Would you like an active AI to announce this character?",,list("No","Yes"))=="Yes")
AnnounceArrival(new_character, new_character.mind.assigned_role.title)
announce_arrival(new_character, new_character.mind.assigned_role.title)
var/msg = span_adminnotice("[admin] has respawned [player_key] as [new_character.real_name].")
message_admins(msg)
code/modules/admin/verbs/ert.dm
+1 -1
View File
@@ -126,7 +126,7 @@
else
to_chat(usr, "<span class='warning'>Could not spawn you in as briefing officer as you are not a ghost!</spawn>")
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for [ertemplate.polldesc]?", "deathsquad")
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you wish to be considered for [ertemplate.polldesc]?", "deathsquad")
var/teamSpawned = FALSE
if(candidates.len == 0)
code/modules/admin/verbs/secrets.dm
+2 -2
View File
@@ -396,7 +396,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller)
var/list/candidates = list()
if (prefs["offerghosts"]["value"] == "Yes")
candidates = pollGhostCandidates(replacetext(prefs["ghostpoll"]["value"], "%TYPE%", initial(pathToSpawn.name)), ROLE_TRAITOR)
candidates = poll_ghost_candidates(replacetext(prefs["ghostpoll"]["value"], "%TYPE%", initial(pathToSpawn.name)), ROLE_TRAITOR)
if (prefs["playersonly"]["value"] == "Yes" && length(candidates) < prefs["minplayers"]["value"])
message_admins("Not enough players signed up to create a portal storm, the minimum was [prefs["minplayers"]["value"]] and the number of signups [length(candidates)]")
@@ -552,7 +552,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller)
if(teamsize <= 0)
return FALSE
candidates = pollGhostCandidates("Do you wish to be considered for a Nanotrasen emergency response drone?", "Drone")
candidates = poll_ghost_candidates("Do you wish to be considered for a Nanotrasen emergency response drone?", "Drone")
if(length(candidates) == 0)
return FALSE
code/modules/antagonists/_common/antag_spawner.dm
+1 -1
View File
@@ -127,7 +127,7 @@
return
to_chat(user, span_notice("You activate [src] and wait for confirmation."))
var/list/nuke_candidates = pollGhostCandidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE)
var/list/nuke_candidates = poll_ghost_candidates("Do you want to play as a syndicate [borg_to_spawn ? "[lowertext(borg_to_spawn)] cyborg":"operative"]?", ROLE_OPERATIVE, ROLE_OPERATIVE, 150, POLL_IGNORE_SYNDICATE)
if(LAZYLEN(nuke_candidates))
if(QDELETED(src) || !check_usability(user))
return
code/modules/antagonists/blob/powers.dm
+1 -1
View File
@@ -142,7 +142,7 @@
B.naut = TRUE //temporary placeholder to prevent creation of more than one per factory.
to_chat(src, span_notice("You attempt to produce a blobbernaut."))
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, ROLE_BLOB, 50) //players must answer rapidly
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, ROLE_BLOB, 50) //players must answer rapidly
if(LAZYLEN(candidates)) //if we got at least one candidate, they're a blobbernaut now.
B.modify_max_integrity(initial(B.max_integrity) * 0.25) //factories that produced a blobbernaut have much lower health
B.update_appearance()
code/modules/antagonists/cult/cult_comms.dm
+1 -1
View File
@@ -105,7 +105,7 @@
if(B.current && B.current != Nominee && !B.current.incapacitated())
SEND_SOUND(B.current, 'sound/magic/exit_blood.ogg')
asked_cultists += B.current
var/list/yes_voters = pollCandidates("[Nominee] seeks to lead your cult, do you support [Nominee.p_them()]?", poll_time = 300, group = asked_cultists)
var/list/yes_voters = poll_candidates("[Nominee] seeks to lead your cult, do you support [Nominee.p_them()]?", poll_time = 300, group = asked_cultists)
if(QDELETED(Nominee) || Nominee.incapacitated())
team.cult_vote_called = FALSE
for(var/datum/mind/B in team.members)
code/modules/antagonists/cult/cult_structures.dm
+1 -1
View File
@@ -215,7 +215,7 @@
if(last_corrupt <= world.time)
var/list/validturfs = list()
var/list/cultturfs = list()
for(var/T in circleviewturfs(src, 5))
for(var/T in circle_view_turfs(src, 5))
if(istype(T, /turf/open/floor/engine/cult))
cultturfs |= T
continue
code/modules/antagonists/gang/handler.dm
+1 -1
View File
@@ -391,7 +391,7 @@ GLOBAL_VAR(families_override_theme)
announcer = "Spinward Stellar Coalition National Guard"
priority_announce(announcement_message, announcer, 'sound/effects/families_police.ogg')
var/list/candidates = pollGhostCandidates("Do you want to help clean up crime on this station?", "deathsquad")
var/list/candidates = poll_ghost_candidates("Do you want to help clean up crime on this station?", "deathsquad")
if(candidates.len)
code/modules/antagonists/traitor/equipment/contractor.dm
+1 -1
View File
@@ -165,7 +165,7 @@
if (.)
to_chat(user, span_notice("The uplink vibrates quietly, connecting to nearby agents..."))
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the Contractor Support Unit for [user.real_name]?", ROLE_PAI, FALSE, 100, POLL_IGNORE_CONTRACTOR_SUPPORT)
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as the Contractor Support Unit for [user.real_name]?", ROLE_PAI, FALSE, 100, POLL_IGNORE_CONTRACTOR_SUPPORT)
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
code/modules/antagonists/wizard/equipment/soulstone.dm
+1 -1
View File
@@ -422,7 +422,7 @@
chosen_ghost = victim.get_ghost(TRUE,TRUE) //Try to grab original owner's ghost first
if(!chosen_ghost || !chosen_ghost.client) //Failing that, we grab a ghosts
var/list/consenting_candidates = pollGhostCandidates("Would you like to play as a Shade?", "Cultist", ROLE_CULTIST, 50, POLL_IGNORE_SHADE)
var/list/consenting_candidates = poll_ghost_candidates("Would you like to play as a Shade?", "Cultist", ROLE_CULTIST, 50, POLL_IGNORE_SHADE)
if(consenting_candidates.len)
chosen_ghost = pick(consenting_candidates)
if(!victim || user.incapacitated() || !user.is_holding(src) || !user.CanReach(victim, src))
code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm
+1 -1
View File
@@ -450,7 +450,7 @@
gas_pockets = 15
gas_spread = power_level * 8
var/list/around_turfs = circlerangeturfs(src, gas_spread)
var/list/around_turfs = circle_range_turfs(src, gas_spread)
for(var/turf/turf as anything in around_turfs)
if(isclosedturf(turf) || isspaceturf(turf))
around_turfs -= turf
code/modules/events/abductor.dm
+2 -2
View File
@@ -17,8 +17,8 @@
if(candidates.len < 2)
return NOT_ENOUGH_PLAYERS
var/mob/living/carbon/human/agent = makeBody(pick_n_take(candidates))
var/mob/living/carbon/human/scientist = makeBody(pick_n_take(candidates))
var/mob/living/carbon/human/agent = make_body(pick_n_take(candidates))
var/mob/living/carbon/human/scientist = make_body(pick_n_take(candidates))
var/datum/team/abductor_team/T = new
if(T.team_number > ABDUCTOR_MAX_TEAMS)
code/modules/events/ghost_role.dm
+1 -1
View File
@@ -63,7 +63,7 @@
var/list/mob/dead/observer/regular_candidates
// don't get their hopes up
if(priority_candidates.len < minimum_required)
regular_candidates = pollGhostCandidates("Do you wish to be considered for the special role of '[role_name]'?", jobban, be_special)
regular_candidates = poll_ghost_candidates("Do you wish to be considered for the special role of '[role_name]'?", jobban, be_special)
else
regular_candidates = list()
code/modules/events/holiday/xmas.dm
+1 -1
View File
@@ -78,7 +78,7 @@
priority_announce("Santa is coming to town!", "Unknown Transmission")
/datum/round_event/santa/start()
var/list/candidates = pollGhostCandidates("Santa is coming to town! Do you want to be Santa?", poll_time=150)
var/list/candidates = poll_ghost_candidates("Santa is coming to town! Do you want to be Santa?", poll_time=150)
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
santa = new /mob/living/carbon/human(pick(GLOB.blobstart))
code/modules/events/pirates.dm
+1 -1
View File
@@ -72,7 +72,7 @@
if(!skip_answer_check && threat?.answered == 1)
return
var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
var/list/candidates = poll_ghost_candidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
shuffle_inplace(candidates)
var/datum/map_template/shuttle/pirate/ship = new ship_template
code/modules/events/wizard/imposter.dm
+1 -1
View File
@@ -10,7 +10,7 @@
if(!ishuman(M.current))
continue
var/mob/living/carbon/human/W = M.current
var/list/candidates = pollGhostCandidates("Would you like to be an imposter wizard?", ROLE_WIZARD)
var/list/candidates = poll_ghost_candidates("Would you like to be an imposter wizard?", ROLE_WIZARD)
if(!candidates)
return //Sad Trombone
var/mob/dead/observer/C = pick(candidates)
code/modules/mining/lavaland/megafauna_loot.dm
+1 -1
View File
@@ -415,7 +415,7 @@
using = TRUE
balloon_alert(user, "you hold the scythe up...")
ADD_TRAIT(src, TRAIT_NODROP, type)
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [user.real_name]'s soulscythe?", ROLE_PAI, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as [user.real_name]'s soulscythe?", ROLE_PAI, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
if(LAZYLEN(candidates))
var/mob/dead/observer/picked_ghost = pick(candidates)
soul.ckey = picked_ghost.ckey
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -239,7 +239,7 @@
if(SSshuttle.arrivals)
SSshuttle.arrivals.QueueAnnounce(humanc, rank)
else
AnnounceArrival(humanc, rank)
announce_arrival(humanc, rank)
AddEmploymentContract(humanc)
humanc.increment_scar_slot()
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+1 -1
View File
@@ -77,7 +77,7 @@
bursting = TRUE
var/list/candidates = pollGhostCandidates("Do you want to play as an alien larva that will burst out of [owner.real_name]?", ROLE_ALIEN, ROLE_ALIEN, 100, POLL_IGNORE_ALIEN_LARVA)
var/list/candidates = poll_ghost_candidates("Do you want to play as an alien larva that will burst out of [owner.real_name]?", ROLE_ALIEN, ROLE_ALIEN, 100, POLL_IGNORE_ALIEN_LARVA)
if(QDELETED(src) || QDELETED(owner))
return
code/modules/mob/living/simple_animal/guardian/guardian.dm
+2 -2
View File
@@ -457,7 +457,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
var/mob/living/simple_animal/hostile/guardian/G = input(src, "Pick the guardian you wish to reset", "Guardian Reset") as null|anything in sortNames(guardians)
if(G)
to_chat(src, span_holoparasite("You attempt to reset <font color=\"[G.guardiancolor]\"><b>[G.real_name]</b></font>'s personality..."))
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, FALSE, 100)
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as [src.real_name]'s [G.real_name]?", ROLE_PAI, FALSE, 100)
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
to_chat(G, span_holoparasite("Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance."))
@@ -536,7 +536,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
return
used = TRUE
to_chat(user, "[use_message]")
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_PAI, FALSE, 100, POLL_IGNORE_HOLOPARASITE)
if(LAZYLEN(candidates))
var/mob/dead/observer/candidate = pick(candidates)
code/modules/mob/living/simple_animal/guardian/types/lightning.dm
+1 -1
View File
@@ -94,7 +94,7 @@
var/turf/T = get_turf_pixel(chainpart)
turfs |= T
if(T != get_turf(B.origin) && T != get_turf(B.target))
for(var/turf/TU in circlerange(T, 1))
for(var/turf/TU in circle_range(T, 1))
turfs |= TU
for(var/turf in turfs)
var/turf/T = turf
code/modules/mob/living/simple_animal/hostile/regalrat.dm
+1 -1
View File
@@ -46,7 +46,7 @@
QDEL_NULL(riot)
/mob/living/simple_animal/hostile/regalrat/proc/get_player()
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the Royal Rat, cheesey be their crown?", ROLE_SENTIENCE, FALSE, 100, POLL_IGNORE_SENTIENCE_POTION)
var/list/mob/dead/observer/candidates = poll_ghost_candidates("Do you want to play as the Royal Rat, cheesey be their crown?", ROLE_SENTIENCE, FALSE, 100, POLL_IGNORE_SENTIENCE_POTION)
if(LAZYLEN(candidates) && !mind)
var/mob/dead/observer/C = pick(candidates)
key = C.key
code/modules/procedural_mapping/mapGenerator.dm
+1 -1
View File
@@ -75,7 +75,7 @@
theRadius = max(radius/max((2*abs(sphereMagic-i)),1),1)
map |= circlerange(locate(centerX,centerY,i),theRadius)
map |= circle_range(locate(centerX,centerY,i),theRadius)
return map
code/modules/projectiles/projectile.dm
+1 -1
View File
@@ -314,7 +314,7 @@
if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT))
best_angle += NICE_SHOT_RICOCHET_BONUS
for(var/mob/living/L in range(ricochet_auto_aim_range, src.loc))
if(L.stat == DEAD || !isInSight(src, L))
if(L.stat == DEAD || !is_in_sight(src, L))
continue
var/our_angle = abs(closer_angle_difference(Angle, Get_Angle(src.loc, L.loc)))
if(our_angle < best_angle)
code/modules/reagents/chemistry/recipes.dm
+1 -1
View File
@@ -503,7 +503,7 @@
* * snowball_chance - the chance to spawn a snowball on a turf
*/
/datum/chemical_reaction/proc/freeze_radius(datum/reagents/holder, datum/equilibrium/equilibrium, temp, radius = 2, freeze_duration = 50 SECONDS, snowball_chance = 0)
for(var/any_turf in circlerangeturfs(center = get_turf(holder.my_atom), radius = radius))
for(var/any_turf in circle_range_turfs(center = get_turf(holder.my_atom), radius = radius))
if(!istype(any_turf, /turf/open))
continue
var/turf/open/open_turf = any_turf
code/modules/shuttle/arrivals.dm
+2 -2
View File
@@ -203,9 +203,9 @@
*/
/obj/docking_port/mobile/arrivals/proc/QueueAnnounce(mob, rank)
if(mode != SHUTTLE_CALL)
AnnounceArrival(mob, rank)
announce_arrival(mob, rank)
else
LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, .proc/AnnounceArrival, mob, rank))
LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, .proc/announce_arrival, mob, rank))
/obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value)
switch(var_name)
code/modules/wiremod/components/atom/pinpointer.dm
+1 -1
View File
@@ -37,7 +37,7 @@
var/atom/target_entity = target.value
if(isInSight(target_entity, get_turf(src)) && IN_GIVEN_RANGE(get_turf(src), target_entity, max_range))
if(is_in_sight(target_entity, get_turf(src)) && IN_GIVEN_RANGE(get_turf(src), target_entity, max_range))
var/turf/location = get_turf(target_entity)
x_pos.set_output(location?.x)