Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
24ab8d7
ballin
AMyriad Jul 24, 2024
6904f52
ballin
AMyriad Jul 24, 2024
86d806e
ballin
AMyriad Jul 26, 2024
423d30b
ballin
AMyriad Jul 26, 2024
0ea41b7
ballin
AMyriad Jul 27, 2024
15fe2ee
ballin
AMyriad Jul 27, 2024
ff3fe63
ballin
AMyriad Jul 27, 2024
f697a5c
ballin
AMyriad Jul 27, 2024
c053884
ballin
AMyriad Jul 27, 2024
60affeb
ballin
AMyriad Jul 27, 2024
ed6ca7f
ballin
AMyriad Jul 27, 2024
f608295
ballin
AMyriad Jul 27, 2024
87d6db0
ballin
AMyriad Jul 27, 2024
6ebd0db
ballin
AMyriad Jul 27, 2024
c3284f0
ballin
AMyriad Jul 27, 2024
55ca6aa
Merge remote-tracking branch 'upstream/master' into access-overhaul
AMyriad Jul 27, 2024
c713448
Merge remote-tracking branch 'upstream/master' into access-overhaul
AMyriad Jul 28, 2024
fa7eb65
ballin
AMyriad Jul 28, 2024
f57593e
ballin
AMyriad Jul 28, 2024
9fda4ff
ballin
AMyriad Jul 28, 2024
3865e8a
ballin
AMyriad Jul 28, 2024
ac065de
ballin
AMyriad Jul 29, 2024
0f0f5ec
ballin
AMyriad Jul 29, 2024
7263ae6
ballin
AMyriad Jul 29, 2024
540164e
Merge remote-tracking branch 'upstream/master' into access-overhaul
AMyriad Jul 29, 2024
f58f55f
ballin
AMyriad Jul 29, 2024
81a3843
ballin
AMyriad Jul 29, 2024
37df2da
ballin
AMyriad Jul 29, 2024
c91ea2f
ballin
AMyriad Jul 29, 2024
97c9676
ballin
AMyriad Jul 29, 2024
7441a3d
ballin
AMyriad Jul 29, 2024
631b8f6
ballin
AMyriad Jul 30, 2024
0518e80
ballin
AMyriad Jul 30, 2024
f603777
ballin
AMyriad Jul 30, 2024
95b920b
Merge remote-tracking branch 'upstream/master' into access-overhaul
AMyriad Jul 30, 2024
f880e52
ballin
AMyriad Jul 30, 2024
4bbc282
ballin
AMyriad Jul 30, 2024
eebca9f
ballin
AMyriad Jul 30, 2024
303145f
ballin
AMyriad Jul 30, 2024
f6bdb5a
ballin
AMyriad Jul 30, 2024
c34f878
ballin
AMyriad Jul 30, 2024
34f9862
Merge branch 'yogstation13:master' into access-overhaul
AMyriad Jul 31, 2024
a3fca8f
Merge remote-tracking branch 'upstream/master' into access-overhaul
AMyriad Jul 31, 2024
c34db11
Merge branch 'access-overhaul' of https://github.com/AMyriad/YogsFork…
AMyriad Jul 31, 2024
429d847
ballin
AMyriad Jul 31, 2024
9b89371
ballin
AMyriad Jul 31, 2024
a470a6e
ballin
AMyriad Jul 31, 2024
5abcd5e
ballin
AMyriad Jul 31, 2024
64d86a6
ballin
AMyriad Aug 1, 2024
3344cf3
ballin
AMyriad Aug 1, 2024
6b9a46d
Merge remote-tracking branch 'upstream/master' into access-overhaul
AMyriad Aug 6, 2024
fd788d7
ballin
AMyriad Aug 6, 2024
11621ff
ballin
AMyriad Aug 7, 2024
9ab0d2f
ballin
AMyriad Aug 7, 2024
7baf52b
ballin
AMyriad Aug 7, 2024
514ea5d
ballin
AMyriad Aug 7, 2024
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: 25 additions & 22 deletions _maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@
/area/ruin/powered/inn)
"bi" = (
/obj/machinery/door/airlock/grunge{
name = "Backroom";
req_access_txt = "25"
name = "Backroom"
},
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/structure/disposalpipe/segment,
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/plasteel,
/area/ruin/powered/inn)
"bx" = (
Expand Down Expand Up @@ -223,7 +223,8 @@
id = "inndoor";
name = "Inn Front door Shutter";
pixel_x = 6;
pixel_y = -24
pixel_y = -24;
req_access = list("bar")
},
/turf/open/floor/wood/broken/two,
/area/ruin/powered/inn)
Expand Down Expand Up @@ -292,16 +293,15 @@
/turf/open/floor/wood,
/area/ruin/powered/inn)
"ka" = (
/obj/machinery/door/airlock/external{
req_access_txt = "25"
},
/obj/machinery/door/airlock/external,
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/plasteel,
/area/ruin/powered/inn)
"kf" = (
Expand Down Expand Up @@ -374,13 +374,12 @@
/turf/open/floor/wood/broken/five,
/area/ruin/powered/inn)
"mW" = (
/obj/machinery/door/window/southright{
req_access_txt = "25"
},
/obj/machinery/door/window/southright,
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/door/firedoor/border_only,
/obj/effect/mapping_helpers/windoor/access/all/service/bar,
/turf/open/floor/wood,
/area/ruin/powered/inn)
"nd" = (
Expand Down Expand Up @@ -476,15 +475,14 @@
/turf/open/floor/wood,
/area/ruin/powered/inn)
"qm" = (
/obj/machinery/door/airlock/wood/glass{
req_access_txt = "25"
},
/obj/machinery/door/airlock/wood/glass,
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/plasteel/cafeteria,
/area/ruin/powered/inn)
"qq" = (
Expand All @@ -499,7 +497,7 @@
/area/ruin/powered/inn)
"qT" = (
/obj/structure/closet/secure_closet/personal/cabinet{
req_access = list(25)
req_access = list("bar")
},
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/tank/internals/emergency_oxygen,
Expand Down Expand Up @@ -782,7 +780,7 @@
/obj/item/bedsheet/adjusted/brown,
/obj/structure/bed,
/obj/effect/mob_spawn/human/innkeeper{
dir = 8
dir = 4
},
/turf/open/floor/carpet/red,
/area/ruin/powered/inn)
Expand Down Expand Up @@ -861,7 +859,9 @@
/turf/open/floor/plasteel/white,
/area/ruin/powered/inn)
"Lb" = (
/obj/structure/closet/secure_closet/freezer/meat,
/obj/structure/closet/secure_closet/freezer/meat{
req_access = list("bar")
},
/turf/open/floor/plasteel/cafeteria,
/area/ruin/powered/inn)
"Ld" = (
Expand All @@ -879,19 +879,21 @@
/area/ruin/powered/inn/shed)
"LE" = (
/obj/machinery/door/airlock/wood{
name = "Personal Quarters";
req_access_txt = "25"
name = "Personal Quarters"
},
/obj/machinery/door/firedoor/border_only{
dir = 4
},
/obj/machinery/door/firedoor/border_only{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/carpet/red,
/area/ruin/powered/inn)
"LU" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
/obj/structure/closet/secure_closet/freezer/kitchen{
req_access = list("bar")
},
/obj/machinery/light{
dir = 8
},
Expand Down Expand Up @@ -1090,9 +1092,7 @@
/turf/open/floor/plating,
/area/icemoon/underground/explored)
"Xs" = (
/obj/machinery/door/airlock/wood{
req_access_txt = "25"
},
/obj/machinery/door/airlock/wood,
/obj/machinery/door/firedoor/border_only{
dir = 4
},
Expand All @@ -1102,6 +1102,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/effect/mapping_helpers/airlock/access/all/service/bar,
/turf/open/floor/wood,
/area/ruin/powered/inn)
"XK" = (
Expand Down Expand Up @@ -1129,7 +1130,9 @@
/turf/open/floor/wood,
/area/ruin/powered/inn)
"YJ" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/structure/closet/secure_closet/freezer/fridge{
req_access = list("bar")
},
/turf/open/floor/plasteel/cafeteria,
/area/ruin/powered/inn)
"YV" = (
Expand Down
Loading