Skip to content

Commit

Permalink
Отредактирован модпак Outfits
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCat15352 committed Apr 28, 2024
1 parent 0211044 commit 6239538
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 158 deletions.
12 changes: 9 additions & 3 deletions code/datums/outfits/jobs/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,28 @@
l_pocket = /obj/item/device/radio
l_ear = /obj/item/device/radio/headset/heads/ce

/* /decl/hierarchy/outfit/job/engineering/conteng Celadon Changes => mod_celadon/outfits/code/outfits.dm
/decl/hierarchy/outfit/job/engineering/conteng
name = OUTFIT_JOB_NAME("Containment Engineer")
uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/seclvl4eng
belt = /obj/item/storage/belt/utility/full
l_pocket = /obj/item/device/radio
l_ear = /obj/item/device/radio/headset/conteng */
l_ear = /obj/item/device/radio/headset/conteng

/decl/hierarchy/outfit/job/engineering/seneng
name = OUTFIT_JOB_NAME("Senior Engineer")
uniform = /obj/item/clothing/under/solgov/utility/fleet/engineering
shoes = /obj/item/clothing/shoes/dutyboots
id_type = /obj/item/card/id/seclvl4eng
// [CELADON-EDIT] - CELADON_OUTFITS
// id_type = /obj/item/card/id/seclvl4eng // CELADON-EDIT - ORIGINAL
id_type = /obj/item/card/id/seclvl4conteng
// [/CELADON-EDIT]
belt = /obj/item/storage/belt/utility/full
l_pocket = /obj/item/device/radio
// [CELADON-ADD] - CELADON_OUTFITS
r_ear = /obj/item/device/radio/headset/conteng/alt
// [/CELADON-ADD]
l_ear = /obj/item/device/radio/headset/heads/ce

/decl/hierarchy/outfit/job/engineering/juneng
Expand Down
28 changes: 20 additions & 8 deletions code/datums/outfits/jobs/mtf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@
/decl/hierarchy/outfit/mtf/epsilon_11
hierarchy_type = /decl/hierarchy/outfit/mtf/epsilon_11

/* /decl/hierarchy/outfit/mtf/epsilon_11/agent
/decl/hierarchy/outfit/mtf/epsilon_11/agent
name = OUTFIT_JOB_NAME("MTF Epsilon-11 Agent")
uniform = /obj/item/clothing/under/ert/epsilon11
suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
head = /obj/item/clothing/head/helmet/ballistic
// [CELADON-EDIT] - CELADON_OUTFITS
// suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon // CELADON-EDIT - ORIGINAL
// head = /obj/item/clothing/head/helmet/ballistic // CELADON-EDIT - ORIGINAL
suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/MTFlight
head = /obj/item/clothing/head/helmet/scp/lwh_helmet
// [/CELADON-EDIT]
mask = /obj/item/clothing/mask/balaclava/tactical
glasses = /obj/item/clothing/glasses/night
gloves = /obj/item/clothing/gloves/tactical/scp
Expand All @@ -31,8 +35,12 @@
/decl/hierarchy/outfit/mtf/epsilon_11/breacher
name = OUTFIT_JOB_NAME("MTF Epsilon-11 Breacher")
uniform = /obj/item/clothing/under/ert/epsilon11
suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
head = /obj/item/clothing/head/helmet/ballistic
// [CELADON-EDIT] - CELADON_OUTFITS
// suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon // CELADON-EDIT - ORIGINAL
// head = /obj/item/clothing/head/helmet/ballistic // CELADON-EDIT - ORIGINAL
suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/MTFmedium
head = /obj/item/clothing/head/helmet/scp/lwh_helmet
// [/CELADON-EDIT]
mask = /obj/item/clothing/mask/balaclava/tactical
glasses = /obj/item/clothing/glasses/night
gloves = /obj/item/clothing/gloves/tactical/scp
Expand All @@ -49,8 +57,12 @@
/decl/hierarchy/outfit/mtf/epsilon_11/leader
name = OUTFIT_JOB_NAME("MTF Epsilon-11 Team Leader")
uniform = /obj/item/clothing/under/ert/epsilon11
suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon
head = /obj/item/clothing/head/beret/mtf
// [CELADON-EDIT] - CELADON_OUTFITS
// suit = /obj/item/clothing/suit/armor/pcarrier/green/scp/mtf_epsilon // CELADON-EDIT - ORIGINAL
// head = /obj/item/clothing/head/beret/mtf // CELADON-EDIT - ORIGINAL
suit = /obj/item/clothing/suit/armor/vest/scp/medarmor/MTFlight
head = /obj/item/clothing/head/helmet/scp/lwh_helmet
// [/CELADON-EDIT]
mask = /obj/item/clothing/mask/balaclava
glasses = /obj/item/clothing/glasses/night
gloves = /obj/item/clothing/gloves/tactical/scp
Expand Down Expand Up @@ -80,7 +92,7 @@
r_pocket = null
id_type = /obj/item/card/id/mtf/ninetail
belt = /obj/item/defibrillator/compact/combat/loaded
backpack_contents = list(/obj/item/ammo_magazine/scp/p90_mag/ap = 3,/obj/item/clothing/mask/gas = 1,/obj/item/reagent_containers/ivbag/blood/OMinus = 2,/obj/item/storage/pill_bottle/zoom = 1) */
backpack_contents = list(/obj/item/ammo_magazine/scp/p90_mag/ap = 3,/obj/item/clothing/mask/gas = 1,/obj/item/reagent_containers/ivbag/blood/OMinus = 2,/obj/item/storage/pill_bottle/zoom = 1)

/decl/hierarchy/outfit/mtf/eta_10 // See No Evil
name = OUTFIT_JOB_NAME("MTF Eta-10 Operative")
Expand Down
7 changes: 5 additions & 2 deletions code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
// OFFICERS
//##

/* /datum/job/ncoofficerlcz =# Mod Celadon Changes => mod_celadon\outfits\code\job\security.dm #=
/datum/job/ncoofficerlcz
title = "LCZ Sergeant"
department = "Light Containment Personnel"
selection_color = "#601c1c"
Expand All @@ -233,6 +233,9 @@
ACCESS_SEC_COMMS,
ACCESS_SECURITY_LVL1,
ACCESS_SECURITY_LVL2,
// [CELADON-ADD] - CELADON_OUTFITS
ACCESS_SECURITY_LVL3,
// [/CELADON-ADD]
ACCESS_SCIENCE_LVL1,
ACCESS_SCIENCE_LVL2,
ACCESS_DCLASS_KITCHEN,
Expand All @@ -256,7 +259,7 @@
SKILL_WEAPONS = SKILL_EXPERIENCED,
SKILL_FORENSICS = SKILL_TRAINED
)
skill_points = 21 */
skill_points = 21

/datum/job/ncoofficerhcz
title = "HCZ Sergeant"
Expand Down
33 changes: 23 additions & 10 deletions mod_celadon/outfits/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,40 @@
-->

<!-- Название мода. Не важно на русском или на английском. -->
## Мод-пример
## Outfits

ID мода: EXAMPLE
ID мода: CELADON_OUTFITS
<!--
Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
которое ты будешь использовать для обозначения файлов.
-->

### Описание мода

Этот мод служит примером для разработчиков и существует лишь для того,
чтобы его можно было легко скопировать и вставить в другое место.
Этот мод добавляет различные наборы одежды.
<!--
Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
А также любая полезная информация.
-->

### Изменения *кор кода*

- `code/modules/mob/living.dm`: `proc/overriden_proc`, `var/overriden_var`
- ADD: `code\game\jobs\job\security.dm`:
`access = list`:
Добавлено: `ACCESS_SECURITY_LVL3`

- EDIT: `code\datums\outfits\jobs\mtf.dm`:
`/decl/hierarchy/outfit/mtf/epsilon_11/agent`,
`/decl/hierarchy/outfit/mtf/epsilon_11/breacher`,
`/decl/hierarchy/outfit/mtf/epsilon_11/leader`
Изменены: `suit`, `head`

- EDIT: `code\datums\outfits\jobs\engineering.dm`:
`/decl/hierarchy/outfit/job/engineering/seneng`
Изменено: `id_type`
- ADD: `code\datums\outfits\jobs\engineering.dm`:
`/decl/hierarchy/outfit/job/engineering/seneng`
Добавлено: `r_ear`
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Expand All @@ -40,8 +54,7 @@ ID мода: EXAMPLE

### Оверрайды

- `mods/_master_files/sound/my_cool_sound.ogg`
- `mods/_master_files/code/my_modular_override.dm`: `proc/overriden_proc`, `var/overriden_var`
- Отсутствуют
<!--
Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
Здесь указываются оверрайды в твоём моде и папке `_master_files`
Expand All @@ -51,7 +64,7 @@ ID мода: EXAMPLE

### Дефайны

- `code/__defines/~mods/example.dm`: `EXAMPLE_SPEED_MULTIPLIER`, `EXAMPLE_SPEED_BASE`
- Отсутствуют
<!--
Если требовалось добавить какие-либо дефайны, укажи файлы,
в которые ты их добавил, а также перечисли имена.
Expand All @@ -62,7 +75,7 @@ ID мода: EXAMPLE

### Используемые файлы, не содержащиеся в модпаке

- `mods/_master_files/icons/obj/alien.dmi`
- Отсутствуют
<!--
Будь то немодульный файл или модульный файл, который не содержится в папке,
принадлежащей этому конкретному моду, он должен быть упомянут здесь.
Expand All @@ -72,7 +85,7 @@ ID мода: EXAMPLE

### Авторы:

Твой_никнейм
Voiko
<!--
Здесь находится твой никнейм
Если работал совместно - никнеймы тех, кто помогал.
Expand Down
2 changes: 1 addition & 1 deletion mod_celadon/outfits/_outfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
/// A string name for the modpack. Used for looking up other modpacks in init.
name = "Outfits"
/// A string desc for the modpack. Can be used for modpack verb list as description.
desc = "Место для различных наборов одежды"
desc = "Этот мод добавляет различные наборы одежды."
/// A string with authors of this modpack.
author = "Voiko"
4 changes: 0 additions & 4 deletions mod_celadon/outfits/_outfits.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@

#include "_outfits.dm"

#include "code/job/engineering.dm"
#include "code/job/security.dm"
#include "code/job/mtf.dm"

#endif
9 changes: 0 additions & 9 deletions mod_celadon/outfits/code/job/engineering.dm

This file was deleted.

73 changes: 0 additions & 73 deletions mod_celadon/outfits/code/job/mtf.dm

This file was deleted.

48 changes: 0 additions & 48 deletions mod_celadon/outfits/code/job/security.dm

This file was deleted.

0 comments on commit 6239538

Please sign in to comment.