Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Delta/Meta - Adds Xenobio console back #8682

Merged
alexkar598 merged 3 commits into from
May 28, 2020
Merged

Delta/Meta - Adds Xenobio console back #8682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
568cae8
initial
Jumps0 May 24, 2020
a57ed34
what is hourglass and why is he making my checks fail
Jumps0 May 24, 2020
1102bf7
Revert "what is hourglass and why is he making my checks fail"
Jumps0 May 24, 2020
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
47 changes: 24 additions & 23 deletions _maps/map_files/YogsDelta/YogsDelta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101609,14 +101609,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"cXm" = (
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/structure/table/reinforced,
/obj/item/extinguisher,
/turf/open/floor/circuit/green,
/area/science/xenobiology)
"cXn" = (
/obj/structure/cable/white{
icon_state = "4-8"
Expand Down Expand Up @@ -126676,19 +126668,6 @@
/obj/machinery/atmospherics/pipe/manifold/general/visible,
/turf/open/space,
/area/space/nearstation)
"hFQ" = (
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/structure/table/reinforced,
/obj/item/extinguisher,
/obj/item/extinguisher,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/turf/open/floor/circuit/green,
/area/science/xenobiology)
"hLm" = (
/obj/machinery/power/terminal{
dir = 4
Expand Down Expand Up @@ -126725,6 +126704,15 @@
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
/turf/open/floor/plating,
/area/maintenance/port)
"iMT" = (
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/machinery/computer/camera_advanced/xenobio{
dir = 8
},
/turf/open/floor/circuit/green,
/area/science/xenobiology)
"iQh" = (
/obj/structure/bodycontainer/morgue{
dir = 1
Expand Down Expand Up @@ -127049,6 +127037,19 @@
/obj/structure/lattice,
/turf/open/space,
/area/space)
"nWW" = (
/obj/machinery/status_display/evac{
pixel_x = 32
},
/obj/structure/table/reinforced,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/extinguisher,
/obj/item/extinguisher,
/turf/open/floor/circuit/green,
/area/science/xenobiology)
"olS" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -160341,9 +160342,9 @@ cMY
cMY
cTV
cVT
cXm
nWW
cZb
hFQ
iMT
dcu
ddV
cMY
Expand Down
63 changes: 37 additions & 26 deletions _maps/map_files/Yogsmeta/Yogsmeta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57241,18 +57241,6 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
"bXg" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/structure/table/glass,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bXh" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
Expand Down Expand Up @@ -57387,18 +57375,6 @@
},
/turf/open/floor/plating,
/area/maintenance/solars/port/aft)
"bXw" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/structure/table/glass,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"bXx" = (
/obj/machinery/shower{
dir = 8;
Expand Down Expand Up @@ -83416,6 +83392,29 @@
/obj/item/clothing/suit/apron/chef,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"gwI" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/structure/table/glass,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/obj/item/pet_carrier/xenobio,
/turf/open/floor/plasteel,
/area/science/xenobiology)
"gyC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 8
},
/turf/open/floor/plasteel,
/area/engine/break_room)
"gLo" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
Expand Down Expand Up @@ -83765,6 +83764,18 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/maintenance/starboard/secondary)
"kHv" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/computer/camera_advanced/xenobio{
dir = 2
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"kKf" = (
/obj/structure/window/reinforced,
/obj/structure/lattice,
Expand Down Expand Up @@ -118262,7 +118273,7 @@ aaa
aaf
cqs
cRS
bXg
kHv
bXO
cyk
bYo
Expand Down Expand Up @@ -118776,7 +118787,7 @@ aaa
aaf
cqs
cRS
bXw
gwI
bXP
cym
bYp
Expand Down