mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-27 15:18:09 +01:00
Merge pull request #5595 from CHOMPStation2/upstream-merge-14368
[MIRROR] Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly
This commit is contained in:
Nadyr
@@ -1,10 +1,10 @@
|
||||
/obj/structure/fitness/boxing_ropes
|
||||
name = "Ropes"
|
||||
name = "ropes"
|
||||
desc = "Firm yet springy, perhaps this could be useful!"
|
||||
icon = 'icons/obj/fitness_vr.dmi'
|
||||
icon_state = "ropes"
|
||||
density = TRUE
|
||||
throwpass = 1
|
||||
throwpass = TRUE
|
||||
climbable = TRUE
|
||||
layer = WINDOW_LAYER
|
||||
anchored = TRUE
|
||||
@@ -57,110 +57,16 @@
|
||||
return 0
|
||||
return 1
|
||||
|
||||
/obj/structure/fitness/boxing_ropes_bottom
|
||||
name = "Ropes"
|
||||
desc = "Firm yet springy, perhaps this could be useful!"
|
||||
icon = 'icons/obj/fitness_vr.dmi'
|
||||
icon_state = "ropes"
|
||||
density = TRUE
|
||||
throwpass = 1
|
||||
climbable = TRUE
|
||||
/obj/structure/fitness/boxing_ropes/bottom
|
||||
plane = MOB_PLANE
|
||||
layer = ABOVE_MOB_LAYER
|
||||
anchored = TRUE
|
||||
flags = ON_BORDER
|
||||
/obj/structure/fitness/boxing_ropes_bottom/CanPass(atom/movable/mover, turf/target)
|
||||
if(istype(mover) && mover.checkpass(PASSTABLE))
|
||||
return TRUE
|
||||
if(get_dir(mover, target) == turn(dir, 180))
|
||||
return !density
|
||||
return TRUE
|
||||
/obj/structure/fitness/boxing_ropes_bottom/do_climb(var/mob/living/user)
|
||||
if(!can_climb(user))
|
||||
return
|
||||
|
||||
usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
|
||||
LAZYDISTINCTADD(climbers, user)
|
||||
|
||||
if(!do_after(user,(issmall(user) ? 20 : 34)))
|
||||
LAZYREMOVE(climbers, user)
|
||||
return
|
||||
|
||||
if(!can_climb(user, post_climb_check=1))
|
||||
LAZYREMOVE(climbers, user)
|
||||
return
|
||||
|
||||
if(get_turf(user) == get_turf(src))
|
||||
usr.forceMove(get_step(src, src.dir))
|
||||
else
|
||||
usr.forceMove(get_turf(src))
|
||||
|
||||
usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")
|
||||
LAZYREMOVE(climbers, user)
|
||||
|
||||
/obj/structure/fitness/boxing_ropes_bottom/can_climb(var/mob/living/user, post_climb_check=0)
|
||||
if(!..())
|
||||
return 0
|
||||
|
||||
if(get_turf(user) == get_turf(src))
|
||||
var/obj/occupied = neighbor_turf_impassable()
|
||||
if(occupied)
|
||||
to_chat(user, "<span class='danger'>You can't climb there, there's \a [occupied] in the way.</span>")
|
||||
return 0
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
/obj/structure/fitness/boxing_turnbuckle
|
||||
name = "Turnbuckle"
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle
|
||||
name = "turnbuckle"
|
||||
desc = "A sturdy post that looks like it could support even the most heaviest of heavy weights!"
|
||||
icon = 'icons/obj/fitness_vr.dmi'
|
||||
icon_state = "turnbuckle"
|
||||
density = TRUE
|
||||
throwpass = 1
|
||||
climbable = TRUE
|
||||
layer = WINDOW_LAYER
|
||||
anchored = TRUE
|
||||
flags = ON_BORDER
|
||||
/obj/structure/fitness/boxing_turnbuckle/CanPass(atom/movable/mover, turf/target)
|
||||
if(istype(mover) && mover.checkpass(PASSTABLE))
|
||||
return TRUE
|
||||
if(get_dir(mover, target) == turn(dir, 180))
|
||||
return !density
|
||||
return TRUE
|
||||
/obj/structure/fitness/boxing_turnbuckle/do_climb(var/mob/living/user)
|
||||
if(!can_climb(user))
|
||||
return
|
||||
|
||||
usr.visible_message("<span class='warning'>[user] starts climbing onto \the [src]!</span>")
|
||||
LAZYDISTINCTADD(climbers, user)
|
||||
|
||||
if(!do_after(user,(issmall(user) ? 20 : 34)))
|
||||
LAZYREMOVE(climbers, user)
|
||||
return
|
||||
|
||||
if(!can_climb(user, post_climb_check=1))
|
||||
LAZYREMOVE(climbers, user)
|
||||
return
|
||||
|
||||
if(get_turf(user) == get_turf(src))
|
||||
usr.forceMove(get_step(src, src.dir))
|
||||
else
|
||||
usr.forceMove(get_turf(src))
|
||||
|
||||
usr.visible_message("<span class='warning'>[user] climbed over \the [src]!</span>")
|
||||
LAZYREMOVE(climbers, user)
|
||||
|
||||
/obj/structure/fitness/boxing_turnbuckle/can_climb(var/mob/living/user, post_climb_check=0)
|
||||
if(!..())
|
||||
return 0
|
||||
|
||||
if(get_turf(user) == get_turf(src))
|
||||
var/obj/occupied = neighbor_turf_impassable()
|
||||
if(occupied)
|
||||
to_chat(user, "<span class='danger'>You can't climb there, there's \a [occupied] in the way.</span>")
|
||||
return 0
|
||||
return 1
|
||||
|
||||
/turf/simulated/fitness
|
||||
name = "Mat"
|
||||
|
||||
@@ -439,7 +439,7 @@
|
||||
/obj/structure/fitness/boxing_ropes{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 8;
|
||||
layer = 3.4
|
||||
},
|
||||
@@ -462,7 +462,7 @@
|
||||
/obj/structure/fitness/boxing_ropes{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 4;
|
||||
layer = 3.4
|
||||
},
|
||||
@@ -491,21 +491,21 @@
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bD" = (
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bE" = (
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bF" = (
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bG" = (
|
||||
|
||||
@@ -414,7 +414,7 @@
|
||||
/obj/structure/fitness/boxing_ropes{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 8;
|
||||
layer = 3.4
|
||||
},
|
||||
@@ -437,7 +437,7 @@
|
||||
/obj/structure/fitness/boxing_ropes{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 4;
|
||||
layer = 3.4
|
||||
},
|
||||
@@ -459,21 +459,21 @@
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bD" = (
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bE" = (
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bF" = (
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bG" = (
|
||||
|
||||
@@ -30,6 +30,11 @@
|
||||
"ae" = (
|
||||
/turf/unsimulated/mineral/virgo3b,
|
||||
/area/space)
|
||||
"af" = (
|
||||
/obj/structure/table/woodentable/holotable,
|
||||
/turf/space,
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/holodeck/source_game_room)
|
||||
"ag" = (
|
||||
/obj/structure/flora/ausbushes/brflowers,
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
@@ -57,6 +62,7 @@
|
||||
/turf/simulated/floor/holofloor/carpet,
|
||||
/area/holodeck/source_courtroom)
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"aj" = (
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
@@ -74,6 +80,18 @@
|
||||
/turf/simulated/floor/tiled/steel_grid,
|
||||
/area/centcom/simulated/terminal)
|
||||
=======
|
||||
=======
|
||||
"ai" = (
|
||||
/obj/structure/bed/chair/holochair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/carpet{
|
||||
dir = 8
|
||||
},
|
||||
/turf/space,
|
||||
/turf/simulated/floor/holofloor/carpet,
|
||||
/area/holodeck/source_game_room)
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
"aj" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -459,7 +477,7 @@
|
||||
/obj/structure/fitness/boxing_ropes{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 8;
|
||||
layer = 3.4
|
||||
},
|
||||
@@ -482,7 +500,7 @@
|
||||
/obj/structure/fitness/boxing_ropes{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 4;
|
||||
layer = 3.4
|
||||
},
|
||||
@@ -510,21 +528,21 @@
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bD" = (
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bE" = (
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bF" = (
|
||||
/obj/structure/fitness/boxing_turnbuckle{
|
||||
/obj/structure/fitness/boxing_ropes/turnbuckle{
|
||||
dir = 4
|
||||
},
|
||||
/obj/structure/fitness/boxing_ropes_bottom,
|
||||
/obj/structure/fitness/boxing_ropes/bottom,
|
||||
/turf/simulated/fitness,
|
||||
/area/holodeck/source_boxingcourt)
|
||||
"bG" = (
|
||||
@@ -642,7 +660,30 @@
|
||||
=======
|
||||
/turf/simulated/floor/flesh,
|
||||
/area/holodeck/the_uwu_zone)
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> 450841f58d... Merge pull request #12633 from Very-Soft/gbtweaks
|
||||
=======
|
||||
"bO" = (
|
||||
/obj/structure/table/woodentable/holotable,
|
||||
/obj/effect/landmark/costume/elpresidente,
|
||||
/turf/space,
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/holodeck/source_game_room)
|
||||
"bP" = (
|
||||
/obj/effect/step_trigger/teleporter/random{
|
||||
affect_ghosts = 1;
|
||||
name = "escapeshuttle_leave";
|
||||
teleport_x = 25;
|
||||
teleport_x_offset = 245;
|
||||
teleport_y = 25;
|
||||
teleport_y_offset = 245;
|
||||
teleport_z = 4;
|
||||
teleport_z_offset = 4
|
||||
},
|
||||
/turf/space,
|
||||
/turf/space/transit/north,
|
||||
/area/space)
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
"bQ" = (
|
||||
/turf/space/internal_edge/left,
|
||||
/area/space)
|
||||
@@ -1109,6 +1150,7 @@
|
||||
/obj/structure/closet/alien,
|
||||
/turf/simulated/shuttle/floor/alien,
|
||||
/area/unknown/dorm6)
|
||||
<<<<<<< HEAD
|
||||
"dD" = (
|
||||
/obj/machinery/door/airlock/glass_external{
|
||||
frequency = 1380;
|
||||
@@ -1131,6 +1173,8 @@
|
||||
/turf/simulated/shuttle/floor/alien,
|
||||
/area/unknown/dorm6)
|
||||
>>>>>>> 44766f85bb... Merge pull request #10079 from KillianKirilenko/kk-mapping
|
||||
=======
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
"dE" = (
|
||||
/turf/space/internal_edge/bottomright,
|
||||
/area/space)
|
||||
@@ -3549,11 +3593,6 @@
|
||||
/obj/effect/floor_decal/sign/small_b,
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/holodeck/source_chess)
|
||||
"Ej" = (
|
||||
/obj/structure/table/woodentable/holotable,
|
||||
/turf/space,
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/holodeck/source_game_room)
|
||||
"El" = (
|
||||
/turf/space/transit/west,
|
||||
/area/space)
|
||||
@@ -3925,6 +3964,7 @@
|
||||
/obj/structure/table/woodentable/holotable,
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/holodeck/source_game_room)
|
||||
<<<<<<< HEAD
|
||||
"HX" = (
|
||||
/obj/structure/table/woodentable/holotable,
|
||||
/obj/effect/landmark/costume/elpresidente,
|
||||
@@ -3932,6 +3972,8 @@
|
||||
/turf/simulated/floor/holofloor/wood,
|
||||
/area/holodeck/source_game_room)
|
||||
>>>>>>> 450841f58d... Merge pull request #12633 from Very-Soft/gbtweaks
|
||||
=======
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
"Ik" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/cola,
|
||||
@@ -5638,10 +5680,6 @@
|
||||
"VC" = (
|
||||
/turf/unsimulated/beach/sand,
|
||||
/area/beach)
|
||||
"VW" = (
|
||||
/turf/space,
|
||||
/turf/space,
|
||||
/area/space)
|
||||
"Wf" = (
|
||||
/obj/item/toy/chess/queen_white,
|
||||
/turf/simulated/floor/holofloor/wmarble,
|
||||
@@ -6183,16 +6221,6 @@
|
||||
/obj/structure/closet,
|
||||
/turf/unsimulated/beach/sand,
|
||||
/area/beach)
|
||||
"Yi" = (
|
||||
/obj/structure/bed/chair/holochair{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/floor_decal/carpet{
|
||||
dir = 8
|
||||
},
|
||||
/turf/space,
|
||||
/turf/simulated/floor/holofloor/carpet,
|
||||
/area/holodeck/source_game_room)
|
||||
"YI" = (
|
||||
/obj/effect/floor_decal/carpet{
|
||||
dir = 1
|
||||
@@ -123075,10 +123103,17 @@ Jz
|
||||
Jz
|
||||
Jz
|
||||
Jz
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
fg
|
||||
fg
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -123220,7 +123255,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -123362,7 +123401,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -123518,7 +123561,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -123660,7 +123707,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -123802,7 +123853,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -123944,7 +123999,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124086,7 +124145,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124228,7 +124291,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124370,7 +124437,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124512,7 +124583,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124654,7 +124729,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124796,7 +124875,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -124938,7 +125021,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -125080,7 +125167,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -125222,7 +125313,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -125364,7 +125459,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -125506,7 +125605,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -125648,7 +125751,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -125936,7 +126043,11 @@ jf
|
||||
Gs
|
||||
Gs
|
||||
Gs
|
||||
<<<<<<< HEAD
|
||||
fg
|
||||
=======
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -126056,6 +126167,7 @@ ap
|
||||
ap
|
||||
ap
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
@@ -126117,6 +126229,32 @@ dD
|
||||
dD
|
||||
dD
|
||||
>>>>>>> 450841f58d... Merge pull request #12633 from Very-Soft/gbtweaks
|
||||
=======
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
bP
|
||||
>>>>>>> a5a575aac8... Merge pull request #14368 from Heroman3003/boxringfix
|
||||
iO
|
||||
El
|
||||
El
|
||||
@@ -127810,11 +127948,11 @@ Xs
|
||||
vY
|
||||
HU
|
||||
Pr
|
||||
Ej
|
||||
af
|
||||
HU
|
||||
Pr
|
||||
lX
|
||||
HX
|
||||
bO
|
||||
yW
|
||||
fZ
|
||||
ap
|
||||
@@ -128236,7 +128374,7 @@ Pr
|
||||
Pr
|
||||
gZ
|
||||
QU
|
||||
Yi
|
||||
ai
|
||||
QU
|
||||
QU
|
||||
yr
|
||||
@@ -130162,7 +130300,7 @@ RT
|
||||
gD
|
||||
fZ
|
||||
ap
|
||||
VW
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
@@ -130403,7 +130541,7 @@ ae
|
||||
ae
|
||||
=======
|
||||
ap
|
||||
VW
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
@@ -130645,7 +130783,7 @@ ae
|
||||
ae
|
||||
=======
|
||||
ap
|
||||
VW
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
@@ -130788,7 +130926,7 @@ gD
|
||||
xc
|
||||
fZ
|
||||
ap
|
||||
VW
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
@@ -130930,7 +131068,7 @@ gD
|
||||
Fk
|
||||
fZ
|
||||
ap
|
||||
VW
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
ap
|
||||
|
||||
Reference in New Issue
Block a user