Revert "FD Resomi mod"

This reverts commit 28ab69f.
RepoStash · Jun 7, 2024 · 18063f5 · 18063f5
1 parent 28ab69f
commit 18063f5
Show file tree

Hide file tree

Showing 52 changed files with 55 additions and 2,588 deletions.
diff --git a/config/example/config.txt b/config/example/config.txt
@@ -1,5 +1,5 @@
-## 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
+## Server name: This appears at the top of the screen in-game and on hub listings.
+# SERVER_NAME Space Station 13
 
 ## Game Version: The archetype of the server for topic status requests. Unless significantly deviated, avoid changing this. Default Baystation12
 # GAME_VERSION Baystation12
@@ -31,9 +31,6 @@ 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
 
@@ -49,6 +46,9 @@ 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,6 +135,13 @@ 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
@@ -143,9 +150,17 @@ 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
 
@@ -216,15 +231,6 @@ 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
 
@@ -261,6 +267,12 @@ 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
 
@@ -325,8 +337,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
 
-## 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
+## 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
 
 ## 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
@@ -439,12 +451,6 @@ 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
@@ -454,3 +460,21 @@ 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
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
@@ -22,4 +22,11 @@ PASSWORD mypassword
 # The following information is for feedback tracking via the blackbox server
 FEEDBACK_DATABASE test
 FEEDBACK_LOGIN mylogin
-FEEDBACK_PASSWORD mypassword
+FEEDBACK_PASSWORD mypassword
+
+
+###################################################################
+#                            SIERRABAY                            #
+###################################################################
+
+UTILITY_DATABASE tgstation
diff --git a/config/names/first_male.txt b/config/names/first_male.txt
@@ -85,7 +85,7 @@ Godwin
 Goodwin
 Gordon
 Graeme
-Grandpa
+Grandax
 Gratian
 Grendel
 Han

diff --git a/maps/torch_fd/fd_torch.dm b/maps/torch_fd/fd_torch.dm
@@ -228,7 +228,6 @@
 	#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"

diff --git a/mods/resomi_fd/README.md b/mods/resomi_fd/README.md
diff --git a/mods/resomi_fd/_resomi.dm b/mods/resomi_fd/_resomi.dm
diff --git a/mods/resomi_fd/_resomi.dme b/mods/resomi_fd/_resomi.dme