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

Jump to bottom

Points defence #4

Merged
merged 52 commits into from
Aug 23, 2024
Merged

Points defence #4

merged 52 commits into from
Aug 23, 2024

Conversation

homexp13
Copy link
Collaborator

@homexp13 homexp13 commented Jul 9, 2024

Основные изменения

частично реализует https://docs.google.com/document/d/1ZXSbqvWmqnNvBiydyPjVMNI9s9jGgbEtaMi8trEztxQ/edit

Как это улучшит игру

новый режим

Ченджлог

:cl:
add: новый режим points defence
/:cl:

@fe-ed fe-ed added Mapping Изменение или добавление карт. Feature Добавление новых механик и прочего. labels Jul 9, 2024
@Tatarla Tatarla requested review from Tatarla and fe-ed July 13, 2024 21:10
Helg2
Helg2 reviewed Jul 16, 2024
View reviewed changes
code/_compile_options.dm Outdated Show resolved Hide resolved
@Helg2 Helg2 added Cookie Дайте автору печенек. Merge Conflict ПР конфликтует с базовой веткой labels Jul 28, 2024
homexp13 and others added 20 commits August 19, 2024 18:59
@homexp13 @Helg2
Update code/modules/xenomorph/xeno_core.dm
f061bb9 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/xenomorph/xeno_core.dm
a39e99f 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/modules/xenomorph/xeno_core.dm
b23cb37 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13
examine
ebdc0f8
@homexp13
RP moment
6e32b5e
@homexp13
undef
6658e1c
@homexp13 @Helg2
Update code/controllers/subsystem/xeno_den.dm
3566643 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13
QDEL_LIST
0518538
@homexp13
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn …
e8319f2 
…into game_mode
@homexp13
_amount
5918e96
@homexp13 @Helg2
Update code/game/objects/machinery/telecomms/ground_telecomms.dm
681ba9c 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13 @Helg2
Update code/game/objects/machinery/telecomms/ground_telecomms.dm
7bbaf1b 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13
xd
fabe456
@homexp13
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn …
2e299aa 
…into game_mode
@homexp13 @Helg2
Update code/game/objects/machinery/telecomms/ground_telecomms.dm
298de22 
Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>
@homexp13
undef
92bf45a
@homexp13
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn …
27382de 
…into game_mode
@homexp13
weldingtool
8e7610f
@homexp13
aaa
160efc4
@homexp13
doc
aa2883a
Helg2
Helg2 reviewed Aug 23, 2024
View reviewed changes
code/modules/xenomorph/tunnel.dm Outdated Show resolved Hide resolved
code/modules/xenomorph/tunnel.dm Outdated Show resolved Hide resolved
code/modules/xenomorph/xeno_core.dm Outdated Show resolved Hide resolved
code/modules/xenomorph/xeno_core.dm Show resolved Hide resolved
@Tatarla Tatarla merged commit 38a8f71 into PMC-Unga-Marines:master Aug 23, 2024
3 of 6 checks passed
github-actions bot added a commit that referenced this pull request Aug 23, 2024
@github-actions
Automatic changelog for PR #4 [ci skip]
6305d37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Helg2 Helg2 Helg2 approved these changes

@Tatarla Tatarla Awaiting requested review from Tatarla

Assignees
No one assigned
Labels
Cookie Дайте автору печенек. Feature Добавление новых механик и прочего. Mapping Изменение или добавление карт.
Projects
None yet
Milestone
Подготовка к разработке
Development

Successfully merging this pull request may close these issues.
4 participants
@homexp13 @Helg2 @Tatarla @fe-ed