mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13.git
synced 2026-08-31 00:39:00 +01:00
Fix
This commit is contained in:
@@ -261,7 +261,7 @@
|
||||
* Arguments:
|
||||
* * ID- An ID card representing what access we have (and thus if we can open things like airlocks or windows to pass through them). The ID card's physical location does not matter, just the reference
|
||||
* * to_dir- What direction we're trying to move in, relevant for things like directional windows that only block movement in certain directions
|
||||
* * caller1- The movable we're checking pass flags for, if we're making any such checks
|
||||
* * caller- The movable we're checking pass flags for, if we're making any such checks
|
||||
**/
|
||||
/obj/proc/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller1)
|
||||
if(ismovable(caller1))
|
||||
|
||||
@@ -61,11 +61,11 @@
|
||||
if(isbot(caller1))
|
||||
return TRUE
|
||||
|
||||
var/mob/living/living_caller1 = caller1
|
||||
if(!(SEND_SIGNAL(living_caller1, COMSIG_CHECK_VENTCRAWL)) && living_caller1.mob_size != MOB_SIZE_TINY)
|
||||
var/mob/living/living_caller = caller1
|
||||
if(!(SEND_SIGNAL(living_caller, COMSIG_CHECK_VENTCRAWL)) && living_caller.mob_size != MOB_SIZE_TINY)
|
||||
return FALSE
|
||||
|
||||
if(caller1?.pulling)
|
||||
if(caller?.pulling)
|
||||
return CanAStarPass(ID, to_dir, caller1.pulling)
|
||||
return TRUE //diseases, stings, etc can pass
|
||||
|
||||
|
||||
@@ -570,7 +570,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
|
||||
/obj/structure/window/get_dumping_location(obj/item/storage/source,mob/user)
|
||||
return null
|
||||
|
||||
/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/)
|
||||
/obj/structure/window/CanAStarPass(obj/item/card/id/ID, to_dir, atom/movable/caller1)
|
||||
if(!density)
|
||||
return TRUE
|
||||
if((dir == FULLTILE_WINDOW_DIR) || (dir == to_dir))
|
||||
|
||||
Reference in New Issue
Block a user