Skip to content

Commit

Permalink
Merge pull request #1021 from AshMoff/mofaf
Browse files Browse the repository at this point in the history
Фикс стыковки к айрон мейден
  • Loading branch information
molnizz authored Oct 3, 2024
2 parents dbbea44 + 1a4a8f3 commit d11fbb7
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 8 deletions.
3 changes: 2 additions & 1 deletion _maps/_mod_celadon/shuttles/elysium/elysium_iron_maiden.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,8 @@
/obj/docking_port/stationary{
dwidth = 15;
height = 15;
width = 30
width = 30;
dir = 8
},
/obj/effect/turf_decal/trimline/opaque/green/warning{
dir = 4
Expand Down
20 changes: 14 additions & 6 deletions _maps/_mod_celadon/shuttles/elysium/elysium_kondor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,9 @@
dir = 10
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/binary/pump/layer2,
/obj/machinery/atmospherics/components/binary/pump/layer2{
dir = 1
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/secure_closet/engineering_personal{
Expand All @@ -578,9 +580,6 @@
},
/obj/effect/turf_decal/corner/transparent/green/full,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/door/airlock{
name = "eva airlock"
},
/obj/machinery/door/airlock{
name = "eva airlock"
},
Expand Down Expand Up @@ -2056,6 +2055,15 @@
/obj/item/trash/syndi_cakes,
/turf/open/floor/plating/rust,
/area/ship/engineering/electrical)
"UB" = (
/obj/docking_port/stationary{
dwidth = 15;
height = 15;
width = 30;
dir = 8
},
/turf/template_noop,
/area/template_noop)
"UC" = (
/obj/effect/decal/cleanable/blood/drip,
/mob/living/simple_animal/hostile/cockroach,
Expand Down Expand Up @@ -2316,7 +2324,7 @@ iV
"}
(5,1,1) = {"
iV
iV
UB
iV
iV
Og
Expand All @@ -2332,7 +2340,7 @@ tC
aF
iV
iV
iV
UB
iV
"}
(6,1,1) = {"
Expand Down
44 changes: 43 additions & 1 deletion _maps/_mod_celadon/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2082,6 +2082,48 @@
/obj/machinery/newscaster/directional/south,
/turf/open/floor/carpet/red,
/area/ship/crew/office)
"rF" = (
/obj/structure/closet/wall/white/med{
name = "medical locker";
pixel_y = 29;
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
icon_state = "pipe11-4";
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
},
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/item/clothing/gloves/color/latex/nitrile/evil,
/obj/item/storage/belt/medical/surgery,
/obj/item/clothing/neck/stripedbluescarf,
/obj/item/clothing/neck/stripedredscarf,
/obj/item/wallframe/defib_mount,
/obj/item/clothing/glasses/hud/health/suns,
/obj/item/clothing/shoes/laceup/suns,
/obj/item/clothing/mask/surgical,
/obj/item/clothing/head/suns/surgery,
/obj/item/storage/backpack/duffelbag/med/surgery,
/obj/item/hypospray/mkii,
/obj/item/storage/firstaid/regular,
/obj/item/clothing/shoes/sneakers/suns,
/obj/item/clothing/gloves/color/latex/nitrile/suns,
/obj/item/clothing/suit/hooded/suns,
/obj/item/clothing/under/syndicate/suns/doctorscrubs,
/obj/item/clothing/under/syndicate/suns/sciencejumpsuit,
/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat,
/obj/item/flashlight/pen,
/obj/item/clothing/mask/surgical/suns,
/obj/item/holosign_creator/medical,
/obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat,
/obj/item/defibrillator/loaded,
/obj/item/flashlight/pen,
/turf/open/floor/plasteel/dark,
/area/ship/medical)
"rO" = (
/obj/structure/sink{
dir = 8;
Expand Down Expand Up @@ -6339,7 +6381,7 @@ MU
hM
To
Bh
JI
rF
Dn
UP
IA
Expand Down

0 comments on commit d11fbb7

Please sign in to comment.