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

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-03-28 19:41:16 -04:00
parent 8ed384b38c
commit d3837b76e8
5 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/doors/windowdoor.dm
View File

@@ -84,18 +84,10 @@
open() open()
addtimer(CALLBACK(src, .proc/close), check_access(null)? 50 : 20) addtimer(CALLBACK(src, .proc/close), check_access(null)? 50 : 20)
<<<<<<< HEAD
/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(istype(mover) && mover.checkpass(PASSGLASS))
return 1
if(get_dir(mover, loc) == turn(dir, 180)) //Make sure looking at appropriate border
if(air_group) return 0
=======
/obj/machinery/door/window/CanPass(atom/movable/mover, turf/target) /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS)) if(istype(mover) && mover.checkpass(PASSGLASS))
return TRUE return TRUE
if(get_dir(mover, loc) == turn(dir, 180)) //Make sure looking at appropriate border if(get_dir(mover, loc) == turn(dir, 180)) //Make sure looking at appropriate border
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
return !density return !density
return TRUE return TRUE

7
code/game/objects/effects/spiders.dm
View File

@@ -62,16 +62,9 @@
icon_state = "stickyweb2" icon_state = "stickyweb2"
return ..() return ..()
<<<<<<< HEAD
/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
return 1
=======
/obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target) /obj/effect/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_mob/animal/giant_spider)) if(istype(mover, /mob/living/simple_mob/animal/giant_spider))
return TRUE return TRUE
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
else if(istype(mover, /mob/living)) else if(istype(mover, /mob/living))
if(prob(50)) if(prob(50))
to_chat(mover, span("warning", "You get stuck in \the [src] for a moment.")) to_chat(mover, span("warning", "You get stuck in \the [src] for a moment."))

7
code/game/objects/items/weapons/policetape.dm
View File

@@ -290,17 +290,10 @@ var/list/tape_roll_applications = list()
if(!lifted && ismob(mover)) if(!lifted && ismob(mover))
var/mob/M = mover var/mob/M = mover
add_fingerprint(M) add_fingerprint(M)
<<<<<<< HEAD
if (!allowed(M)) //only select few learn art of not crumpling the tape
M << "<span class='warning'>You are not supposed to go past [src]...</span>"
if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
return 0
=======
if(!allowed(M)) //only select few learn art of not crumpling the tape if(!allowed(M)) //only select few learn art of not crumpling the tape
to_chat(M, span("warning", "You are not supposed to go past \the [src]...")) to_chat(M, span("warning", "You are not supposed to go past \the [src]..."))
if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob))) if(M.a_intent == I_HELP && !(istype(M, /mob/living/simple_mob)))
return FALSE return FALSE
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
crumple() crumple()
return ..() return ..()

10
code/game/objects/structures/window.dm
View File

@@ -130,17 +130,7 @@
/obj/structure/window/blob_act() /obj/structure/window/blob_act()
take_damage(50) take_damage(50)
<<<<<<< HEAD
//TODO: Make full windows a separate type of window.
//Once a full window, it will always be a full window, so there's no point
//having the same type for both.
/obj/structure/window/proc/is_full_window()
return (dir == SOUTHWEST || dir == SOUTHEAST || dir == NORTHWEST || dir == NORTHEAST)
/obj/structure/window/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
=======
/obj/structure/window/CanPass(atom/movable/mover, turf/target) /obj/structure/window/CanPass(atom/movable/mover, turf/target)
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
if(istype(mover) && mover.checkpass(PASSGLASS)) if(istype(mover) && mover.checkpass(PASSGLASS))
return TRUE return TRUE
if(is_fulltile()) if(is_fulltile())

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

@@ -1,10 +1,4 @@
<<<<<<< HEAD
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
=======
/obj/structure/table/CanPass(atom/movable/mover, turf/target) /obj/structure/table/CanPass(atom/movable/mover, turf/target)
>>>>>>> 4122c65... Merge pull request #5947 from Neerti/bump_fixes
if(istype(mover,/obj/item/projectile)) if(istype(mover,/obj/item/projectile))
return (check_cover(mover,target)) return (check_cover(mover,target))
if (flipped == 1) if (flipped == 1)