Skip to content

Commit

Permalink
Merge Upstream 26.12.2024 (#1714)
Browse files Browse the repository at this point in the history
This pull request merges upstream/master. Resolve possible conflicts
manually and make sure all the changes are applied correctly.

> [!NOTE]
> Requires Wiki Update:
> www.github.com/ParadiseSS13/Paradise/pull/27384
> www.github.com/ParadiseSS13/Paradise/pull/27595

## Changelog
:cl: ParadiseSS13
add: Добавлен трейт UNKNOWN - трейт, который скрывает имя персонажа,
информацию в sechud, голос, а также предотвращает возможность его
изучения (examine). <!-- Adds TRAIT_UNKNOWN. A trait that will hide
someones name, sechud, voice, and prevent them from being examined.
(www.github.com/ParadiseSS13/Paradise/pull/27471) -->
fix: Предметы больше не будут воспламеняться при их перемещении между
руками, помещении в сумки/коробки/ремни и извлечении из них над лавой.
<!-- Items will no longer catch on fire when swapping them between
hands, or inserting into or removing them from bags/boxes/belts etc.
over lava. (www.github.com/ParadiseSS13/Paradise/pull/27694) -->
fix: Предметы больше не будут падать в пропасть при их перемещении между
руками, помещении в сумки/коробки/ремни и извлечении из них над
пропастью. <!-- Items will no longer fall into chasms when swapping them
between hands, or inserting into or removing them from bags/boxes/belts
etc. over chasms. (www.github.com/ParadiseSS13/Paradise/pull/27694) -->
tweak: Изменение размера области экрана в настройках теперь
автоматически обновляет его размер. <!-- Changing your viewport size in
preferences now automatically updates your viewport size.
(www.github.com/ParadiseSS13/Paradise/pull/27707) -->
fix: Окно настроек теперь немного больше. <!-- The preferences window is
slightly larger. (www.github.com/ParadiseSS13/Paradise/pull/27708) -->
add: Добавлена футболка Great Wave — доступна в выборе нижнего белья в
редакторе персонажа. <!-- Added the Great Wave undershirt - available in
the underwear selection in character creator.
(www.github.com/ParadiseSS13/Paradise/pull/27675) -->
tweak: Кошельки теперь могут хранить конфетные деньги и шоколадные
монеты. <!-- Tweaked wallet to hold candy cash and chocolate coins
(www.github.com/ParadiseSS13/Paradise/pull/27574) -->
fix: Турели на руинах мясокомбината больше не сбрасывают энергетические
пушки при разборке. <!-- Turrets on meatpackers ruin no more drop energy
guns on deconstruction.
(www.github.com/ParadiseSS13/Paradise/pull/27422) -->
add: Добавлены новые плюшевые игрушки для всех видов. <!-- New plushies
for all species (www.github.com/ParadiseSS13/Paradise/pull/27384) -->
add: Добавлено новое заклинание, превращающее людей в плюшевые игрушки.
<!-- New spell that turns people into plushies
(www.github.com/ParadiseSS13/Paradise/pull/27384) -->
add: Добавлены новые плюшевые игрушки в лодаут. <!-- Adds new plushies
to loadout (www.github.com/ParadiseSS13/Paradise/pull/27384) -->
fix: Звук «пух» больше не использует pick-wight при попадании. <!-- Poof
sound not using pick-wight on hit
(www.github.com/ParadiseSS13/Paradise/pull/27384) -->
tweak: Плюшевые игрушки всегда уничтожаются, если внутри них взрывается
граната, включая светошумовые гранаты, химические гранаты и т.д. <!--
Plushies are always destroyed when a grenade goes off inside it-
including flashbangs, chem grenades, ect
(www.github.com/ParadiseSS13/Paradise/pull/27384) -->
tweak: Плюшевые игрушки воксов и ниан теперь активируют гранаты внутри
себя, даже если произносится их «кодовое слово для обнимашек». <!-- Vox
& Nian plushies will now activate any grenades in them even if they're
saying their 'hug word'
(www.github.com/ParadiseSS13/Paradise/pull/27384) -->
fix: Карты и ремни больше нельзя надевать при активном импланте
антидроп. <!-- Now can't equip cards and belts throw active anti drop
implant (www.github.com/ParadiseSS13/Paradise/pull/27713) -->
fix: Попугаи больше не левитируют, пока сидят. <!-- Parrots no longer
levitate while sitting.
(www.github.com/ParadiseSS13/Paradise/pull/27452) -->
fix: Попугаи теперь могут класть вещи на компьютеры и забирать их. <!--
Parrots can place things on computers and take them from.
(www.github.com/ParadiseSS13/Paradise/pull/27452) -->
tweak: Попугаи могут покидать своё любимое место и находить новое спустя
время. <!-- Parrots can leave their favorite place and find a new one at
some point. (www.github.com/ParadiseSS13/Paradise/pull/27452) -->
fix: Обновлён спрайт голозначка на бронежилете, чтобы он соответствовал
иконке. <!-- Updated the holobadge on armour vest sprite to match the
icon. (www.github.com/ParadiseSS13/Paradise/pull/27677) -->
fix: Простые торты теперь называются «простые торты», а не «ванильные
торты» (так как уже существуют ванильные торты, это изменение убирает
дублирование). <!-- Plain cakes are now called plain cakes instead of
vanilla cakes (as we also have vanilla cakes, this removes a
duplication). (www.github.com/ParadiseSS13/Paradise/pull/27686) -->
fix: Если вы теряете необходимость дышать, то соответствующий индикатор
на экране больше не будет «зависать». <!-- If you loose the need to
breath with a breathing related alert on screen, it will no longer be
stuck there (www.github.com/ParadiseSS13/Paradise/pull/27731) -->
fix: КПБ больше не паникуют, думая, что им нужно дышать, хотя они этого
не могут делать. <!-- IPCs no longer panic thinking they need to breath,
when they cant. (www.github.com/ParadiseSS13/Paradise/pull/27737) -->
tweak: Трейт станции Рейв теперь распространяется на каторгу и аванпост.
<!-- The motivational mood lighting station trait now extends to labor
camp and mining station.
(www.github.com/ParadiseSS13/Paradise/pull/27695) -->
imageadd: Обновлены спрайты квантумпадов и каргопадов. <!-- Resprited
quantum pads and cargo pads
(www.github.com/ParadiseSS13/Paradise/pull/27595) -->
tweak: Квантумпады больше не создают искры. <!-- Quantum pads no longer
make sparks (www.github.com/ParadiseSS13/Paradise/pull/27595) -->
tweak: Формулировка закона «Pranksimov» изменена с «если это будет
смешно» на «если это будет смешно для экипажа». <!-- Pranksimov's ending
clause has been tweaked from "unless doing so would be funny." to
"unless doing so would be funny to the crew."
(www.github.com/ParadiseSS13/Paradise/pull/27634) -->
/:cl:
  • Loading branch information
dj-34 authored Dec 26, 2024
2 parents ee660cd + df6ac92 commit 7a4f324
Show file tree
Hide file tree
Showing 358 changed files with 4,176 additions and 2,266 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
rustup target add i686-pc-windows-gnu
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install zlib1g-dev:i386 lib32gcc-11-dev mingw-w64 mingw-w64-i686-dev
sudo apt-get install zlib1g-dev:i386 lib32gcc-13-dev mingw-w64 mingw-w64-i686-dev
# Build it.
cargo build --release --target i686-unknown-linux-gnu
Expand Down
20 changes: 3 additions & 17 deletions _maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@
/turf/simulated/floor/engine,
/area/ruin/unpowered/bmp_ship/delta)
"af" = (
/obj/machinery/porta_turret{
installation = /obj/item/gun/energy/gun;
lethal = 1;
name = "ship defense turret"
},
/obj/machinery/porta_turret/meatpacker_ship,
/turf/simulated/floor/engine,
/area/ruin/unpowered/bmp_ship/delta)
"ag" = (
Expand Down Expand Up @@ -1827,12 +1823,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/unpowered/bmp_ship/aft)
"go" = (
/obj/machinery/porta_turret{
check_synth = 1;
installation = /obj/item/gun/energy/gun;
lethal = 1;
name = "ship defense turret"
},
/obj/machinery/porta_turret/meatpacker_ship,
/turf/simulated/floor/engine,
/area/ruin/unpowered/bmp_ship/fore)
"gp" = (
Expand Down Expand Up @@ -2118,12 +2109,7 @@
/turf/simulated/floor/engine,
/area/ruin/unpowered/bmp_ship/aft)
"hp" = (
/obj/machinery/porta_turret{
check_synth = 1;
installation = /obj/item/gun/energy/gun;
lethal = 1;
name = "ship defense turret"
},
/obj/machinery/porta_turret/meatpacker_ship,
/turf/simulated/floor/engine,
/area/ruin/unpowered/bmp_ship/aft)
"hq" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
/area/ruin/space/powered/bar)
"bn" = (
/obj/effect/mapping_helpers/turfs/damage,
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plating,
/area/ruin/space/powered/bar)
"bo" = (
Expand Down Expand Up @@ -484,7 +484,7 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/space/nearstation)
"pb" = (
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/obj/machinery/door_control{
id = "SpaceBar";
name = "Public Shutters";
Expand Down Expand Up @@ -895,7 +895,7 @@
/area/ruin/space/powered)
"QU" = (
/obj/effect/mapping_helpers/turfs/damage,
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -949,7 +949,7 @@
},
/area/ruin/space/powered/bar)
"VR" = (
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plating,
/area/ruin/space/powered/bar)
"VU" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3173,7 +3173,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"iq" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/template_noop,
/area/space/nearstation)
"ir" = (
Expand Down Expand Up @@ -5147,7 +5147,7 @@
},
/area/ruin/space/derelict/arrival)
"nM" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plating/airless,
/area/ruin/space/derelict/hallway/primary)
"nN" = (
Expand Down Expand Up @@ -5344,7 +5344,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"on" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/template_noop,
/area/ruin/space/derelict/arrival)
"op" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -51723,7 +51723,7 @@
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"fmT" = (
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
Expand Down Expand Up @@ -87313,7 +87313,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
"xWz" = (
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/stations/emeraldstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -72250,7 +72250,7 @@
},
/obj/machinery/power/apc/directional/west,
/obj/machinery/camera{
c_tag = "Atsmospherics Hardsuit Storage West";
c_tag = "Atmospherics Hardsuit Storage West";
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -89371,7 +89371,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/machinery/alarm/directional/north,
/obj/machinery/camera{
c_tag = "Atsmospherics Hardsuit Storage North East"
c_tag = "Atmospherics Hardsuit Storage North East"
},
/turf/simulated/floor/plasteel{
dir = 1;
Expand Down Expand Up @@ -92362,7 +92362,7 @@
/area/station/hallway/primary/starboard)
"sjz" = (
/obj/machinery/camera{
c_tag = "AI Satellite ExteriorEast";
c_tag = "AI Satellite Exterior East";
dir = 4;
network = list("SS13","MiniSat")
},
Expand Down Expand Up @@ -113546,7 +113546,7 @@
/obj/item/stack/cable_coil,
/obj/item/t_scanner,
/obj/machinery/camera{
c_tag = "Atsmospherics Control ROom";
c_tag = "Atmospherics Control Room";
dir = 8
},
/turf/simulated/floor/plasteel{
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files220/RandomRuins/LavaRuins/old_outpost.dmm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aD" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/obj/structure/table_frame,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
Expand Down Expand Up @@ -498,7 +498,7 @@
/turf/simulated/floor/plasteel/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
"zW" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
"Ab" = (
Expand Down Expand Up @@ -605,7 +605,7 @@
},
/area/ruin/unpowered/misc_lavaruin)
"HE" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/lavaland_air{
icon_state = "blue";
Expand Down Expand Up @@ -847,7 +847,7 @@
/turf/simulated/floor/plasteel/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
"TL" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plasteel/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
"TW" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,11 @@
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/unpowered/unpowered_structures)
"gZ" = (
/obj/item/stack/tile{
pixel_y = 14
},
/obj/item/stack/tile/mineral/plastitanium,
/turf/template_noop,
/area/template_noop)
"he" = (
/obj/item/stack/tile,
/obj/item/stack/tile/mineral/plastitanium,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"hp" = (
Expand All @@ -99,7 +97,6 @@
dir = 8
},
/obj/item/shard{
icon_state = "large";
pixel_y = 9;
pixel_x = 19
},
Expand Down Expand Up @@ -234,10 +231,6 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/unpowered/unpowered_structures)
"rT" = (
/obj/item/stack/tile,
/turf/template_noop,
/area/template_noop)
"sP" = (
/obj/effect/mapping_helpers/turfs/burn,
/turf/simulated/floor/plating/airless,
Expand Down Expand Up @@ -489,7 +482,6 @@
/area/ruin/space/unpowered/unpowered_structures)
"KK" = (
/obj/item/shard{
icon_state = "large";
pixel_y = 9;
pixel_x = 19
},
Expand Down Expand Up @@ -517,12 +509,6 @@
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/unpowered/unpowered_structures)
"Mt" = (
/obj/item/stack/tile{
pixel_x = 22
},
/turf/template_noop,
/area/template_noop)
"ME" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/plating/airless,
Expand All @@ -539,7 +525,6 @@
icon_state = "small"
},
/obj/item/shard{
icon_state = "large";
pixel_y = 9
},
/turf/template_noop,
Expand Down Expand Up @@ -620,13 +605,6 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"Ss" = (
/obj/item/stack/tile{
pixel_y = 14;
pixel_x = 18
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"SJ" = (
/obj/structure/table_frame,
/obj/item/wrench,
Expand All @@ -642,10 +620,7 @@
/area/ruin/space/unpowered/unpowered_structures)
"Uf" = (
/obj/effect/mapping_helpers/turfs/burn,
/obj/item/stack/tile{
pixel_y = 14;
pixel_x = 18
},
/obj/item/stack/tile/mineral/plastitanium,
/turf/simulated/floor/plating/airless,
/area/ruin/space/unpowered/unpowered_structures)
"Ui" = (
Expand Down Expand Up @@ -734,9 +709,7 @@
/area/template_noop)
"YV" = (
/obj/structure/lattice,
/obj/item/stack/tile{
pixel_y = 14
},
/obj/item/stack/tile/mineral/plastitanium,
/turf/template_noop,
/area/template_noop)
"ZY" = (
Expand Down Expand Up @@ -1001,7 +974,7 @@ VC
nr
Dj
YS
rT
gZ
VC
CH
sP
Expand All @@ -1024,7 +997,7 @@ Ly
VC
EM
SK
Ss
he
nr
OI
VC
Expand Down Expand Up @@ -1634,7 +1607,7 @@ Pg
Ok
jF
SK
Mt
gZ
Ly
Ly
Ly
Expand Down Expand Up @@ -1749,7 +1722,7 @@ Ly
Ly
Ly
ao
Mt
gZ
Ly
Ly
Ly
Expand Down
12 changes: 4 additions & 8 deletions _maps/map_files220/RandomZLevels/spacebattle.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1404,9 +1404,7 @@
/area/awaymission/space_battle/engineering)
"eM" = (
/obj/structure/window/plasmareinforced,
/obj/machinery/atmospherics/binary/circulator{
icon_state = "circ8-off"
},
/obj/machinery/atmospherics/binary/circulator,
/turf/simulated/floor/engine/airless,
/area/awaymission/space_battle/cruiser)
"eN" = (
Expand Down Expand Up @@ -2242,7 +2240,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/simulated/floor/plasteel/airless,
/area/awaymission/space_battle/hallway2)
"hj" = (
Expand Down Expand Up @@ -4360,7 +4358,7 @@
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/awaymission/space_battle/syndicate/syndicate5)
"nZ" = (
/obj/item/stack/tile,
/obj/item/stack/tile/plasteel,
/turf/space,
/area/space)
"oa" = (
Expand Down Expand Up @@ -4502,9 +4500,7 @@
/obj/structure/window/plasmareinforced{
dir = 1
},
/obj/machinery/atmospherics/binary/circulator{
icon_state = "circ8-off"
},
/obj/machinery/atmospherics/binary/circulator,
/turf/simulated/floor/engine/airless,
/area/awaymission/space_battle/cruiser)
"ov" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -48023,7 +48023,7 @@
},
/area/station/public/dorms)
"fmT" = (
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
Expand Down Expand Up @@ -87066,7 +87066,7 @@
/turf/simulated/floor/wood/oak,
/area/station/maintenance/apmaint)
"tUi" = (
/obj/item/stack/tile/mineral,
/obj/item/stack/tile/plasteel,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "4-8"
Expand Down
Loading

0 comments on commit 7a4f324

Please sign in to comment.