Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics (#11543)
* Maps Bumbles in for once * Hopefully fixes merge conflicts?
This commit is contained in:
@@ -55502,6 +55502,11 @@
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/gravity_generator)
|
||||
"iLJ" = (
|
||||
/obj/item/reagent_containers/glass/bucket,
|
||||
/mob/living/simple_animal/pet/bumbles,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"iMv" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 9
|
||||
@@ -102179,7 +102184,7 @@ aSU
|
||||
aXo
|
||||
aXo
|
||||
aXo
|
||||
aYO
|
||||
iLJ
|
||||
bap
|
||||
ikm
|
||||
aYV
|
||||
|
||||
@@ -126360,6 +126360,20 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/science/mixing)
|
||||
"jwo" = (
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
/mob/living/simple_animal/pet/bumbles,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"jBE" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
@@ -160698,7 +160712,7 @@ bjt
|
||||
bli
|
||||
bnk
|
||||
boB
|
||||
bnj
|
||||
jwo
|
||||
bnj
|
||||
bnh
|
||||
bvB
|
||||
|
||||
@@ -43877,18 +43877,6 @@
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/central)
|
||||
"bqG" = (
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"bqH" = (
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 4
|
||||
@@ -88230,6 +88218,19 @@
|
||||
"whw" = (
|
||||
/turf/closed/wall/rust,
|
||||
/area/medical/surgery)
|
||||
"whZ" = (
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 1
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 1
|
||||
},
|
||||
/mob/living/simple_animal/pet/bumbles,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"wmX" = (
|
||||
/turf/closed/wall/rust,
|
||||
/area/quartermaster/qm)
|
||||
@@ -122392,7 +122393,7 @@ aZd
|
||||
bqh
|
||||
bnJ
|
||||
bpl
|
||||
bqG
|
||||
whZ
|
||||
bsL
|
||||
buw
|
||||
bwH
|
||||
|
||||
@@ -82724,6 +82724,14 @@
|
||||
/obj/structure/grille,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/space/nearstation)
|
||||
"soe" = (
|
||||
/obj/effect/turf_decal/tile/green,
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 4
|
||||
},
|
||||
/mob/living/simple_animal/pet/bumbles,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"soh" = (
|
||||
/obj/structure/cable/yellow{
|
||||
icon_state = "4-8"
|
||||
@@ -117831,7 +117839,7 @@ bSV
|
||||
bUk
|
||||
bVv
|
||||
bWQ
|
||||
bWQ
|
||||
soe
|
||||
bWQ
|
||||
caL
|
||||
ccv
|
||||
|
||||
@@ -22504,14 +22504,6 @@
|
||||
/obj/effect/turf_decal/tile/green,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"bbe" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/effect/turf_decal/tile/green,
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"bbg" = (
|
||||
/obj/effect/landmark/start/cook,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on,
|
||||
@@ -59851,6 +59843,15 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/xenobiology)
|
||||
"ttS" = (
|
||||
/obj/structure/chair/stool,
|
||||
/obj/effect/turf_decal/tile/green,
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 8
|
||||
},
|
||||
/mob/living/simple_animal/pet/bumbles,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hydroponics)
|
||||
"tue" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-4"
|
||||
@@ -90071,7 +90072,7 @@ aRN
|
||||
aXZ
|
||||
aYQ
|
||||
aXS
|
||||
bbe
|
||||
ttS
|
||||
bcd
|
||||
bdo
|
||||
ben
|
||||
|
||||
Reference in New Issue
Block a user