Skip to content

Commit

Permalink
Stool Rotation Fix (#17660)
Browse files Browse the repository at this point in the history
  • Loading branch information
Geevies authored Oct 23, 2023
1 parent a777f02 commit ce53d86
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 18 deletions.
6 changes: 6 additions & 0 deletions html/changelogs/geeves-stool_rotation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
author: Geeves

delete-after: True

changes:
- bugfix: "Fixed the rotation of stools in the bar and the kitchen."
62 changes: 44 additions & 18 deletions maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2577,7 +2577,6 @@
/turf/simulated/floor/reinforced/airless,
/area/turret_protected/ai_upload)
"bfB" = (
/obj/structure/bed/stool/bar/padded/red,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
Expand All @@ -2589,6 +2588,9 @@
dir = 1;
icon_state = "pipe-j2"
},
/obj/structure/bed/stool/bar/padded/red{
dir = 1
},
/turf/simulated/floor/lino,
/area/horizon/bar)
"bfF" = (
Expand Down Expand Up @@ -5506,7 +5508,9 @@
/turf/simulated/floor/tiled/white,
/area/rnd/research)
"cAt" = (
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 4
},
/turf/simulated/floor/lino,
/area/horizon/bar)
"cAx" = (
Expand Down Expand Up @@ -8838,7 +8842,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 1
},
/turf/simulated/floor/lino,
/area/horizon/bar)
"enV" = (
Expand Down Expand Up @@ -11224,7 +11230,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 6
},
/obj/structure/bed/stool/bar/padded/black,
/obj/structure/bed/stool/bar/padded/black{
dir = 8
},
/turf/simulated/floor/wood,
/area/horizon/crew_quarters/lounge/bar)
"ftS" = (
Expand Down Expand Up @@ -12080,7 +12088,9 @@
/turf/simulated/floor/tiled/white,
/area/medical/reception)
"fOX" = (
/obj/structure/bed/stool/padded/red,
/obj/structure/bed/stool/padded/red{
dir = 4
},
/turf/simulated/floor/lino,
/area/horizon/crew_quarters/lounge/bar)
"fPb" = (
Expand Down Expand Up @@ -22730,12 +22740,12 @@
/obj/machinery/atmospherics/unary/outlet_injector{
dir = 4;
frequency = 1439;
id = "cooling_in";
name = "Reactor Coolant Injector";
pixel_y = 1;
power_rating = 30000;
use_power = 1;
volume_rate = 700;
id = "cooling_in"
volume_rate = 700
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/floor_decal/industrial/warning{
Expand Down Expand Up @@ -26707,7 +26717,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 4
},
/turf/simulated/floor/wood,
/area/horizon/bar)
"mLM" = (
Expand Down Expand Up @@ -29128,9 +29140,9 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/computer/general_air_control/supermatter_core{
frequency = 1439;
output_tag = "cooling_out";
input_tag = "cooling_in";
name = "Supermatter Monitoring Terminal";
output_tag = "cooling_out";
sensors = list("supermatter_sensor"="Supermatter Core")
},
/turf/simulated/floor/tiled/dark/full,
Expand Down Expand Up @@ -30440,7 +30452,9 @@
dir = 1;
pixel_y = 28
},
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 4
},
/turf/simulated/floor/lino,
/area/horizon/bar)
"owR" = (
Expand Down Expand Up @@ -31740,8 +31754,8 @@
"pdF" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/air_sensor{
id_tag = "fusion_sensor";
frequency = 1441
frequency = 1441;
id_tag = "fusion_sensor"
},
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/reinforced/airless,
Expand Down Expand Up @@ -32221,7 +32235,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 1
},
/turf/simulated/floor/wood,
/area/horizon/bar)
"pqc" = (
Expand Down Expand Up @@ -39553,7 +39569,9 @@
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"tag" = (
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 8
},
/obj/machinery/alarm/south,
/turf/simulated/floor/tiled/dark,
/area/horizon/bar)
Expand Down Expand Up @@ -46600,6 +46618,12 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/wing/starboard)
"wiG" = (
/obj/structure/bed/stool/bar/padded/red{
dir = 1
},
/turf/simulated/floor/lino,
/area/horizon/bar)
"wiH" = (
/obj/structure/bed/stool/bar/padded/red,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -47356,7 +47380,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
/obj/structure/bed/stool/bar/padded/red,
/obj/structure/bed/stool/bar/padded/red{
dir = 4
},
/turf/simulated/floor/wood,
/area/horizon/bar)
"wAm" = (
Expand Down Expand Up @@ -69258,7 +69284,7 @@ dim
lvM
gKC
tfl
cAt
wiG
pZs
qzH
nxI
Expand Down Expand Up @@ -69460,7 +69486,7 @@ kgS
otr
odD
wMr
cAt
wiG
pZs
qEL
bOI
Expand Down Expand Up @@ -69662,7 +69688,7 @@ gwy
rIZ
gBK
fkr
cAt
wiG
pZs
gMn
bOI
Expand Down

0 comments on commit ce53d86

Please sign in to comment.