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.

Sign up for GitHub

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

Merge #1208

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Merge #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28593d6
Автоматическая компиляция чейнджлогов [ci skip]
SierraHelper Oct 27, 2023
14efbd2
Revert "Fix breaking arilock dirs"
SuhEugene Oct 27, 2023
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
5 changes: 5 additions & 0 deletions html/changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ <h3 class="author">Обновления SierraKomodo:</h3>
<div class="changes bgimages16">
<div class="log balance">Arterial bleeds no longer cause confusion or blurred vision when they trigger.</div>
</div>
<h3 class="author">Обновления SuhEugene:</h3>
<div class="changes bgimages16">
<div class="log bugfix">Пофиксил двойные шлюзы новой карты.</div>
<div class="log bugfix">Fixed airlock control terminal icon.</div>
</div>

<h2 class="date">23.10 - 2023</h2>
<h3 class="author">Обновления CuddleAndTea:</h3>
Expand Down
5 changes: 5 additions & 0 deletions html/changelogs/.all_changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22088,3 +22088,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY sierra_genchangelog.p
SierraKomodo:
- balance: Arterial bleeds no longer cause confusion or blurred vision when they
trigger.
SuhEugene:
- bugfix: "\u041F\u043E\u0444\u0438\u043A\u0441\u0438\u043B \u0434\u0432\u043E\u0439\
\u043D\u044B\u0435 \u0448\u043B\u044E\u0437\u044B \u043D\u043E\u0432\u043E\u0439\
\ \u043A\u0430\u0440\u0442\u044B."
- bugfix: Fixed airlock control terminal icon.
4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-sierra-pr-1183.yml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions html/changelogs/AutoChangeLog-sierra-pr-1185.yml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions maps/sierra/_references/map-refs.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
icon_state = "1-2"
},
/obj/machinery/door/airlock/multi_tile/glass/research{
dir = 8;
icon_state = "closed";
id_tag = "PetrovAccess";
name = "Petrov Access"
Expand Down
89 changes: 69 additions & 20 deletions maps/sierra/z1-z5_sierra.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3641,7 +3641,9 @@
/turf/simulated/floor/tiled,
/area/crew_quarters/docking)
"aBp" = (
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor,
/obj/floor_decal/techfloor,
/obj/structure/cable{
Expand Down Expand Up @@ -14036,7 +14038,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -17297,6 +17301,7 @@
name = "Infirmary Entry Shutters"
},
/obj/machinery/door/airlock/multi_tile/glass/medical{
dir = 8;
id_tag = "MedbayER";
name = "Treatment Center"
},
Expand Down Expand Up @@ -18830,7 +18835,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -21178,7 +21185,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -33926,7 +33935,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -39629,7 +39640,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/medical/virology/atmos)
"fZy" = (
Expand Down Expand Up @@ -40934,7 +40947,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
Expand Down Expand Up @@ -43273,7 +43288,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -59047,6 +59064,7 @@
/area/rnd/toxins)
"jdY" = (
/obj/machinery/door/airlock/multi_tile/research{
dir = 8;
frequency = 1379;
id_tag = "xenolow_airlock_inner";
locked = 1;
Expand Down Expand Up @@ -63047,7 +63065,9 @@
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
/area/hallway/primary/seconddeck/center)
Expand Down Expand Up @@ -79793,7 +79813,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -81413,7 +81435,9 @@
icon_state = "4-8"
},
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -84300,6 +84324,7 @@
/obj/machinery/door/firedoor,
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/research{
dir = 8;
frequency = null;
id_tag = null;
name = "Xenobiology Atmospherics"
Expand Down Expand Up @@ -84704,7 +84729,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/firedoor{
dir = 4
Expand Down Expand Up @@ -92729,7 +92756,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -94093,7 +94122,9 @@
/obj/machinery/door/firedoor{
dir = 4
},
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/maintenance/thirddeck/aftstarboard)
"ozF" = (
Expand Down Expand Up @@ -96372,6 +96403,7 @@
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8;
req_access = newlist()
},
/obj/machinery/door/firedoor{
Expand Down Expand Up @@ -96526,6 +96558,7 @@
},
/obj/machinery/door/airlock/multi_tile/glass/security{
id_tag = "security_entry_airlock_enter";
dir = 8;
name = "Security Entry"
},
/turf/simulated/floor/tiled/monotile,
Expand Down Expand Up @@ -106845,6 +106878,7 @@
},
/obj/machinery/door/airlock/multi_tile/glass/security{
id_tag = "security_entry_airlock_exit";
dir = 8;
name = "Security Exit"
},
/turf/simulated/floor/tiled/monotile,
Expand Down Expand Up @@ -112381,7 +112415,9 @@
/area/engineering/gravitaional_generator)
"rpl" = (
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/glass/maintenance,
/obj/machinery/door/airlock/multi_tile/glass/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -116475,7 +116511,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/glass/engineering,
/obj/machinery/door/airlock/multi_tile/glass/engineering{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -117029,7 +117067,9 @@
/area/maintenance/seconddeck/foreport)
"rZZ" = (
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/maintenance,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -124571,6 +124611,7 @@
dir = 4
},
/obj/machinery/door/airlock/multi_tile/medical{
dir = 8;
door_color = "#4c535b"
},
/turf/simulated/floor/tiled/dark/monotile,
Expand Down Expand Up @@ -131754,6 +131795,7 @@
"une" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/multi_tile/civilian{
dir = 8;
name = "Holodeck"
},
/obj/floor_decal/industrial/hatch/yellow,
Expand Down Expand Up @@ -132579,6 +132621,7 @@
dir = 4
},
/obj/machinery/door/airlock/multi_tile/glass/research{
dir = 8;
id_tag = "PetrovAccess";
name = "Petrov Access"
},
Expand Down Expand Up @@ -134675,6 +134718,7 @@
"uKy" = (
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8;
autoset_access = 0
},
/obj/machinery/door/firedoor{
Expand Down Expand Up @@ -142313,7 +142357,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/multi_tile/glass/engineering,
/obj/machinery/door/airlock/multi_tile/glass/engineering{
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
},
Expand Down Expand Up @@ -146174,7 +146220,8 @@
"wxd" = (
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/glass/engineering{
req_access = newlist()
req_access = newlist();
dir = 8
},
/obj/machinery/door/firedoor{
dir = 4
Expand Down Expand Up @@ -152117,6 +152164,7 @@
dir = 4
},
/obj/machinery/door/airlock/multi_tile/atmos{
dir = 8;
name = "Bridge Atmospherics Supply"
},
/turf/simulated/floor/tiled/techfloor/grid,
Expand Down Expand Up @@ -153633,7 +153681,8 @@
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/multi_tile/medical{
id_tag = "MedbayER2";
name = "Critical Wing"
name = "Critical Wing";
dir = 8
},
/turf/simulated/floor/tiled/dark/monotile,
/area/medical/sleeper)
Expand Down
4 changes: 3 additions & 1 deletion maps/sierra/z6_admin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12116,7 +12116,9 @@
},
/area/centcom/living)
"kTF" = (
/obj/machinery/door/airlock/multi_tile,
/obj/machinery/door/airlock/multi_tile{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
Expand Down