diff --git a/GainStation13/icons/runtime/default_title.dmi b/GainStation13/icons/runtime/default_title.dmi new file mode 100644 index 0000000000..1ec48396e2 Binary files /dev/null and b/GainStation13/icons/runtime/default_title.dmi differ diff --git a/code/controllers/configuration/entries/respawns.dm b/code/controllers/configuration/entries/respawns.dm index 7c8e3b7789..accc07a909 100644 --- a/code/controllers/configuration/entries/respawns.dm +++ b/code/controllers/configuration/entries/respawns.dm @@ -1,28 +1,29 @@ +//GS13 - lot of changes were included here, mostly allowing people to respawn very easily, even as the same characters /// Allows usage of respawn system /datum/config_entry/flag/respawns_enabled - default = FALSE + default = TRUE /// Minutes before allowing respawns. /datum/config_entry/number/respawn_delay - default = 15.0 + default = 1.0 integer = FALSE /// Minutes before allowing respawn, if user cryo'd. /datum/config_entry/number/respawn_delay_cryo - default = 5.0 + default = 1.0 integer = FALSE /// Allows respawning as non-assistant. Overrides all others of this type. /datum/config_entry/flag/allow_non_assistant_respawn - default = FALSE + default = TRUE /// Allows respawning as a combat role, defined as security/head. /datum/config_entry/flag/allow_combat_role_respawn - default = FALSE + default = TRUE /// Allows respawning as the same character as a previous life /datum/config_entry/flag/allow_same_character_respawn - default = FALSE + default = TRUE /// Observing penalizes for respawns, not just joining. /datum/config_entry/flag/respawn_penalty_includes_observe @@ -30,7 +31,7 @@ /// Minutes from roundstart before someone can respawn /datum/config_entry/number/respawn_minimum_delay_roundstart - default = 30.0 + default = 1.0 integer = FALSE /// Gamemode config tags that are banned from respawning diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 1dbfb1540c..506276973e 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -32,7 +32,7 @@ SUBSYSTEM_DEF(title) file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]" if(!file_path) - file_path = "icons/runtime/default_title.dmi" + file_path = "GainStation13/icons/runtime/default_title.dmi" ASSERT(fexists(file_path)) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 8f9708f937..31cd734313 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -3,7 +3,7 @@ //- you should use istype() if you want to find out whether a floor has a certain type //- floor_tile is now a path, and not a tile obj name = "floor" - icon = 'icons/turf/floors.dmi' + icon = 'GainStation13/icons/turf/floors.dmi' //GS13 change (so our floors are used instead) baseturfs = /turf/open/floor/plating dirt_buildup_allowed = TRUE diff --git a/config/entries/gamemodes.txt b/config/entries/gamemodes.txt index 7193bef584..65f97a51a1 100644 --- a/config/entries/gamemodes.txt +++ b/config/entries/gamemodes.txt @@ -14,18 +14,18 @@ REPEATED_MODE_ADJUST 45 30 10 ## Default probablity is 1, increase to make that mode more likely to be picked. ## Set to 0 to disable that mode. -PROBABILITY TRAITOR 5 -PROBABILITY TRAITORBRO 2 -PROBABILITY TRAITORCHAN 4 -PROBABILITY INTERNAL_AFFAIRS 3 -PROBABILITY NUCLEAR 2 -PROBABILITY REVOLUTION 2 -PROBABILITY CULT 2 -PROBABILITY CHANGELING 2 -PROBABILITY WIZARD 4 +PROBABILITY TRAITOR 0 +PROBABILITY TRAITORBRO 0 +PROBABILITY TRAITORCHAN 0 +PROBABILITY INTERNAL_AFFAIRS 0 +PROBABILITY NUCLEAR 0 +PROBABILITY REVOLUTION 0 +PROBABILITY CULT 0 +PROBABILITY CHANGELING 0 +PROBABILITY WIZARD 0 PROBABILITY MONKEY 0 PROBABILITY METEOR 0 -PROBABILITY EXTENDED 0 +PROBABILITY EXTENDED 1 PROBABILITY SECRET_EXTENDED 0 PROBABILITY DEVIL 0 PROBABILITY DEVIL_AGENTS 0 @@ -169,7 +169,7 @@ BROTHER_OBJECTIVES_AMOUNT 2 ## Uncomment to prohibit jobs that start with loyalty ## implants from being most antagonists. -#PROTECT_ROLES_FROM_ANTAGONIST +PROTECT_ROLES_FROM_ANTAGONIST ## Uncomment to prohibit assistants from becoming most antagonists. #PROTECT_ASSISTANT_FROM_ANTAGONIST diff --git a/config/entries/general.txt b/config/entries/general.txt index b118d65621..7780746097 100644 --- a/config/entries/general.txt +++ b/config/entries/general.txt @@ -1,8 +1,8 @@ ## Lobby time: This is the amount of time between rounds that players have to setup their characters and be ready. -LOBBY_COUNTDOWN 120 +LOBBY_COUNTDOWN 180 ## Round End Time: This is the amount of time after the round ends that players have to murder death kill each other. -ROUND_END_COUNTDOWN 90 +ROUND_END_COUNTDOWN 120 ## period of time in seconds for players to be considered inactive # INACTIVITY_PERIOD 300 @@ -14,7 +14,7 @@ ROUND_END_COUNTDOWN 90 # KICK_INACTIVE ## Job slot open/close by identification consoles delay in seconds -ID_CONSOLE_JOBSLOT_DELAY 30 +ID_CONSOLE_JOBSLOT_DELAY 10 ## disables calling del(src) on newmobs if they logout before spawnin in @@ -163,13 +163,13 @@ MINIMAL_ACCESS_THRESHOLD 20 #JOBS_HAVE_MINIMAL_ACCESS ## Uncomment to give assistants maint access. -#ASSISTANTS_HAVE_MAINT_ACCESS +ASSISTANTS_HAVE_MAINT_ACCESS ## Uncoment to give security maint access. Note that if you dectivate JOBS_HAVE_MINIMAL_ACCESS security already gets maint from that. -#SECURITY_HAS_MAINT_ACCESS +SECURITY_HAS_MAINT_ACCESS ## Uncomment to give everyone maint access. -#EVERYONE_HAS_MAINT_ACCESS +EVERYONE_HAS_MAINT_ACCESS ## Comment this out this to make security officers spawn in departmental security posts SEC_START_BRIG @@ -177,7 +177,7 @@ SEC_START_BRIG ## GHOST INTERACTION ### ## Uncomment to let ghosts spin chairs. You may be wondering why this is a config option. Don't ask. -#GHOST_INTERACTION +GHOST_INTERACTION ## NON-VOCAL SILICONS ### ## Uncomment these to stop the AI, or cyborgs, from having vocal communication. @@ -279,7 +279,7 @@ ROUNDSTART_RACES human ROUNDSTART_RACES lizard ROUNDSTART_RACES synthliz #ROUNDSTART_RACES fly -#ROUNDSTART_RACES insect +ROUNDSTART_RACES insect ROUNDSTART_RACES plasmaman #ROUNDSTART_RACES shadow ROUNDSTART_RACES felinid @@ -302,7 +302,7 @@ ROUNDSTART_RACES ethereal #ROUNDSTART_RACES skeleton #ROUNDSTART_RACES zombie #ROUNDSTART_RACES slime -#ROUNDSTART_RACES pod +ROUNDSTART_RACES pod #ROUNDSTART_RACES military_synth #ROUNDSTART_RACES agent @@ -320,7 +320,7 @@ ROUNDSTART_RACES arachnid ##------------------------------------------------------------------------------------------- ## Uncomment to give players the choice of joining as a human with mutant bodyparts before they join the game -#JOIN_WITH_MUTANT_HUMANS +JOIN_WITH_MUTANT_HUMANS ##Overflow job. Default is assistant OVERFLOW_JOB Assistant @@ -385,13 +385,13 @@ BOMBCAP 20 ## a less lootfilled or smaller or less round effecting ruin costs less to ## spawn, while the converse is true. Alter this number to affect the amount ## of ruins. -LAVALAND_BUDGET 60 +LAVALAND_BUDGET 80 ## Ice Moon Budget ICEMOON_BUDGET 90 ## Space Ruin Budget -Space_Budget 16 +Space_Budget 20 ## Station Ruin Budget STATION_SPACE_BUDGET 10 @@ -408,13 +408,13 @@ ARRIVALS_SHUTTLE_DOCK_WINDOW 55 ## How many wirechewing rodents you want to spawn on exposed maintenane wires at the start of the round. You may wish to set this to 0 if you're testing powernets. -MICE_ROUNDSTART 10 +MICE_ROUNDSTART 5 ## If the percentage of players alive (doesn't count conversions) drops below this threshold the emergency shuttle will be forcefully called (provided it can be) #EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2 ## Determines if players are allowed to print integrated circuits, uncomment to allow. -#IC_PRINTING +IC_PRINTING ## Uncomment to allow roundstart quirk selection in the character setup menu. ## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait! @@ -442,10 +442,10 @@ NIGHTSHIFT_TOGGLE_PUBLIC_REQUIRES_AUTH #SHIFT_TIME_REALTIME ## A cap on how many monkeys may be created via monkey cubes -MONKEYCAP 64 +MONKEYCAP 32 ## A cap on how many mice can be bred via cheese wedges -RATCAP 64 +RATCAP 32 ## Enable the capitalist agenda on your server. ECONOMY @@ -465,7 +465,7 @@ BOX_RANDOM_ENGINE Box Tesla,3 BOX_RANDOM_ENGINE Box Singulo,3 BOX_RANDOM_ENGINE Box SM 1x3,1 BOX_RANDOM_ENGINE Box SM 5x5,1 -BOX_RANDOM_ENGINE Box SM 3x,0 +BOX_RANDOM_ENGINE Box SM 3x,1 BOX_RANDOM_ENGINE Box TEG,3 BOX_RANDOM_ENGINE Box Empty,0 BOX_RANDOM_ENGINE Box Antimatter,1 diff --git a/config/entries/movespeed.txt b/config/entries/movespeed.txt index 67f9ab503b..0b1d0e78f0 100644 --- a/config/entries/movespeed.txt +++ b/config/entries/movespeed.txt @@ -8,7 +8,7 @@ ## To speed things up make the number negative, to slow things down, make the number positive. ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied. -RUN_DELAY 1.5 +RUN_DELAY 1.2 WALK_DELAY 4 ## The variables below affect the movement of specific mob types. THIS AFFECTS ALL SUBTYPES OF THE TYPE YOU CHOOSE! diff --git a/config/entries/respawns.txt b/config/entries/respawns.txt index 41c76eaabc..95fd41a911 100644 --- a/config/entries/respawns.txt +++ b/config/entries/respawns.txt @@ -2,25 +2,25 @@ RESPAWNS_ENABLED ## Minutes delay before allowing respawns, either from death or observing. Not an integer. -RESPAWN_DELAY 10.0 +RESPAWN_DELAY 1.0 ## Minutes delay before allowing respawns, if the user cryo'd. Not an integer. -RESPAWN_DELAY_CRYO 5.0 +RESPAWN_DELAY_CRYO 1.0 ## Allow respawning as anything but an assistant. ALLOW_NON_ASSISTANT_RESPAWN ## Allow respawning as security and command. Only works if ALLOW_NON_ASSISTANT_RESPAWN is on. -# ALLOW_COMBAT_ROLE_RESPAWN +ALLOW_COMBAT_ROLE_RESPAWN ## Allow respawning as the same character -# ALLOW_SAME_CHARACTER_RESPAWN +ALLOW_SAME_CHARACTER_RESPAWN ## Observing is considered a respawn for the purposes of role lockouts. Defaults to disabled. When disabled, only RESPAWNING rather than returning from observer locks you out. RESPAWN_PENALTY_INCLUDES_OBSERVE ## Time in minutes from round start before respawn is enabled -RESPAWN_MINIMUM_DELAY_ROUNDSTART 30.0 +RESPAWN_MINIMUM_DELAY_ROUNDSTART 1.0 ## Gamemode (config tags!) banlist for respawn RESPAWN_CHAOS_GAMEMODES WIZARD diff --git a/config/entries/server.txt b/config/entries/server.txt index 0187c641ef..55e0a93ec3 100644 --- a/config/entries/server.txt +++ b/config/entries/server.txt @@ -2,14 +2,14 @@ #AUTO_PROFILE ## Server name: This appears at the top of the screen in-game and in the BYOND hub. Uncomment and replace 'tgstation' with the name of your choice. -# SERVERNAME tgstation +SERVERNAME General Station 13 ## Community short-name: This appears in parentheses after the server's active station name -# COMMUNITYSHORTNAME tg??? +COMMUNITYSHORTNAME GS13 ## Community link: Requires a community short-name defined. Attaches a link to the community's shortname, and requires a short-name defined. ## You could alternatively just add raw HTML to the above, but this is more newbie-friendly -# COMMUNITYLINK http://crouton.net +COMMUNITYLINK https://discord.gg/HHxHm6F ## Server tagline: This will appear right below the server's title. # SERVERTAGLINE A generic TG-based server @@ -21,7 +21,7 @@ # SERVERSQLNAME tgstation ## Station name: The name of the station as it is referred to in-game. If commented out, the game will generate a random name instead. -STATIONNAME Space Station 13 +STATIONNAME General Station 13 ## Put on byond hub: Uncomment this to put your server on the byond hub. #HUB @@ -35,7 +35,7 @@ TICK_LIMIT_MC_INIT 500 TICKLAG 0.5 ##Can also be set as per-second value, the following value is identical to the above. -#FPS 20 +#FPS 30 ## Set to prevent anyone but those ckeys listed in config/whitelist.txt and config/admins.txt from joining your server #USEWHITELIST @@ -81,4 +81,4 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60 ## Disallows roundstart gamemode voting if not null or uncommented ## Just input the gamemode lowercase in there, the thing will take a simple string for it ## Invalid gamemodes will default extended, have fun. -#FORCE_GAMEMODE +FORCE_GAMEMODE extended diff --git a/config/entries/vote.txt b/config/entries/vote.txt index 14c7c36a4e..057622cf90 100644 --- a/config/entries/vote.txt +++ b/config/entries/vote.txt @@ -12,7 +12,7 @@ VOTE_PERIOD 600 ## autovote initial delay (deciseconds) before first automatic transfer vote call (default 120 minutes) ## Set to 0 to disable the subsystem altogether. -VOTE_AUTOTRANSFER_INITIAL 72000 +VOTE_AUTOTRANSFER_INITIAL 0 ## autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes) VOTE_AUTOTRANSFER_INTERVAL 18000 @@ -64,4 +64,4 @@ MODETIER_VOTING DROPPED_MODES 3 ## Whether or not you must be readied up to vote gamemode -#MUST_BE_READIED_TO_VOTE_GAMEMODE +MUST_BE_READIED_TO_VOTE_GAMEMODE diff --git a/config/in_character_filter.txt b/config/in_character_filter.txt index 46df3fd60c..9c3db68394 100644 --- a/config/in_character_filter.txt +++ b/config/in_character_filter.txt @@ -2,6 +2,11 @@ # Words that will block in character chat messages from sending. # # Case is not important. Commented-out examples are listed below, just remove the "#". # ############################################################################################### -#lol -#omg -#wtf \ No newline at end of file +lol +omg +wtf +tbh +brb +gtfo +stfu +xd diff --git a/config/title_screens/images/title1.dmi b/config/title_screens/images/title1.dmi deleted file mode 100644 index de56de7ca7..0000000000 Binary files a/config/title_screens/images/title1.dmi and /dev/null differ diff --git a/config/title_screens/images/title2.dmi b/config/title_screens/images/title2.dmi deleted file mode 100644 index d5196c9ae0..0000000000 Binary files a/config/title_screens/images/title2.dmi and /dev/null differ diff --git a/config/title_screens/images/title3.dmi b/config/title_screens/images/title3.dmi deleted file mode 100644 index 1a5ae1ed7f..0000000000 Binary files a/config/title_screens/images/title3.dmi and /dev/null differ diff --git a/config/title_screens/images/title4.dmi b/config/title_screens/images/title4.dmi deleted file mode 100644 index 3f2d008161..0000000000 Binary files a/config/title_screens/images/title4.dmi and /dev/null differ diff --git a/config/title_screens/images/title5.dmi b/config/title_screens/images/title5.dmi deleted file mode 100644 index 9491274eda..0000000000 Binary files a/config/title_screens/images/title5.dmi and /dev/null differ