Skip to content

Commit

Permalink
Merge upstream 21.03.2024 (#1116)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Мержит оффов.
<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Changelog

:cl:
tweak: Немного поправлен интерфейс консоли клонирования.
fix: Исправлено несколько проблем, связанных с недавним обновлением
клонирования.
fix: Исправлен визуальный баг, при котором попугай держит вещи, которых
у него на самом деле нет.
fix: Исправлена анимация вращения огнестрельного оружия с обвесами при
его броске.
fix: Мехи теперь не могут проходить сквозь стены арены вампира.
fix: Исправлена проблема с радиусом действия телекинеза.
fix: Имплант Qani-Laaca Sensory Computer из аплинка теперь защищен от
ЭМИ.
fix: Исправлена проблема с выходом из станции зарядки.
tweak: Электропак теперь бьет током мгновенно по сигналу.
tweak: Время до прибытия шаттла в админ панели теперь устанавливается в
минутах.
tweak: Клик на тело в интенте Grab теперь отстегивает его.
tweak: Крабы Лаваленда (Gutlunch, Gubbuck, Gutshank) теперь не поедают
мозги и импланты.
tweak: Размер окна листа бумаги значительно увеличен.
imageadd: Новые иконки способностей для крав-маги, демона резни, госта и
ксеноморфа.
imageadd: Спрайты всех радио-устройств были перерисованы.
imageadd: Спрайты ковбойских шляп были перерисованы.
add: Добавлена ковбойская шляпа СБ.
add: Добавлено СБ пончо.
add: Новая позиция в аплинке - Organ Extractor (20 ТК). Позволяет
извлекать внутренние органы и импланты без инструментов. Полученный
орган хранится в контейнере экстрактора и не портится. Полученный орган
можно так же просто имплантировать в другое тело, в том числе в свое.
[Читать далее](ParadiseSS13#24100).
add: Создание нового счета в терминале управления счетами теперь
сопровождается печатью информации о новом счете.
add: TGchat: Вкладки чата теперь можно менять местами.
tweak: TGchat: Выпадающие списки в настройках заменены на кнопки.
tweak: TGchat: Доступен предпросмотр шрифта при его изменении.
add: Ботинки Combat, Jump и Mining теперь могут хранить survival/combat
ножи.
tweak: Стоимость SWAT Crate увеличена с 800 до 900.
imageadd: Медведь Hudson теперь имеет уникальный спрайт.
add: Добавлены полярный, черный и бурый медведи, а также шапки из их
шкур.
fix: Космические медведи теперь не меняют спрайт в зависимости от того,
в космосе они или нет.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
Legendaxe authored Mar 21, 2024
2 parents 93f5169 + 25e5034 commit e375c4e
Show file tree
Hide file tree
Showing 159 changed files with 2,492 additions and 1,929 deletions.
5 changes: 4 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Merger hooks, run tools/hooks/install.bat or install.sh to set up
## Merge hooks, run tools/hooks/install.bat or install.sh to set up
*.dmm text eol=lf merge=dmm
*.dmi binary merge=dmi
## TGUI bundle merge drivers
*.bundle.* binary merge=tgui-merge-bundle
*.chunk.* binary merge=tgui-merge-bundle
1 change: 1 addition & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,7 @@ Each role inherits the lower role's responsibilities (IE: Headcoders also have c

* [AffectedArc07](https://github.com/AffectedArc07)
* [Charliminator](https://github.com/hal9000PR)
* [Contrabang](https://github.com/Contrabang)
* [lewcc](https://github.com/lewcc)

---
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,34 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

- name: Setup Cache
uses: actions/cache@v4
with:
path: $HOME/SpacemanDMM
key: ${{ runner.os }}-spacemandmm

- name: Install Tools
run: |
bash tools/ci/install_build_deps.sh
bash tools/ci/install_dreamchecker.sh
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: '3.11'
cache: 'pip'

- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'
cache-dependency-path: ./tgui/yarn.lock

- run: pip install -r tools/requirements.txt
- name: Run Linters
run: |
tools/ci/check_json.sh
tools/ci/build_tgui.sh
tgui/bin/tgui --ci
python tools/ci/check_grep2.py
python tools/ci/check_line_endings.py
python tools/ci/check_file_names.py
Expand All @@ -41,6 +51,7 @@ jobs:
python -m tools.ci.check_icon_conflicts
python -m tools.ci.check_icon_dupenames
python -m tools.maplint.source --github
- name: Run DreamChecker
shell: bash
run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh
Expand Down
16 changes: 15 additions & 1 deletion .github/workflows/merge_upstream_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ on:

jobs:
merge-upstream:
if: ${{ github.event.issue.pull_request && github.event.comment.body == '!merge_upstream' }}
if: |
github.event.issue.pull_request &&
(github.event.comment.body == '!merge_upstream') &&
((github.event.sender.id == github.event.issue.user.id) ||
(github.event.comment.author_association == 'COLLABORATOR') ||
(github.event.comment.author_association == 'MEMBER') ||
(github.event.comment.author_association == 'OWNER'))
runs-on: ubuntu-latest
steps:
- name: PR Data
Expand All @@ -20,9 +27,16 @@ jobs:
ref: ${{ env.PR_BRANCH }}
fetch-depth: 0

- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'
cache-dependency-path: ./tgui/yarn.lock

- uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'pip'

- name: Perform Merge
run: |
Expand Down
12 changes: 6 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"gitlens.advanced.blame.customArguments": [
"--ignore-revs-file", "${workspaceRoot}/.git-blame-ignore-revs"
"--ignore-revs-file",
"${workspaceRoot}/.git-blame-ignore-revs"
],
// ESLint settings:
"eslint.workingDirectories": [
"./tgui"
],
"eslint.workingDirectories": ["tgui/"],
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
"**/.yarn": true,
"**/.pnp.*": true
},
"eslint.nodePath": "tgui/.yarn/sdks",
"prettier.configPath": "tgui/.prettierrc.yml",
"prettier.prettierPath": "tgui/.yarn/sdks/prettier/index.cjs",
"typescript.tsdk": "tgui/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
Expand Down
1 change: 1 addition & 0 deletions _maps/map_files/Delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -17256,6 +17256,7 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
Expand Down
4 changes: 1 addition & 3 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -77252,9 +77252,7 @@
},
/area/station/medical/reception)
"qIB" = (
/obj/structure/toilet{
dir = 8
},
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,10 @@
},
/turf/simulated/floor/plating/asteroid/snow/atmosphere,
/area/ruin/powered/snow_biodome)
"bJ" = (
/mob/living/simple_animal/hostile/bear/polar,
/turf/simulated/floor/plating/asteroid/snow/atmosphere,
/area/ruin/powered/snow_biodome)
"bM" = (
/obj/machinery/light,
/turf/simulated/floor/plating/asteroid/snow/atmosphere,
Expand Down Expand Up @@ -1267,7 +1271,7 @@ aB
ak
ak
aC
ak
bJ
Wg
QI
tb
Expand Down
8 changes: 7 additions & 1 deletion _maps/map_files/cerestation/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -40513,6 +40513,12 @@
icon_state = "asteroidplating"
},
/area/station/service/clown/secret)
"fWT" = (
/obj/machinery/recharge_station,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
/area/station/security/permabrig)
"fXg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/red{
dir = 6
Expand Down Expand Up @@ -118028,7 +118034,7 @@ adS
aeJ
afd
rHj
rHj
fWT
duc
aQL
gLk
Expand Down
26 changes: 12 additions & 14 deletions _maps/map_files/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -14016,8 +14016,9 @@
},
/area/station/hallway/primary/fore)
"aSV" = (
/obj/structure/disposalpipe/segment/corner{
dir = 2
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
Expand Down Expand Up @@ -41266,13 +41267,6 @@
icon_state = "whitepurplefull"
},
/area/station/science/misc_lab)
"cFW" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
"cFX" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
Expand Down Expand Up @@ -62067,16 +62061,14 @@
},
/area/station/service/barber)
"hUX" = (
/obj/structure/toilet{
pixel_y = 8
},
/obj/machinery/light/small{
dir = 8
},
/obj/item/radio/intercom/locked/prison{
name = "Prison Intercom (General)";
pixel_y = 25
},
/obj/machinery/recharge_station,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -64563,6 +64555,12 @@
icon_state = "white"
},
/area/station/maintenance/aft)
"jlQ" = (
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
"jlW" = (
/obj/machinery/disposal,
/obj/structure/disposalpipe/trunk{
Expand Down Expand Up @@ -138069,7 +138067,7 @@ aGY
bte
aSI
bwv
aSV
jlQ
xWq
anx
qlS
Expand Down Expand Up @@ -138328,7 +138326,7 @@ bve
bwv
bwv
aSI
cFW
aSV
vbR
gSC
bWj
Expand Down
14 changes: 7 additions & 7 deletions code/__DEFINES/MC.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,34 @@
//SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier)

//subsystem does not initialize.
#define SS_NO_INIT 1
#define SS_NO_INIT (1<<0)

//subsystem does not fire.
// (like can_fire = 0, but keeps it from getting added to the processing subsystems list)
// (Requires a MC restart to change)
#define SS_NO_FIRE 2
#define SS_NO_FIRE (1<<1)

/** Subsystem only runs on spare cpu (after all non-background subsystems have ran that tick) */
/// SS_BACKGROUND has its own priority bracket, this overrides SS_TICKER's priority bump
#define SS_BACKGROUND 4
#define SS_BACKGROUND (1<<2)

//subsystem does not tick check, and should not run unless there is enough time (or its running behind (unless background))
#define SS_NO_TICK_CHECK 8
#define SS_NO_TICK_CHECK (1<<3)

//Treat wait as a tick count, not DS, run every wait ticks.
/// (also forces it to run first in the tick (unless SS_BACKGROUND))
// (implies all runlevels because of how it works)
// This is designed for basically anything that works as a mini-mc (like SStimer)
#define SS_TICKER 16
#define SS_TICKER (1<<4)

//keep the subsystem's timing on point by firing early if it fired late last fire because of lag
// ie: if a 20ds subsystem fires say 5 ds late due to lag or what not, its next fire would be in 15ds, not 20ds.
#define SS_KEEP_TIMING 32
#define SS_KEEP_TIMING (1<<5)

//Calculate its next fire after its fired.
// (IE: if a 5ds wait SS takes 2ds to run, its next fire should be 5ds away, not 3ds like it normally would be)
// This flag overrides SS_KEEP_TIMING
#define SS_POST_FIRE_TIMING 64
#define SS_POST_FIRE_TIMING (1<<6)

//SUBSYSTEM STATES
#define SS_IDLE 0 //aint doing shit.
Expand Down
3 changes: 1 addition & 2 deletions code/__DEFINES/admin_defines.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//A set of constants used to determine which type of mute an admin wishes to apply:
//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
//Therefore there needs to be a gap between the flags for the automute flags
#define MUTE_IC (1<<0)
#define MUTE_OOC (1<<1)
#define MUTE_PRAY (1<<2)
Expand Down Expand Up @@ -42,6 +40,7 @@
#define R_PROCCALL (1<<15)
#define R_VIEWRUNTIMES (1<<16)
#define R_MAINTAINER (1<<17)
// Update the following two defines if you add more

#define R_MAXPERMISSION (1<<17) //This holds the maximum value for a permission. It is used in iteration, so keep it updated.

Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/clothing_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
#define HANDS (HAND_LEFT | HAND_RIGHT)
#define FULL_BODY ((1<<11)-1) //10 bit bitmask, update me if we ever add more clothing parts.

// bitflags for the percentual amount of protection a piece of clothing which covers the body part offers.
// the percentual amount of protection a piece of clothing which covers the body part offers.
// Used with human/proc/get_heat_protection() and human/proc/get_cold_protection()
// The values here should add up to 1.
// Hands and feet have 2.5%, arms and legs 7.5%, each of the torso parts has 15% and the head has 30%
Expand Down
12 changes: 6 additions & 6 deletions code/__DEFINES/combat_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
#define SECONDS_TO_JITTER SECONDS_TO_LIFE_CYCLES*3

//I hate adding defines like this but I'd much rather deal with bitflags than lists and string searches
#define BRUTELOSS (1<<0)
#define FIRELOSS (1<<1)
#define TOXLOSS (1<<2)
#define OXYLOSS (1<<3)
#define SHAME (1<<4)
#define OBLITERATION (1<<5)
#define BRUTELOSS (1<<0)
#define FIRELOSS (1<<1)
#define TOXLOSS (1<<2)
#define OXYLOSS (1<<3)
#define SHAME (1<<4)
#define OBLITERATION (1<<5)

//Bitflags defining which status effects could be or are inflicted on a mob
#define CANSTUN (1<<0)
Expand Down
Loading

0 comments on commit e375c4e

Please sign in to comment.