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

RnD remap | Deltastation #1442

Merged
merged 30 commits into from
Aug 30, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b4dbaf8
Deltastation RnD remap 23.08.24
Hearstrings Aug 23, 2024
9fdb912
Fix 23.08 16.07
Hearstrings Aug 23, 2024
d989c67
Merge branch 'Delta-RnD-Med' of https://github.com/Hearstrings/Paradi…
Hearstrings Aug 23, 2024
7d9e6d1
Delta WIP 18,01
Hearstrings Aug 23, 2024
a6e80e6
Fix linter
m-dzianishchyts Aug 23, 2024
6f2b8ce
Merge remote-tracking branch 'origin/master' into Delta-RnD-Med
m-dzianishchyts Aug 23, 2024
60fb898
wtf
m-dzianishchyts Aug 23, 2024
f5a686c
Merge branch 'Delta-RnD-Med' of https://github.com/Hearstrings/Paradi…
Hearstrings Aug 23, 2024
a2468f9
Fix 18.54
Hearstrings Aug 23, 2024
094f525
Fix 18.57
Hearstrings Aug 23, 2024
53e0521
Fix 19.05
Hearstrings Aug 23, 2024
3e84846
Fix 19.11
Hearstrings Aug 23, 2024
dd55dcf
Работа по ревью 19,44
Hearstrings Aug 23, 2024
38cd564
Дополнение к работе по ревью 20,22
Hearstrings Aug 23, 2024
2095669
Fix 20,40
Hearstrings Aug 23, 2024
26c86cb
Работа по ревью 12,21
Hearstrings Aug 27, 2024
e972da1
Дополнение по ревью 12,43
Hearstrings Aug 27, 2024
37773ff
fix 13.00
Hearstrings Aug 27, 2024
0801581
Fix some minor mapping issues
dj-34 Aug 28, 2024
89db3f2
fix 28.08.24 6.45
Hearstrings Aug 28, 2024
63b7241
fix 6.47
Hearstrings Aug 28, 2024
63f721f
fix 6.50
Hearstrings Aug 28, 2024
32d1853
Fix 11.25
Hearstrings Aug 28, 2024
35fc15e
Merge branch 'ss220club:master' into Delta-RnD-Med
Hearstrings Aug 28, 2024
43b27b3
Merge branch 'master' into Delta-RnD-Med
Hearstrings Aug 28, 2024
166a351
Merge remote-tracking branch 'origin/master' into Delta-RnD-Med
m-dzianishchyts Aug 29, 2024
66b31a9
Merge branch 'master' into Delta-RnD-Med
Hearstrings Aug 30, 2024
c96c5c0
Работа по ревью 30,08 11,44
Hearstrings Aug 30, 2024
76e072a
Дополнение к работе по ревью 12,02
Hearstrings Aug 30, 2024
2cf093a
Fix 12.27
Hearstrings Aug 30, 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
9 changes: 6 additions & 3 deletions _maps/map_files220/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -34479,7 +34479,7 @@
/area/station/security/permabrig)
"cIG" = (
/obj/structure/cable,
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
/area/station/science/server/coldroom)
"cIH" = (
Expand Down Expand Up @@ -43492,6 +43492,7 @@
},
/area/station/command/office/rd)
"dwk" = (
/obj/structure/fans/tiny,
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
/turf/simulated/floor/plasteel/dark,
/area/station/science/server)
"dwl" = (
Expand Down Expand Up @@ -85140,7 +85141,9 @@
d2 = 4;
icon_state = "2-4"
},
/obj/machinery/door/airlock/command/glass,
/obj/machinery/door/airlock/command/glass{
superconductivity = 0
},
/turf/simulated/floor/engine,
/area/station/science/server/coldroom)
"oKN" = (
Expand Down Expand Up @@ -97303,7 +97306,7 @@
d2 = 2;
icon_state = "0-2"
},
/obj/effect/spawner/window/reinforced/grilled,
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
/area/station/science/server/coldroom)
"sqb" = (
Expand Down
Loading