Skip to content

Commit

Permalink
Merge pull request #45 from 800maximum123/Cuchulain-rewrite
Browse files Browse the repository at this point in the history
[FD-Lore] Institute Cuchulain | CORECODE-REWRITE
  • Loading branch information
VoiceInYourHead authored Jul 18, 2024
2 parents 56fbc23 + 1fb9832 commit d9cf159
Show file tree
Hide file tree
Showing 6 changed files with 201 additions and 2 deletions.
5 changes: 4 additions & 1 deletion code/game/antagonist/outsider/foundation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,7 @@ GLOBAL_DATUM_INIT(foundation_agents, /datum/antagonist/foundation, new)
var/singleton/hierarchy/outfit/foundation = outfit_by_type(/singleton/hierarchy/outfit/foundation)
foundation.equip(player)

create_id("Foundation Agent", player)
// [FD EDIT]
// create_id("Foundation Agent", player)
create_id("Institute Agent", player)
//
3 changes: 2 additions & 1 deletion maps/torch_fd/fd_torch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@
#include "../../mods/_fd/runechat/_runechat.dme"
#include "../../mods/_fd/fd_assets/_fd_assets.dme"
#include "../../mods/_fd/fd_guns/_fd_guns.dme"
#include "../../mods/_fd/fd_lore/_fd_lore.dme"
#include "../../mods/_fd/fd_species/_fd_species.dme"

#include "../../mods/_fd/accent_labels/_accent_labels.dme"
#include "../../mods/_fd/additional_biomods/_additional_biomods.dme"
Expand All @@ -262,7 +264,6 @@
#include "../../mods/_fd/conference_holopads/_conference_holopads.dme"
#include "../../mods/_fd/cyberware_mayhem/_cyberware_mayhem.dme"
#include "../../mods/_fd/expanded_traders/_expanded_traders.dme"
#include "../../mods/_fd/fd_species/_fd_species.dme"
#include "../../mods/_fd/hestia_missiles/_hestia_missiles.dme"
#include "../../mods/_fd/immersive_overmap/_immersive_overmap.dme"
#include "../../mods/_fd/junk_heaven/_junk_heaven.dme"
Expand Down
86 changes: 86 additions & 0 deletions mods/_fd/fd_lore/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@

#### Список PRов:

- https://github.com/RepoStash/FD-NewBay/pull/46
<!--
Ссылки на PRы, связанные с модом:
- Создание
- Большие изменения
-->

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

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

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

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

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

- `/datum/antagonist/foundation`: `proc/equip(mob/living/carbon/human/player)`,
<!--
Если вы редактировали какие-либо процедуры или переменные в кор коде,
они должны быть указаны здесь.
Нужно указать и файл, и процедуры/переменные.
Изменений нет - напиши "Отсутствуют"
-->

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

- `/singleton/hierarchy/outfit/foundation`: `var/name`
- `/obj/item/card/id/foundation`: `var/name`
- `/obj/item/device/radio/headset/foundation`: `var/name`
- `/obj/item/clothing/suit/storage/toggle/labcoat/foundation`: `var/name`, `var/desc`
- `/datum/codex_entry/cuchulain_foundation`: `var/display_name`, `var/associated_strings`, `var/lore_text`, `var/antag_text`
- `/datum/codex_entry/psionics`: `var/lore_text`
- `/obj/item/reagent_containers/food/drinks/glass2/coffeecup/foundation`: `var/name`, `var/desc`, `var/base_name`
- `/obj/item/gun/projectile/revolver/foundation`: `var/name`, `var/desc`
- `/obj/item/storage/briefcase/foundation`: `var/name`
- `/obj/item/book/manual/psionics`: `var/dat`
<!--
Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
Здесь указываются оверрайды в твоём моде и папке `_master_files`
Изменений нет - напиши "Отсутствуют"
-->

### Дефайны

- Отсутствуют
<!--
Если требовалось добавить какие-либо дефайны, укажи файлы,
в которые ты их добавил, а также перечисли имена.
И то же самое, если ты используешь дефайны, определённые другим модом.
Не используешь - напиши "Отсутствуют"
-->

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

- Отсутствуют
<!--
Будь то немодульный файл или модульный файл, который не содержится в папке,
принадлежащей этому конкретному моду, он должен быть упомянут здесь.
Хорошими примерами являются иконки или звуки, которые используются одновременно
несколькими модулями, или что-либо подобное.
-->

### Авторы:

Chaplain Maximum
<!--
Здесь находится твой никнейм
Если работал совместно - никнеймы тех, кто помогал.
В случае порта чего-либо должна быть ссылка на источник.
-->
4 changes: 4 additions & 0 deletions mods/_fd/fd_lore/_fd_lore.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/singleton/modpack/fd_lore
name = "FD Lore"
desc = "Мод, изменяющий все до состояние Каноничен ФД."
author = "Chaplain Maximum"
10 changes: 10 additions & 0 deletions mods/_fd/fd_lore/_fd_lore.dme
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#ifndef MODPACK_FD_LORE
#define MODPACK_FD_LORE

#include "_fd_lore.dm"

#include "factions/institute/name.dm"
// Далее просто включай свой код
// #include "code/something.dm"

#endif
95 changes: 95 additions & 0 deletions mods/_fd/fd_lore/factions/institute/name.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/singleton/hierarchy/outfit/foundation
name = "Cuchulain Institute Agent"

/datum/antagonist/foundation
role_text = "CIS Agent"
role_text_plural = "CIS Agents"
welcome_text = "<span class='info'>You are a field agent of the Cuchulain's Institute of Science, \
a body that specializes in taking down psychic threats. You have a free pass to anywhere \
you like, a pistol loaded with anti-psi nullglass rounds, and a clear duty. Naturally, \
nobody takes your employers seriously - until a day like today.</span>"
antag_text = "You are an <b>anti</b> antagonist! Within the rules, \
try to save the installation and its inhabitants from the ongoing crisis. \
Try to make sure other players have <i>fun</i>! If you are confused or at a loss, always adminhelp, \
and before taking extreme actions, please try to also contact the administration! \
Think through your actions and make the roleplay immersive! <b>Please remember all \
rules aside from those without explicit exceptions apply to Institute Agents.</b>"

/obj/item/card/id/foundation
name = "\improper Institute warrant card"

/obj/item/device/radio/headset/foundation
name = "\improper Institute radio headset"

/obj/item/clothing/suit/storage/toggle/labcoat/foundation
name = "\improper Institute labcoat"
desc = "A medical labcoat with a Cuchulain's Institute crest stencilled on the back."
icon_state = "labcoat_foundation"

/datum/codex_entry/cuchulain_foundation
display_name = "Cuchulain's Institute of Science"
associated_strings = list("Cuchulain", "Institute")
lore_text = "The CIS is a non-profit body based out of Neptune orbit. Their logo is \
an upward-facing radio telescope dish, usually printed in green. They perform niche research on behalf \
of private parties, the SGC, and their own interests. They are also the single largest psionic registration \
and oversight body in human space, responsible for educating and training operants at no cost, even across \
territorial and political lines. \
<br><br> \
The rest of the article is an indecipherable haze that slips out of your memory as soon as you \
finish reading it, but you feel pretty satisfied and informed by the end."
antag_text = "The CIS is an anti-occult ERT-like body. They are equipped with \
nullglass weapons that can disrupt or destroy psi-powers, and have their own moderately powerful \
psionic abilities. They make heavy use of psionic influence to cloud and disrupt efforts at \
researching or understanding them, and the depth and nature of their connections to political \
bodies like the SCG are unclear."

/datum/codex_entry/psionics
lore_text = "Psionics are a relatively new phenomenon theorized to be linked to long-term exposure \
to deep, uninhabited space. A tiny, tiny subset of people exposed to such conditions can develop the \
ability to perform small feats like levitating coins or removing a headache with nothing but their mind. \
A decade of study has resulted in the SCG determining that these psionics, mild as they are, don't pose \
an operational or health risk, but they do encourage operants to register with a psionic regulation body \
like Cuchulain's Institute of Science. \
<br><br> \
However, psionics-enhancing implants, drugs and procedures are illegal in most human space, and \
statistically seem to end in death for those foolish enough to make use of them. Being caught with a \
cerebroenergetic enhancer, or the drug Three Eye, will net you a hefty prison sentence."

/obj/item/reagent_containers/food/drinks/glass2/coffeecup/foundation
name = "\improper Institute coffee cup"
desc = "A white coffee cup with the CIS logo stencilled onto it."
base_name = "\improper Institute cup"

/obj/item/gun/projectile/revolver/foundation
name = "\improper Institute revolver"
desc = "The CF 'Troubleshooter', a compact plastic-composite weapon designed for concealed carry by Cuchulain Institute field agents. Smells faintly of copper."

/obj/item/storage/briefcase/foundation
name = "\improper Institute briefcase"



/obj/item/book/manual/psionics
dat = {"<html>
<head>
<style>
h1 {font-size: 21px; margin: 15px 0px 5px;}
h2 {font-size: 15px; margin: 15px 0px 5px;}
li {margin: 2px 0px 2px 15px;}
ul {margin: 5px; padding: 0px;}
ol {margin: 5px; padding: 0px 15px;}
body {font-size: 13px; font-family: Verdana;}
</style>
</head>
<body>
<h1>Psychonetics</h1>

<p>This seems to be a dry, longwinded reference text for the form of strange mental powers called psionics. The author spends way too much time trying to advertise his cult, though.</p>

<p>The general gist of things seems to be that sometime in the last decade or so, the first cases of 'spontaneous operancy' became known. People who spent a lot of time in deep space, or who studied certain esoteric fields of mathematics, became able to perform strange feats like levitating coins or removing headaches with nothing but their minds. The text goes on to explain that psionics are perfectly harmless, and that studies (no citations) have shown operants are no more likely to go mad and murder people than anyone else.</p>

<p>A postscript by a group called the Cuchulain's Institute invites anyone who knows an operant, or thinks they might be one, to send them a message via comms and get enrolled in their training and registration program in orbit around Neptune. It's catered. The postscript adds hastily that you should never try to activate your own latencies with trauma or drugs, as the results are often lethal.</p>

</body>
</html>
"}

0 comments on commit d9cf159

Please sign in to comment.