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.

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

Ever More QOL Editing #497

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2213,6 +2213,7 @@
/area/station/maintenance/disposal)
"axz" = (
/obj/machinery/light/directional/south,
/obj/machinery/egg_incubator,
/turf/open/floor/iron,
/area/station/service/hydroponics)
"axH" = (
Expand Down
53 changes: 43 additions & 10 deletions _maps/map_files/Oshan/oshan.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3710,6 +3710,7 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/structure/cable,
/turf/open/floor/iron,
/area/ruin/space/ks13/engineering/secure_storage)
"bRT" = (
Expand Down Expand Up @@ -4510,6 +4511,7 @@
/obj/effect/turf_decal/trimline/red/filled/warning{
dir = 1
},
/obj/structure/cable,
/turf/open/floor/iron/dark/textured,
/area/station/hallway/primary/central)
"cpK" = (
Expand Down Expand Up @@ -7195,6 +7197,7 @@
"dMc" = (
/obj/machinery/airalarm/directional/east,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
/turf/open/floor/iron/showroomfloor,
/area/station/commons/toilet/locker)
"dMe" = (
Expand Down Expand Up @@ -12495,6 +12498,15 @@
/obj/effect/spawner/random/trash,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"guf" = (
/obj/machinery/plumbing/disposer{
dir = 1;
name = "Oshan Upgraded Water Disposal Unit";
buffer = 500;
disposal_rate = 50
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
"gul" = (
/obj/structure/lattice,
/obj/machinery/conveyor/auto{
Expand Down Expand Up @@ -13021,6 +13033,7 @@
/area/station/service/chapel/office)
"gHM" = (
/obj/machinery/light/directional/south,
/obj/structure/cable,
/turf/open/floor/bamboo,
/area/station/commons/fitness)
"gIh" = (
Expand Down Expand Up @@ -13050,6 +13063,7 @@
/area/station/maintenance/starboard/aft)
"gIB" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/turf/open/floor/bamboo,
/area/station/commons/fitness)
"gIV" = (
Expand Down Expand Up @@ -21548,6 +21562,7 @@
/obj/structure/table/wood,
/obj/item/gun/ballistic/shotgun/doublebarrel,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/turf/open/floor/wood,
/area/station/service/bar/backroom)
"kUG" = (
Expand Down Expand Up @@ -28335,6 +28350,12 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
"ooe" = (
/obj/machinery/plumbing/layer_manifold{
dir = 1
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
"ooi" = (
/obj/structure/cable,
/turf/open/floor/noslip{
Expand Down Expand Up @@ -30725,7 +30746,7 @@
/turf/open/floor/carpet/executive,
/area/station/command/bridge)
"pAa" = (
/obj/machinery/plumbing/disposer,
/obj/machinery/plumbing/layer_manifold,
/turf/open/floor/plating,
/area/station/maintenance/starboard/central)
"pAg" = (
Expand Down Expand Up @@ -33434,6 +33455,10 @@
icon_state = "clown_carpet"
},
/area/station/commons/dorms)
"qQg" = (
/obj/structure/cable,
/turf/open/floor/bamboo,
/area/station/commons/fitness)
"qQx" = (
/obj/machinery/power/port_gen/pacman/pre_loaded,
/turf/open/floor/plating,
Expand Down Expand Up @@ -45066,6 +45091,14 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"wHW" = (
/obj/machinery/plumbing/disposer{
name = "Oshan Upgraded Water Disposal Unit";
buffer = 500;
disposal_rate = 50
},
/turf/open/floor/plating,
/area/station/maintenance/starboard/upper)
"wId" = (
/obj/machinery/light_switch/directional/north,
/obj/effect/turf_decal/trimline/blue/filled/line{
Expand Down Expand Up @@ -64277,7 +64310,7 @@ rdt
pVn
qZT
pAa
jMP
guf
uSV
fXU
fXU
Expand Down Expand Up @@ -65341,7 +65374,7 @@ sFP
sFP
sFP
egP
rYQ
qQg
dPH
oHO
afI
Expand Down Expand Up @@ -65594,11 +65627,11 @@ hdv
oWO
vtb
aYq
rYQ
rYQ
rYQ
rYQ
rYQ
qQg
qQg
qQg
qQg
qQg
dPH
tPb
afI
Expand Down Expand Up @@ -84297,8 +84330,8 @@ qSI
nRM
tAk
ksI
fgS
fgS
wHW
ooe
rdb
fgS
wdA
Expand Down
1 change: 1 addition & 0 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11636,6 +11636,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/machinery/smartfridge/drying_rack,
/turf/open/floor/wood/large,
/area/centcom/central_command_areas/kitchen)
"Jx" = (
Expand Down
7 changes: 5 additions & 2 deletions _maps/map_files/tramstation/tramstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5016,6 +5016,7 @@
/obj/machinery/cassette/adv_cassette_deck,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/turf/open/floor/iron/vaporwave,
/area/station/service/library/upper)
"aDR" = (
Expand Down Expand Up @@ -6160,6 +6161,7 @@
c_tag = "Civilian - Library East"
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/turf/open/floor/iron/vaporwave,
/area/station/service/library/upper)
"aMz" = (
Expand Down Expand Up @@ -53156,7 +53158,7 @@
/obj/machinery/door/airlock/maintenance_hatch{
name = "Security Maintenance Hatch"
},
/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/iron/smooth,
/area/station/maintenance/department/eva)
"qcY" = (
Expand Down Expand Up @@ -67511,6 +67513,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/airalarm/directional/south,
/obj/structure/cable,
/turf/open/floor/iron/vaporwave,
/area/station/service/library/upper)
"uFD" = (
Expand Down Expand Up @@ -77682,10 +77685,10 @@
/obj/machinery/door/airlock/maintenance_hatch{
name = "Security Maintenance Hatch"
},
/obj/effect/mapping_helpers/airlock/access/any/security/maintenance,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/security/general,
/turf/open/floor/catwalk_floor,
/area/station/maintenance/department/eva)
"xSD" = (
Expand Down
Loading