FD Resomi mod

config/example/config.txt

@@ -1,5 +1,5 @@
-## Server name: This appears at the top of the screen in-game and on hub listings.
-# SERVER_NAME Space Station 13
+## Server name: This appears at the top of the screen in-game. In this case it will read "tgstation: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'tgstation' with the name of your choice
+# SERVERNAME spacestation13
 
 ## Game Version: The archetype of the server for topic status requests. Unless significantly deviated, avoid changing this. Default Baystation12
 # GAME_VERSION Baystation12
@@ -31,6 +31,9 @@ JOBS_HAVE_MINIMAL_ACCESS
 ## Non-automatic antagonist recruitment, such as being converted to cultism is not affected. Has the same database requirements and notes as USE_AGE_RESTRICTION_FOR_JOBS.
 #USE_AGE_RESTRICTION_FOR_ANTAGS
 
+## Unhash this to use recursive explosions, keep it hashed to use circle explosions. Recursive explosions react to walls, airlocks and blast doors, making them look a lot cooler than the boring old circular explosions. They require more CPU and are (as of january 2013) experimental
+#USE_RECURSIVE_EXPLOSIONS
+
 ## Radiation weakens with distance from the source; stop calculating when the strength falls below this value.   Lower values mean radiation reaches smaller (with increasingly trivial damage) at the cost of more CPU usage.  Max range =  DISTANCE^2 * POWER / RADIATION_LOWER_LIMIT
 # RADIATION_LOWER_LIMIT	0.35
 
@@ -46,9 +49,6 @@ LOG_ADMIN
 ## log client access (logon/logoff)
 LOG_ACCESS
 
-## When not set, staff with R_MOD and shared IPs do not cause warnings.
-WARN_IF_STAFF_SAME_IP
-
 ## log game actions (start of round, results, etc.)
 LOG_GAME
 
@@ -135,13 +135,6 @@ VOTE_DELAY 6000
 ## time period (deciseconds) which voting session will last (default 1 minute)
 VOTE_PERIOD 600
 
-## Maximum time a round can last for (in minutes). If this time is exceeded, the round
-# will autotransfer without a vote at the next continue vote. Leave disabled for no limit.
-#MAXIMUM_ROUND_LENGTH 120
-
-## The time in minutes after no living players remain at which the round will end. Defaults off.
-#EMPTY_ROUND_TIMEOUT 5
-
 ## autovote initial delay in minutes before first automatic transfer vote call (default 120)
 # using seven semicolon (;) separated values allows for different weekday-based values
 VOTE_AUTOTRANSFER_INITIAL 120
@@ -150,17 +143,9 @@ VOTE_AUTOTRANSFER_INITIAL 120
 # using seven semicolon (;) separated values allows for different weekday-based values
 VOTE_AUTOTRANSFER_INTERVAL 30
 
-## Time in minutes leading up to the next autotransfer vote in which antagonists cannot
-# automatically be created. Default 20.
-#TRANSFER_VOTE_BLOCK_ANTAG_TIME 20
-
 ## Time left (seconds) before round start when automatic gamemote vote is called (default 160).
 VOTE_AUTOGAMEMODE_TIMELEFT 160
 
-## Time (seconds) before the server will attempt to start a round.
-# Should be bigger than VOTE_AUTOGAMEMODE_TIMELEFT + VOTE_PERIOD.
-PRE_GAME_TIME 180
-
 ## prevents dead players from voting or starting votes
 #NO_DEAD_VOTE
 
@@ -231,6 +216,15 @@ GUEST_BAN
 ## Where your users can go to tell you they've changed
 # BANAPPEALS https://example.com
 
+## Defines world tick rate relative to 10/sec at 1 and 20/sec at 0.5. Use this OR fps, not both. Defaults to 0.333333
+# TICKLAG 0.333333
+
+## Defines world tick rate. Use this OR ticklag, not both. Defaults to 30.
+FPS 30
+
+## Whether the server will talk to other processes through socket_talk
+SOCKET_TALK 0
+
 ## Comment this out to disable automuting
 #AUTOMUTE_ON
 
@@ -267,12 +261,6 @@ USEALIENWHITELIST
 ## IRC channel to send adminhelps to.  Leave blank to disable adminhelps-to-irc.
 #ADMIN_IRC #admin
 
-## Discord channel ID to send adminhelps to. Leave blank to disable adminhelps-to-discord. Note: Requires ExComm (https://github.com/Baystation12/ExCom) or a similar Discord Bot
-#ADMIN_DISCORD 123456
-
-## Address and port of the Excom's bot listen server to relay messages to. Sends over HTTP. Example: baystation.xyz:1234, 127.0.0.1:5678
-#EXCOM_ADDRESS localhost:1234
-
 ## Uncommen to allow ghosts to write in blood during Cult rounds.
 ALLOW_CULT_GHOSTWRITER
 
@@ -337,8 +325,8 @@ EVENT_CUSTOM_START_MAJOR 80;100
 ## The delay in minutes before an observer that has returned to the main menu may rejoin the game.
 #RESPAWN_MENU_DELAY 0
 
-## Enables and disables starlight. This will make space turfs and some turfs considered to be in exterior areas to be lit based on the colour of the background parallax.
-STARLIGHT 1
+## Strength of ambient star light. Set to 0 or less to turn off. A value of 1 is unlikely to have a noticeable effect in most lighting systems.
+STARLIGHT 0
 
 ## Defines which races are allowed to join as ERT, in singular form. If unset, defaults to only human. Casing matters, separate using ;
 ## Example races include: Human, Tajara, Skrell, Unathi
@@ -451,6 +439,12 @@ RADIATION_LOWER_LIMIT 0.15
 ## DISALLOW_VOTABLE_MODE changeling
 ## DISALLOW_VOTABLE_MODE malfunction
 
+## Allow to use emojis in all OOC chats(looc, ooc, aooc, dsay, ahelp)
+#TOGGLE_EMOJIS
+## Maximum time a round can last for (in minutes). If this time is exceeded,
+## the round will autotransfer without a vote at the next continue vote. Leave disabled for no limit.
+#MAXIMUM_ROUND_LENGTH 120
+
 ## The delay in deciseconds between stat() updates.
 ## Lower can be more responsive to scene changes and updates but has a higher client/server overhead.
 # STAT_DELAY 5
@@ -460,21 +454,3 @@ RADIATION_LOWER_LIMIT 0.15
 
 ## The length in minutes of an automatic ban created by passing the warning threshold.
 # WARN_AUTOBAN_DURATION 30
-
-## Uncomment this to bypass empty z-level checks in certain subsystems. For testing and development purposes only.
-## Not recommended for live use.
-#RUN_EMPTY_LEVELS
-
-
-###################################################################
-#                            SIERRABAY                            #
-###################################################################
-
-## Uncomment to use ckey whitelist ticket system with SQL
-#USEWHITELIST_DATABASE
-
-## Server to reroute to. Used when USEWHITELIST_DATABASE enabled
-#OVERFLOW_SERVER_URL byond://example.com:1234
-
-## Minimum age of byond account that allowed to play without discord verification
-#MINIMUM_BYONDACC_AGE 10

config/example/dbconfig.txt

@@ -22,11 +22,4 @@ PASSWORD mypassword
 # The following information is for feedback tracking via the blackbox server
 FEEDBACK_DATABASE test
 FEEDBACK_LOGIN mylogin
-FEEDBACK_PASSWORD mypassword
-
-
-###################################################################
-#                            SIERRABAY                            #
-###################################################################
-
-UTILITY_DATABASE tgstation
+FEEDBACK_PASSWORD mypassword

config/names/first_male.txt

@@ -85,7 +85,7 @@ Godwin
 Goodwin
 Gordon
 Graeme
-Grandax
+Grandpa
 Gratian
 Grendel
 Han

maps/torch_fd/fd_torch.dm

@@ -228,6 +228,7 @@
 	#include "../../mods/legalese_language/_legalese.dme"
 	#include "../../mods/petting_zoo/_petting_zoo.dme"
 	// #include "../../mods/resomi/_resomi.dme"
+	// #include "../../mods/resomi_fd/_resomi.dme"
 	#include "../../mods/screentips/_screentips.dme"
 	#include "../../mods/tajara/_tajara.dme"
 	#include "../../mods/sauna_props/_sauna_props.dme"

mods/resomi_fd/README.md

@@ -0,0 +1,119 @@
+
+#### Список PRов:
+
+- https://github.com/SierraBay/SierraBay12/pull/2054
+<!--
+  Ссылки на PRы, связанные с модом:
+  - Создание
+  - Большие изменения
+-->
+
+<!-- Название мода. Не важно на русском или на английском. -->
+## Резоми
+
+ID мода: RESOMI
+<!--
+  Название модпака прописными буквами, СОЕДИНЁННЫМИ_ПОДЧЁРКИВАНИЕМ,
+  которое ты будешь использовать для обозначения файлов.
+-->
+
+### Описание мода
+
+Ря!
+- Портирует расу резоми с Infinity.
+<!--
+  Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
+  А также любая полезная информация.
+-->
+
+### Изменения *кор кода*
+
+- `code/modules/client/preference_setup/loadout/lists/misc.dm`
+  - `/datum/gear/plush_toy/New()`
+- `code/modules/organs/external/_external_icons.dm`
+  - `/obj/item/organ/external/on_update_icon()`
+- `mods/resomi/code/overrides.dm`
+  - `/mob/living/carbon/human/get_pulse_as_number()`
+- `code/modules/clothing/head/jobs.dm`
+  - `/obj/item/clothing/head/beret`
+  - `/obj/item/clothing/head/beret/Initialize()`
+  - `/obj/item/clothing/head/beret/equipped()`
+- `code/modules/clothing/masks/miscellaneous.dm`
+  - `/obj/item/clothing/mask/bandana/equipped()`
+
+<!--
+  Если вы редактировали какие-либо процедуры или переменные в кор коде,
+  они должны быть указаны здесь.
+  Нужно указать и файл, и процедуры/переменные.
+
+  Изменений нет - напиши "Отсутствуют"
+-->
+
+### Оверрайды
+
+- `Отсутствуют`
+
+<!--
+  Если ты добавлял новый модульный оверрайд, его нужно указать здесь.
+  Здесь указываются оверрайды в твоём моде и папке `_master_files`
+
+  Изменений нет - напиши "Отсутствуют"
+-->
+
+### Дефайны
+
+- `code/__defines/~mods/~master_defines.dm`:
+  - `SPECIES_RESOMI`
+  - `LANGUAGE_RESOMI`
+- `mods/resomi/code/datum/_defines.dm`:
+  - `CULTURE_RESOMI_EREMUS`
+  - `CULTURE_RESOMI_ASRANDA`
+  - `CULTURE_RESOMI_REFUGEE`
+  - `CULTURE_RESOMI_NEWGENERATION`
+  - `CULTURE_RESOMI_LOSTCOLONYRICH`
+  - `CULTURE_RESOMI_LOSTCOLONYPOOR`
+  - `CULTURE_RESOMI_SKRELL`
+  - `HOME_SYSTEM_RESOMI_BIRDCAGE`
+  - `HOME_SYSTEM_RESOMI_EREMUS`
+  - `HOME_SYSTEM_RESOMI_ASRANDA`
+  - `HOME_SYSTEM_RESOMI_SAVEEL`
+  - `HOME_SYSTEM_RESOMI_LOST_COLONY`
+  - `HOME_SYSTEM_RESOMI_REFUGEE_COLONY`
+  - `HOME_SYSTEM_RESOMI_HOMELESS`
+  - `HOME_SYSTEM_RESOMI_IMPER_COLONY`
+  - `HOME_SYSTEM_RESOMI_RESOBALAK`
+  - `RELIGION_RESOMI_CHOSEN`
+  - `RELIGION_RESOMI_EMPEROR`
+  - `RELIGION_RESOMI_MOUNTAIN`
+  - `RELIGION_RESOMI_SKIES`
+<!--
+  Если требовалось добавить какие-либо дефайны, укажи файлы,
+  в которые ты их добавил, а также перечисли имена.
+  И то же самое, если ты используешь дефайны, определённые другим модом.
+
+  Не используешь - напиши "Отсутствуют"
+-->
+
+### Используемые файлы, не содержащиеся в модпаке
+
+- `Отсутствуют`
+<!--
+  Будь то немодульный файл или модульный файл, который не содержится в папке,
+  принадлежащей этому конкретному моду, он должен быть упомянут здесь.
+  Хорошими примерами являются иконки или звуки, которые используются одновременно
+  несколькими модулями, или что-либо подобное.
+-->
+
+### Авторы:
+
+LordNest
+SurEugene
+Daeberdir
+UEDHighCommand
+
+При крайне необходимой моральной поддержке ксеномодераторов Imony и TheGrimArcadia
+<!--
+  Здесь находится твой никнейм
+  Если работал совместно - никнеймы тех, кто помогал.
+  В случае порта чего-либо должна быть ссылка на источник.
+-->

mods/resomi_fd/_resomi.dm

@@ -0,0 +1,2 @@
+/singleton/modpack/resomi
+	name = "Resomi Content"

mods/resomi_fd/_resomi.dme

@@ -0,0 +1,52 @@
+#ifndef MODPACK_RESOMI
+#define MODPACK_RESOMI
+
+#include "_resomi.dm"
+#include "code/unit_tests.dm"
+#include "code/body/abilities.dm"
+#include "code/body/emotes.dm"
+#include "code/body/organs.dm"
+#include "code/clothing/void/rigs.dm"
+#include "code/clothing/clothing.dm"
+#include "code/clothing/glasses.dm"
+#include "code/clothing/misc.dm"
+#include "code/clothing/shoes.dm"
+#include "code/clothing/suits.dm"
+#include "code/clothing/under.dm"
+#include "code/datum/_defines.dm"
+#include "code/datum/body.dm"
+#include "code/datum/gear.dm"
+#include "code/datum/language.dm"
+#include "code/datum/misc.dm"
+#include "code/datum/resomi_culture.dm"
+#include "code/datum/species.dm"
+
+#endif
+// BEGIN_INTERNALS
+// END_INTERNALS
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+// BEGIN_INCLUDE
+#include "_resomi.dm"
+#include "code\unit_tests.dm"
+#include "code\body\abilities.dm"
+#include "code\body\emotes.dm"
+#include "code\body\organs.dm"
+#include "code\clothing\clothing.dm"
+#include "code\clothing\glasses.dm"
+#include "code\clothing\misc.dm"
+#include "code\clothing\shoes.dm"
+#include "code\clothing\suits.dm"
+#include "code\clothing\under.dm"
+#include "code\clothing\void\rigs.dm"
+#include "code\datum\_defines.dm"
+#include "code\datum\body.dm"
+#include "code\datum\gear.dm"
+#include "code\datum\language.dm"
+#include "code\datum\misc.dm"
+#include "code\datum\resomi_culture.dm"
+#include "code\datum\species.dm"
+// END_INCLUDE