Skip to content

Commit

Permalink
A sure(ly) atmos (BlueMoon-Labs#896)
Browse files Browse the repository at this point in the history
* Атмос на лямбде

Добавить несколько адаптеров труб к трубам в атмосе на лямбде... два часа ночи...

* да

* Шиш.

* Convert maps to TGM

60a24ae: _maps/map_files/LambdaStation/lambda.dmm

Automatically commited by: tools\mapmerge2\fixup.py

---------

Co-authored-by: Марк <[email protected]>
  • Loading branch information
AlexaShaSur and SmiLeYre authored Apr 8, 2024
1 parent 9127109 commit 68f5e12
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
39 changes: 22 additions & 17 deletions _maps/map_files/LambdaStation/lambda.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -50309,13 +50309,6 @@
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
"ckK" = (
/obj/structure/window/reinforced/spawner/north,
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 8
},
/turf/open/floor/plating/airless,
/area/engineering/atmos)
"ckL" = (
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -61783,9 +61776,7 @@
/area/engineering/storage/tech)
"cTG" = (
/obj/structure/window/reinforced/spawner/north,
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 9
},
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating/airless,
/area/engineering/atmos)
"cTH" = (
Expand Down Expand Up @@ -69404,6 +69395,13 @@
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
"oyA" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 9
},
/obj/structure/grille,
/turf/closed/wall/r_wall,
/area/engineering/atmos)
"oBc" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/green/visible,
Expand Down Expand Up @@ -72212,6 +72210,13 @@
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"uox" = (
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
dir = 8
},
/obj/structure/grille,
/turf/closed/wall/r_wall,
/area/engineering/atmos)
"uoQ" = (
/obj/structure/closet/firecloset,
/obj/effect/turf_decal/tile/neutral,
Expand Down Expand Up @@ -73888,7 +73893,7 @@
/area/maintenance/aft)
"xrA" = (
/obj/structure/window/reinforced/spawner,
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
/obj/machinery/atmospherics/pipe/layer_manifold,
/turf/open/floor/plating/airless,
/area/engineering/atmos)
"xtx" = (
Expand Down Expand Up @@ -125401,8 +125406,8 @@ chB
cji
cjk
cjZ
ckK
cUj
cmv
uox
pbg
cnf
cpT
Expand Down Expand Up @@ -125659,7 +125664,7 @@ ciq
eVS
clt
cTG
cTH
oyA
cTH
cTH
cTH
Expand Down Expand Up @@ -126429,8 +126434,8 @@ chB
cjh
cjp
ckc
ckK
cUj
cmv
uox
iXq
eQt
csx
Expand Down Expand Up @@ -126687,7 +126692,7 @@ ciq
twF
rxJ
cTG
cTH
oyA
cTH
cTH
cTH
Expand Down
4 changes: 2 additions & 2 deletions modular_bluemoon/fluffs/code/donator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/admcloak
name = "syndicate admiral's cloak"
name = "Syndicate Admiral's Cloak"
slot = ITEM_SLOT_NECK
path = /obj/item/clothing/neck/cloak/syndieadm
ckeywhitelist = list("architect0r", "fanlexa")
Expand All @@ -216,7 +216,7 @@
name = "FTU Cape"
slot = ITEM_SLOT_NECK
path = /obj/item/clothing/neck/cloak/ftu
ckeywhitelist = list("fanlexa")
ckeywhitelist = list("fanlexa", "kosep")
subcategory = LOADOUT_SUBCATEGORIES_DON02

/datum/gear/donator/bm/angelo
Expand Down

0 comments on commit 68f5e12

Please sign in to comment.