-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/tgstation/-tg-station
Resolved Conflicts: code/controllers/shuttle_controller.dm code/game/gamemodes/nuclear/nuclear.dm code/game/gamemodes/revolution/revolution.dm code/game/jobs/access.dm code/game/jobs/job/captain.dm code/game/machinery/computer/communications.dm html/changelog.html ministation.dme
- Loading branch information
Showing
374 changed files
with
25,141 additions
and
7,092 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /* | ||
| Adjacency proc for determining touch range | ||
| This is mostly to determine if a user can enter a square for the purposes of touching something. | ||
| Examples include reaching a square diagonally or reaching something on the other side of a glass window. | ||
| This is calculated by looking for border items, or in the case of clicking diagonally from yourself, dense items. | ||
| This proc will NOT notice if you are trying to attack a window on the other side of a dense object in its turf. There is a window helper for that. | ||
| Note that in all cases the neighbor is handled simply; this is usually the user's mob, in which case it is up to you | ||
| to check that the mob is not inside of something | ||
| */ | ||
| /atom/proc/Adjacent(var/atom/neighbor) // basic inheritance, unused | ||
| return 0 | ||
|
|
||
| // Not a sane use of the function and (for now) indicative of an error elsewhere | ||
| /area/Adjacent(var/atom/neighbor) | ||
| CRASH("Call to /area/Adjacent(), unimplemented proc") | ||
|
|
||
|
|
||
| /* | ||
| Adjacency (to turf): | ||
| * If you are in the same turf, always true | ||
| * If you are vertically/horizontally adjacent, ensure there are no border objects | ||
| * If you are diagonally adjacent, ensure you can pass through at least one of the mutually adjacent square. | ||
| * Passing through in this case ignores anything with the throwpass flag, such as tables, racks, and morgue trays. | ||
| */ | ||
| /turf/Adjacent(var/atom/neighbor, var/atom/target = null) | ||
| var/turf/T0 = get_turf(neighbor) | ||
| if(T0 == src) | ||
| return 1 | ||
| if(get_dist(src,T0) > 1) | ||
| return 0 | ||
|
|
||
| if(T0.x == x || T0.y == y) | ||
| // Check for border blockages | ||
| return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target) | ||
|
|
||
| // Not orthagonal | ||
| var/in_dir = get_dir(neighbor,src) // eg. northwest (1+8) | ||
| var/d1 = in_dir&(in_dir-1) // eg west (1+8)&(8) = 8 | ||
| var/d2 = in_dir - d1 // eg north (1+8) - 8 = 1 | ||
|
|
||
| for(var/d in list(d1,d2)) | ||
| if(!T0.ClickCross(d, border_only = 1)) | ||
| continue // could not leave T0 in that direction | ||
|
|
||
| var/turf/T1 = get_step(T0,d) | ||
| if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0) & get_dir(T1,src), border_only = 0)) | ||
| continue // couldn't enter or couldn't leave T1 | ||
|
|
||
| if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target)) | ||
| continue // could not enter src | ||
|
|
||
| return 1 // we don't care about our own density | ||
| return 0 | ||
|
|
||
| /* | ||
| Adjacency (to anything else): | ||
| * Must be on a turf | ||
| * In the case of a multiple-tile object, all valid locations are checked for adjacency. | ||
| Note: Multiple-tile objects are created when the bound_width and bound_height are creater than the tile size. | ||
| This is not used in stock /tg/station currently. | ||
| */ | ||
| /atom/movable/Adjacent(var/atom/neighbor) | ||
| if(neighbor == loc) return 1 | ||
| if(!isturf(loc)) return 0 | ||
| for(var/turf/T in locs) | ||
| if(isnull(T)) continue | ||
| if(T.Adjacent(neighbor,src)) return 1 | ||
| return 0 | ||
|
|
||
| // This is necessary for storage items not on your person. | ||
| /obj/item/Adjacent(var/atom/neighbor, var/recurse = 1) | ||
| if(neighbor == loc) return 1 | ||
| if(istype(loc,/obj/item)) | ||
| if(recurse > 0) | ||
| return loc.Adjacent(neighbor,recurse - 1) | ||
| return 0 | ||
| return ..() | ||
| /* | ||
| Special case: This allows you to reach a door when it is visally on top of, | ||
| but technically behind, a fire door | ||
| You could try to rewrite this to be faster, but I'm not sure anything would be. | ||
| This can be safely removed if border firedoors are ever moved to be on top of doors | ||
| so they can be interacted with without opening the door. | ||
| */ | ||
| /obj/machinery/door/Adjacent(var/atom/neighbor) | ||
| var/obj/machinery/door/firedoor/border_only/BOD = locate() in loc | ||
| if(BOD) | ||
| BOD.throwpass = 1 // allow click to pass | ||
| . = ..() | ||
| BOD.throwpass = 0 | ||
| return . | ||
| return ..() | ||
|
|
||
|
|
||
| /* | ||
| This checks if you there is uninterrupted airspace between that turf and this one. | ||
| This is defined as any dense ON_BORDER object, or any dense object without throwpass. | ||
| The border_only flag allows you to not objects (for source and destination squares) | ||
| */ | ||
| /turf/proc/ClickCross(var/target_dir, var/border_only, var/target_atom = null) | ||
| for(var/obj/O in src) | ||
| if( !O.density || O == target_atom || O.throwpass) continue // throwpass is used for anything you can click through | ||
|
|
||
| if( O.flags&ON_BORDER) // windows have throwpass but are on border, check them first | ||
| if( O.dir & target_dir || O.dir&(O.dir-1) ) // full tile windows are just diagonals mechanically | ||
| return 0 | ||
|
|
||
| else if( !border_only ) // dense, not on border, cannot pass over | ||
| return 0 | ||
| return 1 | ||
| /* | ||
| Aside: throwpass does not do what I thought it did originally, and is only used for checking whether or not | ||
| a thrown object should stop after already successfully entering a square. Currently the throw code involved | ||
| only seems to affect hitting mobs, because the checks performed against objects are already performed when | ||
| entering or leaving the square. Since throwpass isn't used on mobs, but only on objects, it is effectively | ||
| useless. Throwpass may later need to be removed and replaced with a passcheck (bitfield on movable atom passflags). | ||
| Since I don't want to complicate the click code rework by messing with unrelated systems it won't be changed here. | ||
| */ |
Oops, something went wrong.