Skip to content

Commit

Permalink
Merge Upstream 18.10.2024 (#1600)
Browse files Browse the repository at this point in the history
Мерге апстрима без конфликтов

![image](https://github.com/user-attachments/assets/ca3f533f-c0e6-44ee-8f4c-1beb5aa4ab4e)

## Changelog

:cl:
add: Двери шкафчиков теперь анимированные.
imageadd: Возвращён спрайт пролитого топлива.
imageadd: Возвращён спрайт шлема хардсьюта RED ЕРТ.
imageadd: Добавлен спрайт смерти blood-drunk miner'а.
imageadd: Респрайт более половины имплантов.
fix: Шахтёрские шелтеры вернули свои таблички на стенах.
fix: Светящиеся глаза больше не светятся поверх закрывающих глаза вещей.
fix: Языки снова имеют свой цвет в чате.
/:cl:
  • Loading branch information
dj-34 authored Oct 19, 2024
2 parents 80cc92c + ad1b726 commit dcbad14
Show file tree
Hide file tree
Showing 128 changed files with 609 additions and 589 deletions.
21 changes: 5 additions & 16 deletions _maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1658,14 +1658,6 @@
},
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/chamber)
"zM" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'SERVER ROOM'.";
name = "SERVER ROOM";
pixel_y = 0
},
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/chamber)
"zY" = (
/obj/structure/bed,
/obj/item/bedsheet/green,
Expand Down Expand Up @@ -3011,9 +3003,6 @@
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"To" = (
/turf/simulated/wall/r_wall,
/area/ruin/space/telecomms/chamber)
"Tw" = (
/obj/machinery/computer/telescience{
dir = 4
Expand Down Expand Up @@ -7958,7 +7947,7 @@ ux
Ad
tF
iy
To
Zu
mZ
FA
EM
Expand Down Expand Up @@ -8050,7 +8039,7 @@ ux
ux
ux
ux
To
Zu
ME
Zj
EM
Expand Down Expand Up @@ -8142,9 +8131,9 @@ pE
sv
ia
kl
To
To
zM
Zu
Zu
FA
EM
il
dn
Expand Down
4 changes: 0 additions & 4 deletions _maps/map_files/generic/Lavaland.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9158,10 +9158,6 @@
name = "south bump";
pixel_y = -30
},
/obj/structure/extinguisher_cabinet{
name = "south bump";
pixel_y = -30
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/mining)
"Sd" = (
Expand Down
Loading

0 comments on commit dcbad14

Please sign in to comment.