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

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

Browse Source 
* _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
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/fullauto.dm
+2 -2
View File
@@ -121,7 +121,7 @@
if(isnull(location)) //Clicking on a screen object.
if(_target.plane != CLICKCATCHER_PLANE) //The clickcatcher is a special case. We want the click to trigger then, under it.
return //If we click and drag on our worn backpack, for example, we want it to open instead.
_target = params2turf(modifiers["screen-loc"], get_turf(source.eye), source)
_target = params_to_turf(modifiers["screen-loc"], get_turf(source.eye), source)
if(!_target)
CRASH("Failed to get the turf under clickcatcher")
@@ -200,7 +200,7 @@
SIGNAL_HANDLER
if(isnull(over_location)) //This happens when the mouse is over an inventory or screen object, or on entering deep darkness, for example.
var/list/modifiers = params2list(params)
var/new_target = params2turf(modifiers["screen-loc"], get_turf(source.eye), source)
var/new_target = params_to_turf(modifiers["screen-loc"], get_turf(source.eye), source)
mouse_parameters = params
if(!new_target)
if(QDELETED(target)) //No new target acquired, and old one was deleted, get us out of here.
code/datums/components/gps.dm
+1 -1
View File
@@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
signal["coords"] = "[pos.x], [pos.y], [pos.z]"
if(pos.z == curr.z) //Distance/Direction calculations for same z-level only
signal["dist"] = max(get_dist(curr, pos), 0) //Distance between the src and remote GPS turfs
signal["degrees"] = round(Get_Angle(curr, pos)) //0-360 degree directional bearing, for more precision.
signal["degrees"] = round(get_angle(curr, pos)) //0-360 degree directional bearing, for more precision.
signals += list(signal) //Add this signal to the list of signals
data["signals"] = signals
return data
code/datums/components/storage/concrete/bag_of_holding.dm
+1 -1
View File
@@ -2,7 +2,7 @@
var/atom/A = parent
if(A == W) //don't put yourself into yourself.
return
var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.GetAllContents(), typecacheof(/obj/item/storage/backpack/holding))
var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.get_all_contents(), typecacheof(/obj/item/storage/backpack/holding))
matching -= A
if(istype(W, /obj/item/storage/backpack/holding) || matching.len)
INVOKE_ASYNC(src, .proc/recursive_insertion, W, user)
code/datums/components/tether.dm
+1 -1
View File
@@ -25,7 +25,7 @@
var/atom/blocker
out:
for(var/turf/T in getline(tether_target,newloc))
for(var/turf/T in get_line(tether_target,newloc))
if (T.density)
blocker = T
break out