Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: Conveyor belt on Cyberiad, Celestation, Novastation. #6109

Open
wants to merge 1 commit into
base: master220
Choose a base branch
from
+425 −219
Open

bugfix: Conveyor belt on Cyberiad, Celestation, Novastation. #6109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions _maps/map_files/celestation/celestation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29523,9 +29523,6 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/disposal/deliveryChute{
dir = 8
},
/obj/structure/window/reinforced{
dir = 4
},
Expand All @@ -29534,6 +29531,10 @@
dir = 6;
pixel_y = 32
},
/obj/structure/disposaloutlet{
dir = 8;
eject_range = 2
},
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"elp" = (
Expand Down Expand Up @@ -55182,9 +55183,6 @@
},
/area/turret_protected/aisat_interior/secondary)
"jfp" = (
/obj/machinery/disposal/deliveryChute{
dir = 1
},
/obj/structure/window/reinforced{
dir = 4
},
Expand All @@ -55193,6 +55191,10 @@
dir = 1;
id = "CargoTransfer"
},
/obj/structure/disposaloutlet{
dir = 1;
eject_range = 2
},
/turf/simulated/floor/plating,
/area/maintenance/disposal)
"jfE" = (
Expand Down Expand Up @@ -101469,6 +101471,13 @@
icon_state = "whitepurple"
},
/area/toxins/misc_lab)
"sio" = (
/obj/structure/disposaloutlet{
dir = 8;
eject_range = 2
},
/turf/space/openspace,
/area/space)
"siv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
Expand Down Expand Up @@ -318982,7 +318991,7 @@ orm
orm
rOC
orm
orm
sio
orm
orm
orm
Expand Down
24 changes: 8 additions & 16 deletions _maps/map_files/cyberiad/cyberiad.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51522,14 +51522,6 @@
icon_state = "neutral"
},
/area/hallway/secondary/entry)
"dcY" = (
/obj/effect/decal/warning_stripes/north,
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
"dda" = (
/obj/machinery/atmospherics/meter,
/obj/machinery/light{
Expand Down Expand Up @@ -87435,7 +87427,7 @@
/obj/structure/plasticflaps/mining,
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
Expand All @@ -87452,7 +87444,7 @@
},
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
Expand All @@ -87474,7 +87466,7 @@
},
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
Expand Down Expand Up @@ -87606,7 +87598,7 @@
/obj/machinery/light,
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
id = "QMLoad2"
},
/turf/simulated/floor/plating,
/area/quartermaster/storage)
Expand Down Expand Up @@ -105833,7 +105825,7 @@ nMQ
bKz
bYy
bKz
dcY
sfT
rmn
uTI
uTI
Expand Down Expand Up @@ -106090,7 +106082,7 @@ nMQ
vkZ
bYy
vkZ
dcY
sfT
rmn
uTI
ylx
Expand Down Expand Up @@ -106347,7 +106339,7 @@ nMQ
vkZ
bYy
vkZ
dcY
sfT
rmn
uTI
ylx
Expand Down Expand Up @@ -106604,7 +106596,7 @@ nMQ
vkZ
whC
vkZ
dcY
sfT
rmn
uTI
ylx
Expand Down
Loading