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

Новый эвей мишион, и чуть чуть для ерт там #43

Closed
wants to merge 10 commits into from
Closed

Новый эвей мишион, и чуть чуть для ерт там #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a381d2c
небольшие фиксы и ПОЛНОСТЬЮ новый эвей мишион
lobzik8 Apr 20, 2024
cdeb1ad
ну тут немного лодаут под новые шкафы подделал
lobzik8 Apr 20, 2024
d46a7e2
перевёл в модульность
lobzik8 Apr 21, 2024
f31668d
Новая эвей мишион, трупы самых основных профессий, и чуть меньше лута…
lobzik8 Apr 27, 2024
20f69d0
вот
lobzik8 Apr 27, 2024
162f479
Тут еще немножко обновочка
lobzik8 Apr 28, 2024
01ebaf2
Merge branch 'beta-dev' into ya-paebalsa-ot-vetok
lobzik8 Apr 28, 2024
56cd50e
вау
lobzik8 Apr 29, 2024
7a2b19f
Merge branch 'ya-paebalsa-ot-vetok' of https://github.com/lobzik8/Fou…
lobzik8 Apr 29, 2024
409e0cc
еще вау
lobzik8 Apr 29, 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
4 changes: 2 additions & 2 deletions code/game/antagonist/outsider/ert.dm
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Требуется вынести в модуль. Либо частично, либо полностью. Лишнее не удалить, а закомментировать /* */

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Собственно, оформить нужно как в ридми mod_celadon написано. Добавить что ты сделал, айди поставить, закомментить оригинальный код. А собственно что именно тут ты сделал? @lobzik8

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ GLOBAL_DATUM_INIT(ert, /datum/antagonist/ert, new)
to_chat(player.current, "The Mobile Task Force works for the O5 Council; your job is to contain loose SCPs and eliminate infiltrators. There is a code red alert at [station_name()], you are tasked to go and fix the problem.")
to_chat(player.current, "You should first gear up and discuss a plan with your team. More members may be joining, don't move out before you're ready.")

/datum/antagonist/ert/equip(mob/living/carbon/human/player)
/*/datum/antagonist/ert/equip(mob/living/carbon/human/player)

//Special radio setup
player.add_language(LANGUAGE_ENGLISH)
Expand All @@ -52,4 +52,4 @@ GLOBAL_DATUM_INIT(ert, /datum/antagonist/ert, new)
player.equip_to_slot_or_store_or_drop(new /obj/item/clothing/suit/armor/mtftactical(player), slot_wear_suit)

create_id(role_text, player)
return 1
return 1*/
2 changes: 2 additions & 0 deletions code/modules/awaymissions/corpse.dm
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Весь кор код комментить теперь не надо. И что тут ты менял? @lobzik8

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

//To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now).

/*
#define CORPSE_SPAWNER_RANDOM_NAME (1<<0)
#define CORPSE_SPAWNER_CUT_SURVIVAL (1<<1)
#define CORPSE_SPAWNER_CUT_ID_PDA (1<<2)
Expand Down Expand Up @@ -151,3 +152,4 @@
/obj/effect/landmark/corpse/chaos/officer
name = "Chaos Insurgent Leader"
corpse_outfits = list(/decl/hierarchy/outfit/chaos/leader)
*/
Loading