[MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)

* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-10-06 22:07:01 +01:00
committed by GitHub
co-authored by Ghilker GoldenAlpharex
parent 5a3b5a4dff
commit cc93b11d23
142 changed files with 1717 additions and 1677 deletions
@@ -160,7 +160,7 @@
if(admin_revive)
var/obj/item/bodypart/head/H = loc
var/turf/T = get_turf(owner)
if(H && istype(H) && T && !(H in owner.GetAllContents()))
if(H && istype(H) && T && !(H in owner.get_all_contents()))
H.forceMove(T)
/obj/item/dullahan_relay/Destroy()
@@ -11,7 +11,7 @@
return "data/player_saves/[user.ckey[1]]/[user.ckey]/pai.sav"
/datum/pai_candidate/proc/savefile_save(mob/user)
if(IsGuestKey(user.key))
if(is_guest_key(user.key))
return FALSE
var/savefile/F = new /savefile(src.savefile_path(user))
@@ -32,7 +32,7 @@
// returns 0 if savefile did not exist
/datum/pai_candidate/proc/savefile_load(mob/user, silent = TRUE)
if (IsGuestKey(user.key))
if (is_guest_key(user.key))
return 0
var/path = savefile_path(user)
+4 -4
View File
@@ -210,7 +210,7 @@
for (var/index in 1 to length(lawcache_hacked))
var/law = lawcache_hacked[index]
var/num = ionnum()
var/num = ion_num()
if (length(law) > 0)
if (force || lawcache_hackedcheck[index] == "Yes")
say("[radiomod] [num]. [law]")
@@ -218,7 +218,7 @@
for (var/index in 1 to length(lawcache_ion))
var/law = lawcache_ion[index]
var/num = ionnum()
var/num = ion_num()
if (length(law) > 0)
if (force || lawcache_ioncheck[index] == "Yes")
say("[radiomod] [num]. [law]")
@@ -258,7 +258,7 @@
if (length(law) > 0)
if (!hackedcheck[index])
hackedcheck[index] = "No"
list += {"<A href='byond://?src=[REF(src)];lawh=[index]'>[hackedcheck[index]] [ionnum()]:</A> <font color='#660000'>[law]</font><BR>"}
list += {"<A href='byond://?src=[REF(src)];lawh=[index]'>[hackedcheck[index]] [ion_num()]:</A> <font color='#660000'>[law]</font><BR>"}
hackedcheck.len += 1
for (var/index = 1, index <= laws.ion.len, index++)
@@ -267,7 +267,7 @@
if (length(law) > 0)
if (!ioncheck[index])
ioncheck[index] = "Yes"
list += {"<A href='byond://?src=[REF(src)];lawi=[index]'>[ioncheck[index]] [ionnum()]:</A> <font color='#547DFE'>[law]</font><BR>"}
list += {"<A href='byond://?src=[REF(src)];lawi=[index]'>[ioncheck[index]] [ion_num()]:</A> <font color='#547DFE'>[law]</font><BR>"}
ioncheck.len += 1
var/number = 1
@@ -397,7 +397,7 @@
/mob/living/simple_animal/hostile/proc/CheckFriendlyFire(atom/A)
if(check_friendly_fire)
for(var/turf/T in getline(src,A)) // Not 100% reliable but this is faster than simulating actual trajectory
for(var/turf/T in get_line(src,A)) // Not 100% reliable but this is faster than simulating actual trajectory
for(var/mob/living/L in T)
if(L == src || L == A)
continue
@@ -95,7 +95,7 @@
return ..()
/datum/status_effect/seedling_beam_indicator/tick()
var/target_angle = Get_Angle(owner, target)
var/target_angle = get_angle(owner, target)
var/matrix/final = matrix()
final.Turn(target_angle)
seedling_screen_object.transform = final
@@ -221,7 +221,7 @@ Difficulty: Medium
turf_dist_to_target += get_dist(dash_target, O)
if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !islava(O) && !ischasm(O))
var/valid = TRUE
for(var/turf/T in getline(own_turf, O))
for(var/turf/T in get_line(own_turf, O))
if(T.is_blocked_turf(TRUE))
valid = FALSE
continue
@@ -201,7 +201,7 @@
var/turf/target_turf = get_turf(target)
playsound(src, 'sound/magic/clockwork/invoke_general.ogg', 200, TRUE, 2)
newtonian_move(get_dir(target_turf, src))
var/angle_to_target = Get_Angle(src, target_turf)
var/angle_to_target = get_angle(src, target_turf)
if(isnum(set_angle))
angle_to_target = set_angle
var/static/list/colossus_shotgun_shot_angles = list(12.5, 7.5, 2.5, -2.5, -7.5, -12.5)
@@ -271,7 +271,7 @@
if(!at)
return
var/turf/T = get_ranged_target_turf_direct(src, at, range, offset)
return (getline(src, T) - get_turf(src))
return (get_line(src, T) - get_turf(src))
/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_line(list/turfs)
SLEEP_CHECK_DEATH(0)
@@ -296,7 +296,7 @@
if(!T || !T1)
return
//Now we generate the tracer.
var/angle = Get_Angle(T1, T)
var/angle = get_angle(T1, T)
var/datum/point/vector/V = new(T1.x, T1.y, T1.z, 0, 0, angle)
generate_tracer_between_points(V, V.return_vector_after_increments(6), /obj/effect/projectile/tracer/legion/tracer, 0, shot_delay, 0, 0, 0, null)
playsound(src, 'sound/machines/airlockopen.ogg', 100, TRUE)
@@ -235,7 +235,7 @@ Difficulty: Hard
SLEEP_CHECK_DEATH(6 - WENDIGO_ENRAGED * 2)
if("Spiral")
var/shots_spiral = WENDIGO_SPIRAL_SHOTCOUNT
var/angle_to_target = Get_Angle(src, target)
var/angle_to_target = get_angle(src, target)
var/spiral_direction = pick(-1, 1)
for(var/shot in 1 to shots_spiral)
var/shots_per_tick = 5 - WENDIGO_ENRAGED * 3
@@ -143,7 +143,7 @@
ranged_cooldown = world.time + 30
playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE)
var/target_turf = get_turf(target)
var/angle_to_target = Get_Angle(src, target_turf)
var/angle_to_target = get_angle(src, target_turf)
shoot_projectile(target_turf, angle_to_target, FALSE, TRUE)
addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 2)
addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 4)
@@ -178,7 +178,7 @@
ranged_cooldown = world.time + 30
playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE)
var/target_turf = get_turf(target)
var/angle_to_target = Get_Angle(src, target_turf)
var/angle_to_target = get_angle(src, target_turf)
shoot_projectile(target_turf, angle_to_target, TRUE, FALSE)
/mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_mirror()
@@ -43,7 +43,7 @@
/mob/living/simple_animal/hostile/asteroid/ice_whelp/Shoot()
var/turf/target_fire_turf = get_ranged_target_turf_direct(src, target, fire_range)
var/list/burn_turfs = getline(src, target_fire_turf) - get_turf(src)
var/list/burn_turfs = get_line(src, target_fire_turf) - get_turf(src)
dragon_fire_line(src, burn_turfs, frozen = TRUE)
/mob/living/simple_animal/hostile/asteroid/ice_whelp/Life(delta_time = SSMOBS_DT, times_fired)
@@ -283,7 +283,7 @@
if(!check)
break
T = check
return (getline(src, T) - get_turf(src))
return (get_line(src, T) - get_turf(src))
/**
* Spawns fire at each position in a line from the source to the target.
@@ -176,7 +176,7 @@
return
if(get_dist(src,the_target) > vine_grab_distance || vines.len >= max_vines)
return
for(var/turf/T in getline(src,target))
for(var/turf/T in get_line(src,target))
if (T.density)
return
for(var/obj/O in T)
+1 -1
View File
@@ -1105,7 +1105,7 @@
///update the ID name of this mob
/mob/proc/replace_identification_name(oldname,newname)
var/list/searching = GetAllContents()
var/list/searching = get_all_contents()
var/search_id = 1
var/search_pda = 1
+1 -1
View File
@@ -241,7 +241,7 @@
if(target)
L.forceMove(target)
var/limit = 2//For only two trailing shadows.
for(var/turf/T in getline(mobloc, L.loc))
for(var/turf/T in get_line(mobloc, L.loc))
new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir)
limit--
if(limit<=0)