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

[MAP] Добавляем пет-вендинг #463

Merged
merged 1 commit into from
Oct 17, 2023
Merged
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
48 changes: 43 additions & 5 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7677,6 +7677,23 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/table,
/obj/item/clothing/accessory/medal{
name = "медаль хорошему мальчику";
desc = "Тот кто её носит - определенно заслужил её!"
},
/obj/item/petcollar{
pixel_y = 7;
pixel_x = 6
},
/obj/item/petcollar{
pixel_y = 3
},
/obj/item/petcollar{
pixel_y = -2;
pixel_x = -6
},
/obj/effect/decal/warning_stripes/blue/hollow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -11258,6 +11275,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/decal/warning_stripes/blue/partial{
dir = 8
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -11297,13 +11317,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/decal/warning_stripes/blue/hollow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluered"
},
/area/station/public/dorms)
"aQA" = (
/obj/machinery/economy/vending/snack,
/obj/structure/disposalpipe/segment{
dir = 4
},
Expand All @@ -11318,6 +11338,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/economy/vending/crittercare,
/obj/effect/decal/warning_stripes/blue,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluered"
Expand Down Expand Up @@ -12936,7 +12958,8 @@
/area/station/medical/reception)
"aWJ" = (
/mob/living/simple_animal/walrus{
name = "Джеди"
name = "Порфирий Корнеевич";
desc = "Обожает плескаться в холодной воде и всем рекомендует."
},
/turf/simulated/floor/beach/water{
icon_state = "seadeep"
Expand Down Expand Up @@ -59602,6 +59625,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
/obj/effect/decal/warning_stripes/blue/partial{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluered"
Expand Down Expand Up @@ -74086,6 +74112,10 @@
/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"oqZ" = (
/obj/effect/decal/warning_stripes/blue/partial,
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
"orf" = (
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 4
Expand Down Expand Up @@ -91126,6 +91156,12 @@
},
/turf/simulated/floor/plating,
/area/station/science/toxins/mixing)
"uAT" = (
/obj/effect/decal/warning_stripes/blue/partial,
/turf/simulated/floor/plasteel{
icon_state = "arrival"
},
/area/station/public/dorms)
"uAU" = (
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -94748,6 +94784,8 @@
/obj/item/reagent_containers/glass/bucket,
/obj/item/fish_eggs/salmon,
/obj/item/fish_eggs/salmon,
/obj/item/fish_eggs/shrimp,
/obj/item/fish_eggs/shrimp,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -135705,7 +135743,7 @@ aKK
aOb
aFI
aDv
aSJ
uAT
aUI
aWJ
aWK
Expand Down Expand Up @@ -135962,7 +136000,7 @@ aGN
aGN
aPf
aQA
aSJ
uAT
aUK
aWM
aWM
Expand Down Expand Up @@ -136219,7 +136257,7 @@ qfL
gLe
aPf
aQz
aPm
oqZ
aUJ
aWL
aZz
Expand Down
60 changes: 52 additions & 8 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -37177,6 +37177,7 @@
"cOs" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
/obj/effect/decal/warning_stripes/blue/hollow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -37568,6 +37569,7 @@
srange = 7
},
/obj/structure/closet/athletic_mixed,
/obj/effect/decal/warning_stripes/blue/partial,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -53743,8 +53745,23 @@
},
/area/station/hallway/secondary/exit)
"fRm" = (
/obj/machinery/economy/vending/cola,
/obj/effect/decal/warning_stripes/yellow,
/obj/structure/table,
/obj/item/clothing/accessory/medal{
name = "медаль хорошему мальчику";
desc = "Тот кто её носит - определенно заслужил её!"
},
/obj/item/petcollar{
pixel_y = 7;
pixel_x = 6
},
/obj/item/petcollar{
pixel_y = 3
},
/obj/item/petcollar{
pixel_y = -2;
pixel_x = -6
},
/obj/effect/decal/warning_stripes/blue/hollow,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -54690,8 +54707,8 @@
},
/area/station/science/explab)
"gkj" = (
/obj/machinery/economy/vending/snack,
/obj/effect/decal/warning_stripes/yellow,
/obj/machinery/economy/vending/crittercare,
/obj/effect/decal/warning_stripes/blue,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -58264,6 +58281,13 @@
icon_state = "neutralfull"
},
/area/station/security/checkpoint/south)
"hEU" = (
/obj/machinery/economy/vending/cola,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
},
/area/station/public/fitness)
"hFh" = (
/obj/effect/spawner/window/reinforced/grilled,
/obj/structure/cable{
Expand Down Expand Up @@ -62089,6 +62113,9 @@
/area/station/service/barber)
"jbW" = (
/obj/item/radio/intercom/directional/west,
/obj/effect/decal/warning_stripes/blue/partial{
dir = 1
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -67766,6 +67793,22 @@
icon_state = "whitepurple"
},
/area/station/science/break_room)
"lkf" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/decal/warning_stripes/blue/partial{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/public/fitness)
"lkh" = (
/obj/structure/filingcabinet/chestdrawer/autopsy,
/obj/machinery/status_display/directional/west,
Expand Down Expand Up @@ -72047,6 +72090,7 @@
/area/station/maintenance/starboard2)
"mYH" = (
/obj/machinery/newscaster/directional/west,
/obj/effect/decal/warning_stripes/yellow,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
Expand Down Expand Up @@ -155566,7 +155610,7 @@ iVg
xql
cAt
cBZ
ctx
hEU
mYH
fLx
cGX
Expand Down Expand Up @@ -155829,9 +155873,9 @@ olj
cIs
qfX
olj
olj
olj
olj
lkf
lkf
lkf
olj
stG
qfX
Expand Down
Loading