diff --git a/code/game/objects/structures/fitness_vr.dm b/code/game/objects/structures/fitness_vr.dm
index d6ef4b71924..0eeaf621965 100644
--- a/code/game/objects/structures/fitness_vr.dm
+++ b/code/game/objects/structures/fitness_vr.dm
@@ -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("[user] starts climbing onto \the [src]!")
- 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("[user] climbed over \the [src]!")
- 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, "You can't climb there, there's \a [occupied] in the way.")
- 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("[user] starts climbing onto \the [src]!")
- 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("[user] climbed over \the [src]!")
- 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, "You can't climb there, there's \a [occupied] in the way.")
- return 0
- return 1
/turf/simulated/fitness
name = "Mat"
diff --git a/maps/groundbase/gb-misc.dmm b/maps/groundbase/gb-misc.dmm
index 2fcffae9a80..4909eeea2cd 100644
--- a/maps/groundbase/gb-misc.dmm
+++ b/maps/groundbase/gb-misc.dmm
@@ -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" = (
diff --git a/maps/stellar_delight/ship_misc.dmm b/maps/stellar_delight/ship_misc.dmm
index bb8e4f8aff2..2693ec1a859 100644
--- a/maps/stellar_delight/ship_misc.dmm
+++ b/maps/stellar_delight/ship_misc.dmm
@@ -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" = (
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index 3f328faef66..539cdee54e8 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -28,6 +28,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{
@@ -54,6 +59,16 @@
},
/turf/simulated/floor/holofloor/carpet,
/area/holodeck/source_courtroom)
+"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)
"aj" = (
/obj/machinery/light{
dir = 1
@@ -438,7 +453,7 @@
/obj/structure/fitness/boxing_ropes{
dir = 1
},
-/obj/structure/fitness/boxing_turnbuckle{
+/obj/structure/fitness/boxing_ropes/turnbuckle{
dir = 8;
layer = 3.4
},
@@ -461,7 +476,7 @@
/obj/structure/fitness/boxing_ropes{
dir = 1
},
-/obj/structure/fitness/boxing_turnbuckle{
+/obj/structure/fitness/boxing_ropes/turnbuckle{
dir = 4;
layer = 3.4
},
@@ -489,21 +504,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" = (
@@ -574,6 +589,26 @@
"bN" = (
/turf/simulated/floor/flesh,
/area/holodeck/the_uwu_zone)
+"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)
"bQ" = (
/turf/space/internal_edge/left,
/area/space)
@@ -1149,20 +1184,6 @@
/obj/structure/closet/alien,
/turf/simulated/shuttle/floor/alien,
/area/unknown/dorm6)
-"dD" = (
-/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)
"dE" = (
/turf/space/internal_edge/bottomright,
/area/space)
@@ -2670,11 +2691,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)
@@ -2786,12 +2802,6 @@
/obj/structure/table/woodentable/holotable,
/turf/simulated/floor/holofloor/wood,
/area/holodeck/source_game_room)
-"HX" = (
-/obj/structure/table/woodentable/holotable,
-/obj/effect/landmark/costume/elpresidente,
-/turf/space,
-/turf/simulated/floor/holofloor/wood,
-/area/holodeck/source_game_room)
"Ik" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/food/drinks/cans/cola,
@@ -3627,10 +3637,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,
@@ -3679,16 +3685,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
@@ -13330,10 +13326,10 @@ Jz
Jz
Jz
Jz
-dD
-dD
-dD
-dD
+bP
+bP
+bP
+bP
iO
El
El
@@ -13475,7 +13471,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -13617,7 +13613,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -13759,7 +13755,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -13901,7 +13897,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14043,7 +14039,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14185,7 +14181,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14327,7 +14323,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14469,7 +14465,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14611,7 +14607,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14753,7 +14749,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -14895,7 +14891,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15037,7 +15033,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15179,7 +15175,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15321,7 +15317,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15463,7 +15459,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15605,7 +15601,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15747,7 +15743,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -15889,7 +15885,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -16031,7 +16027,7 @@ jf
Gs
Gs
Gs
-dD
+bP
iO
El
El
@@ -16150,30 +16146,30 @@ ap
ap
ap
ap
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
-dD
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
+bP
iO
El
El
@@ -17375,11 +17371,11 @@ Xs
vY
HU
Pr
-Ej
+af
HU
Pr
lX
-HX
+bO
yW
fZ
ap
@@ -17801,7 +17797,7 @@ Pr
Pr
gZ
QU
-Yi
+ai
QU
QU
yr
@@ -19513,7 +19509,7 @@ RT
gD
fZ
ap
-VW
+ap
ap
ap
ap
@@ -19655,7 +19651,7 @@ gD
gD
fZ
ap
-VW
+ap
ap
ap
ap
@@ -19797,7 +19793,7 @@ gD
gD
fZ
ap
-VW
+ap
ap
ap
ap
@@ -19939,7 +19935,7 @@ gD
xc
fZ
ap
-VW
+ap
ap
ap
ap
@@ -20081,7 +20077,7 @@ gD
Fk
fZ
ap
-VW
+ap
ap
ap
ap