cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11867 from Heroman3003/tablefix

Browse Source 
Fixes some table passing bugs
This commit is contained in:
Casey
2021-11-22 23:15:17 -05:00
committed by Chompstation Bot
parent e6f330182b
commit d8c41a1f63
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/tables/flipping.dm
View File

@@ -50,7 +50,7 @@
L.Add(turn(src.dir,90)) L.Add(turn(src.dir,90))
for(var/new_dir in L) for(var/new_dir in L)
var/obj/structure/table/T = locate() in get_step(src.loc,new_dir) var/obj/structure/table/T = locate() in get_step(src.loc,new_dir)
if(T && T.material.name == material.name) if(T && T.material && T.material.name == material.name)
if(T.flipped == 1 && T.dir == src.dir && !T.unflipping_check(new_dir)) if(T.flipped == 1 && T.dir == src.dir && !T.unflipping_check(new_dir))
return 0 return 0
return 1 return 1

8
code/modules/tables/interactions.dm
View File

@@ -1,7 +1,7 @@
/obj/structure/table/CanPass(atom/movable/mover, turf/target) /obj/structure/table/CanPass(atom/movable/mover, turf/target)
if(istype(mover,/obj/item/projectile)) if(istype(mover,/obj/item/projectile))
return (check_cover(mover,target)) return (check_cover(mover,target))
if (flipped) if(flipped == 1)
if(get_dir(mover, target) == reverse_dir[dir]) // From elsewhere to here, can't move against our dir if(get_dir(mover, target) == reverse_dir[dir]) // From elsewhere to here, can't move against our dir
return !density return !density
return TRUE return TRUE
@@ -10,12 +10,12 @@
if(locate(/obj/structure/table/bench) in get_turf(mover)) if(locate(/obj/structure/table/bench) in get_turf(mover))
return FALSE return FALSE
var/obj/structure/table/table = locate(/obj/structure/table) in get_turf(mover) var/obj/structure/table/table = locate(/obj/structure/table) in get_turf(mover)
if(table && !table.flipped) if(table && !(table.flipped == 1))
return TRUE return TRUE
return FALSE return FALSE
/obj/structure/table/climb_to(mob/living/mover) /obj/structure/table/climb_to(mob/living/mover)
if(flipped && mover.loc == loc) if(flipped == 1 && mover.loc == loc)
var/turf/T = get_step(src, dir) var/turf/T = get_step(src, dir)
if(T.Enter(mover)) if(T.Enter(mover))
return T return T
@@ -23,7 +23,7 @@
return ..() return ..()
/obj/structure/table/Uncross(atom/movable/mover, turf/target) /obj/structure/table/Uncross(atom/movable/mover, turf/target)
if(flipped && (get_dir(mover, target) == dir)) // From here to elsewhere, can't move in our dir if(flipped == 1 && (get_dir(mover, target) == dir)) // From here to elsewhere, can't move in our dir
return !density return !density
return TRUE return TRUE

2
code/modules/tables/tables.dm
View File

@@ -331,6 +331,8 @@ var/list/table_icon_cache = list()
return FALSE return FALSE
if(istype(src,/obj/structure/table/bench) && !istype(S,/obj/structure/table/bench)) if(istype(src,/obj/structure/table/bench) && !istype(S,/obj/structure/table/bench))
return FALSE return FALSE
if(istype(S,/obj/structure/table/rack) && !istype(src,/obj/structure/table/rack))
return FALSE
if(istype(src,/obj/structure/table/rack) && !istype(S,/obj/structure/table/rack)) if(istype(src,/obj/structure/table/rack) && !istype(S,/obj/structure/table/rack))
return FALSE return FALSE
if(istype(S,/obj/structure/table)) if(istype(S,/obj/structure/table))