Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion code/controllers/subsystem/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ SUBSYSTEM_DEF(ticker)
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
to_chat(world, span_notice("<b>Welcome to [station_name()]!</b>"))
for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.current_map.map_name]!"), channel_tag)
if(SSticker.GetTimeLeft() == -10) // APOC EDIT CHANGE START - DISCORD
send2chat(new /datum/tgs_message_content("New round delayed. Thanks for playing Apocrypha XIII!"), channel_tag) // APOC EDIT CHANGE
else
send2chat(new /datum/tgs_message_content("<@&1474327242510303336> New round starting on [station_name()]!"), channel_tag)
// APOC EDIT CHANGE END
current_state = GAME_STATE_PREGAME
SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME)

Expand Down
3 changes: 2 additions & 1 deletion code/modules/discord/tgs_commands.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

/datum/tgs_chat_command/tgscheck/Run(datum/tgs_chat_user/sender, params)
var/server = CONFIG_GET(string/public_address) || CONFIG_GET(string/server)
// return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id] ([ROUND_TIME()]): " : "([ROUND_TIME()]): "]Players: [length(GLOB.clients.len)] (Active: [get_active_player_count(0,1,0)]), Map: [station_name()], Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting/Delayed"] -- Join now! [server]") // APOC EDIT CHANGE - DISCORD
return new /datum/tgs_message_content("[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.current_map.map_name]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [server ? server : "[world.internet_address]:[world.port]"]")

#warn fix this when the upstream pull is merged

Check warning on line 9 in code/modules/discord/tgs_commands.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

OD1201: #warn fix this when the upstream pull is merged

Check warning on line 9 in code/modules/discord/tgs_commands.dm

View workflow job for this annotation

GitHub Actions / Run Linters / linters

#warn fix this when the upstream pull is merged
/datum/tgs_chat_command/gameversion
name = "gameversion"
help_text = "Gets the version details from the show-server-revision verb, basically"
Expand Down
2 changes: 2 additions & 0 deletions config/apoc_config.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## NICE images for COOL discord users, seperated by commas i.e. BITE_IMG_LIST http://url/image.gif, http://url/image.png
# BITE_IMG_LIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/datum/config_entry/string/bite_img_list // APOC EDIT START
config_entry_value = "No bites for you."
11 changes: 11 additions & 0 deletions modular_zapoc/modules/discord/tgs_commands.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// APOC EDIT START - obviously // fangfuckies :3
/datum/tgs_chat_command/fangfuckies // Friend
name = "fangfuckies"
help_text = "Posts a random biting gif (0.1% chance for an ultra-rare bonus gif.)"

/datum/tgs_chat_command/fangfuckies/Run(datum/tgs_chat_user/sender, params)
var/random_image = splittext(CONFIG_GET(string/bite_img_list), ", ") // comma + space delimiter
if(prob(0.1))
return new /datum/tgs_message_content("https://images2.imgbox.com/de/57/LouUHBzY_o.gif") // sneefer

return new /datum/tgs_message_content("[pick(random_image)]")
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// DM Environment file for tgstation.dme.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\objs\dwelling_window_defs.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\areas\area_dwelling_instances.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\area_dwelling.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\obj_dwelling.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\dwelling\code\_dwelling_gvars_defines.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\latejoin_antagonists\code\latejoin_subsystem.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\economy\code\stocks_license.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\powers\code\discipline\mytherceria.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\powers\code\discipline\healer_valeren.dm.

Check failure on line 1 in tgstation.dme

View workflow job for this annotation

GitHub Actions / Run Linters / linters

Ticked File Enforcement

Missing include for modular_darkpack\modules\drugs\code\bloodpacks\bloodpack_adulteration.dm.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.

Expand Down Expand Up @@ -7879,6 +7879,7 @@
#include "modular_darkpack\modules\westfield_mall\code\modular_rooms.dm"
#include "modular_darkpack\modules\z_travel\code\manhole.dm"
#include "modular_darkpack\modules\z_travel\code\transfer_point.dm"
#include "modular_zapoc\master_files\code\controllers\configuration\entries\general.dm"
#include "modular_zapoc\master_files\code\game\objects\structures\stairs.dm"
#include "modular_zapoc\modules\areas\code\areas.dm"
#include "modular_zapoc\modules\areas\code\voivodate.dm"
Expand All @@ -7897,6 +7898,7 @@
#include "modular_zapoc\modules\decor\code\man_crystal.dm"
#include "modular_zapoc\modules\decor\code\superhigh_railing.dm"
#include "modular_zapoc\modules\decor\code\torch.dm"
#include "modular_zapoc\modules\discord\tgs_commands.dm"
#include "modular_zapoc\modules\gray_masses\code\gray_core.dm"
#include "modular_zapoc\modules\gray_masses\code\gray_man.dm"
#include "modular_zapoc\modules\gray_masses\code\tall_gray_man.dm"
Expand Down
Loading