Skip to content

Add TgChat; Refactor Shit; God Help Us All #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Apr 14, 2025
Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@ libaux*.so
!libmariadb.so
aux*.pdb

# byond-tracy, we intentionally do not ship this and do not want to maintain it
# https://github.com/mafemergency/byond-tracy/
prof.dll
libprof.so

# JavaScript tools
**/node_modules

Expand Down
95 changes: 88 additions & 7 deletions cev_eris.dme
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
// DM Environment file for cev_eris.dme.
// 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.

// This should always be the VERY FIRST THING. No exceptions. Read the file for more info, but basically, this needs to be here so that we can ensure specific code is always the very first thing to execute.
#include "code\genesis_call.dme"
// Again, DO NOT MOVE IT OR ALLOW ANY OTHER #include TO PRECEDE THE ONE ABOVE.

// BEGIN_INTERNALS
// END_INTERNALS
// BEGIN_FILE_DIR
Expand All @@ -8,24 +16,26 @@
// END_PREFERENCES
// BEGIN_INCLUDE
#include "code\_compile_options.dm"
#include "code\_debugger.dm"
#include "code\client_macros.dm"
#include "code\global.dm"
#include "code\hub.dm"
#include "code\stylesheet.dm"
#include "code\world.dm"
#include "code\__DEFINES\_bitfields.dm"
#include "code\__DEFINES\_compile_options.dm"
#include "code\__DEFINES\_globals.dm"
#include "code\__DEFINES\_helpers.dm"
#include "code\__DEFINES\_hydro_setup.dm"
#include "code\__DEFINES\_planes+layers.dm"
#include "code\__DEFINES\admin.dm"
#include "code\__DEFINES\appearance.dm"
#include "code\__DEFINES\assets.dm"
#include "code\__DEFINES\atmos.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\chat.dm"
#include "code\__DEFINES\chemistry.dm"
#include "code\__DEFINES\colors.dm"
#include "code\__DEFINES\configuration.dm"
#include "code\__DEFINES\construction.dm"
#include "code\__DEFINES\cooking.dm"
#include "code\__DEFINES\cooldowns.dm"
Expand All @@ -35,16 +45,19 @@
#include "code\__DEFINES\economy.dm"
#include "code\__DEFINES\error_handler.dm"
#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\fonts.dm"
#include "code\__DEFINES\gamemode.dm"
#include "code\__DEFINES\holomap.dm"
#include "code\__DEFINES\html_assistant.dm"
#include "code\__DEFINES\interaction_particles.dm"
#include "code\__DEFINES\inventory_sizes.dm"
#include "code\__DEFINES\is_helpers.dm"
#include "code\__DEFINES\item_aspects.dm"
#include "code\__DEFINES\items.dm"
#include "code\__DEFINES\items_clothing.dm"
#include "code\__DEFINES\jobs.dm"
#include "code\__DEFINES\lighting.dm"
#include "code\__DEFINES\logging.dm"
#include "code\__DEFINES\lrange_scanner.dm"
#include "code\__DEFINES\machinery.dm"
#include "code\__DEFINES\map.dm"
Expand All @@ -60,6 +73,7 @@
#include "code\__DEFINES\overmap.dm"
#include "code\__DEFINES\perf_test.dm"
#include "code\__DEFINES\perks.dm"
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\process_scheduler.dm"
#include "code\__DEFINES\projectile_defines.dm"
#include "code\__DEFINES\protect.dm"
Expand All @@ -69,14 +83,18 @@
#include "code\__DEFINES\rust_g.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
#include "code\__DEFINES\sanity.dm"
#include "code\__DEFINES\say.dm"
#include "code\__DEFINES\shields.dm"
#include "code\__DEFINES\spaceman_dmm.dm"
#include "code\__DEFINES\span.dm"
#include "code\__DEFINES\species_languages.dm"
#include "code\__DEFINES\speech_channels.dm"
#include "code\__DEFINES\stack_trace.dm"
#include "code\__DEFINES\storyteller_defines.dm"
#include "code\__DEFINES\subsystems-priority.dm"
#include "code\__DEFINES\subsystems.dm"
#include "code\__DEFINES\targeting.dm"
#include "code\__DEFINES\text.dm"
#include "code\__DEFINES\tgs.config.dm"
#include "code\__DEFINES\tgs.dm"
#include "code\__DEFINES\tgui.dm"
Expand All @@ -89,24 +107,26 @@
#include "code\__DEFINES\typeids.dm"
#include "code\__DEFINES\verb_manager.dm"
#include "code\__DEFINES\weapons.dm"
#include "code\__DEFINES\world.dm"
#include "code\__DEFINES\ZAS.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals.dm"
#include "code\__DEFINES\dcs\signals\signals_tgui.dm"
#include "code\__DEFINES\spawner\_spawner.dm"
#include "code\__DEFINES\spawner\excelsior.dm"
#include "code\__DEFINES\spawner\frozen_star.dm"
#include "code\__HELPERS\_global_lists.dm"
#include "code\__HELPERS\_global_objects.dm"
#include "code\__HELPERS\_lists.dm"
#include "code\__HELPERS\_logging.dm"
#include "code\__HELPERS\antag.dm"
#include "code\__HELPERS\areas.dm"
#include "code\__HELPERS\artwork_names.dm"
#include "code\__HELPERS\atmospherics.dm"
#include "code\__HELPERS\atom_movables.dm"
#include "code\__HELPERS\atoms.dm"
#include "code\__HELPERS\bluespace_entropy.dm"
#include "code\__HELPERS\chat_filters.dm"
#include "code\__HELPERS\cmp.dm"
#include "code\__HELPERS\delays.dm"
#include "code\__HELPERS\files.dm"
Expand All @@ -116,25 +136,46 @@
#include "code\__HELPERS\manifest.dm"
#include "code\__HELPERS\matrices.dm"
#include "code\__HELPERS\mobs.dm"
#include "code\__HELPERS\nameof.dm"
#include "code\__HELPERS\names.dm"
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\spawn_sync.dm"
#include "code\__HELPERS\stack_trace.dm"
#include "code\__HELPERS\text.dm"
#include "code\__HELPERS\time.dm"
#include "code\__HELPERS\type_processing.dm"
#include "code\__HELPERS\turfs.dm"
#include "code\__HELPERS\type2type.dm"
#include "code\__HELPERS\unsorted.dm"
#include "code\__HELPERS\vector.dm"
#include "code\__HELPERS\verbs.dm"
#include "code\__HELPERS\view.dm"
#include "code\__HELPERS\logging\_logging.dm"
#include "code\__HELPERS\logging\admin.dm"
#include "code\__HELPERS\logging\attack.dm"
#include "code\__HELPERS\logging\debug.dm"
#include "code\__HELPERS\logging\economy.dm"
#include "code\__HELPERS\logging\game.dm"
#include "code\__HELPERS\logging\manifest.dm"
#include "code\__HELPERS\logging\mobs.dm"
#include "code\__HELPERS\logging\pda.dm"
#include "code\__HELPERS\logging\talk.dm"
#include "code\__HELPERS\logging\ui.dm"
#include "code\__HELPERS\sorts\sort_instance.dm"
#include "code\__HELPERS\sorts\helpers.dm"
#include "code\_global_vars\_regexes.dm"
#include "code\_datastructures\path_node.dm"
#include "code\_datastructures\priority_queue.dm"
#include "code\_global_vars\bitfields.dm"
#include "code\_datastructures\stack.dm"
#include "code\_global_vars\configuration.dm"
#include "code\_global_vars\logging.dm"
#include "code\_global_vars\mapping.dm"
#include "code\_global_vars\misc.dm"
#include "code\_global_vars\names.dm"
#include "code\_global_vars\time_vars.dm"
#include "code\_global_vars\lists\flavor.dm"
#include "code\_global_vars\lists\icons.dm"
#include "code\_global_vars\lists\mapping.dm"
#include "code\_global_vars\lists\names.dm"
#include "code\_onclick\adjacent.dm"
Expand Down Expand Up @@ -204,7 +245,6 @@
#include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm"
#include "code\controllers\admin.dm"
#include "code\controllers\communications.dm"
#include "code\controllers\configuration.dm"
#include "code\controllers\controller.dm"
#include "code\controllers\failsafe.dm"
#include "code\controllers\globals.dm"
Expand All @@ -213,6 +253,15 @@
#include "code\controllers\master.dm"
#include "code\controllers\subsystem.dm"
#include "code\controllers\verbs.dm"
#include "code\controllers\configuration\config_entry.dm"
#include "code\controllers\configuration\configuration.dm"
#include "code\controllers\configuration\entries\comms.dm"
#include "code\controllers\configuration\entries\dbconfig.dm"
#include "code\controllers\configuration\entries\game_options.dm"
#include "code\controllers\configuration\entries\general.dm"
#include "code\controllers\configuration\entries\ip.dm"
#include "code\controllers\configuration\entries\resources.dm"
#include "code\controllers\configuration\entries\tts.dm"
#include "code\controllers\evacuation\evacuation.dm"
#include "code\controllers\evacuation\evacuation_eta.dm"
#include "code\controllers\evacuation\evacuation_helpers.dm"
Expand All @@ -224,6 +273,7 @@
#include "code\controllers\evacuation\~evac.dm"
#include "code\controllers\subsystems\air.dm"
#include "code\controllers\subsystems\alarm.dm"
#include "code\controllers\subsystems\asset_loading.dm"
#include "code\controllers\subsystems\assets.dm"
#include "code\controllers\subsystems\atoms.dm"
#include "code\controllers\subsystems\chat.dm"
Expand All @@ -249,6 +299,7 @@
#include "code\controllers\subsystems\misc.dm"
#include "code\controllers\subsystems\pai.dm"
#include "code\controllers\subsystems\ping.dm"
#include "code\controllers\subsystems\plants.dm"
#include "code\controllers\subsystems\radio.dm"
#include "code\controllers\subsystems\research.dm"
#include "code\controllers\subsystems\shuttle.dm"
Expand All @@ -267,11 +318,13 @@
#include "code\controllers\subsystems\vote.dm"
#include "code\controllers\subsystems\wireless.dm"
#include "code\controllers\subsystems\initialization\character_setup.dm"
#include "code\controllers\subsystems\processing\cwj.dm"
#include "code\controllers\subsystems\processing\humans.dm"
#include "code\controllers\subsystems\processing\mobs.dm"
#include "code\controllers\subsystems\processing\nano.dm"
#include "code\controllers\subsystems\processing\objs.dm"
#include "code\controllers\subsystems\processing\processing.dm"
#include "code\controllers\subsystems\processing\reagents.dm"
#include "code\controllers\subsystems\processing\turf.dm"
#include "code\controllers\subsystems\processing\organs\internal_wounds.dm"
#include "code\controllers\subsystems\tickets\mentor_tickets.dm"
Expand All @@ -285,6 +338,7 @@
#include "code\datums\browser.dm"
#include "code\datums\callback.dm"
#include "code\datums\category.dm"
#include "code\datums\chat_payload.dm"
#include "code\datums\contract.dm"
#include "code\datums\datacore.dm"
#include "code\datums\datum.dm"
Expand All @@ -293,6 +347,7 @@
#include "code\datums\footsteps.dm"
#include "code\datums\gps_data.dm"
#include "code\datums\hierarchy.dm"
#include "code\datums\interaction_particle.dm"
#include "code\datums\licences.dm"
#include "code\datums\lobbyscreen.dm"
#include "code\datums\loot_spawner.dm"
Expand Down Expand Up @@ -1466,10 +1521,18 @@
#include "code\modules\asset_cache\asset_cache_item.dm"
#include "code\modules\asset_cache\asset_list.dm"
#include "code\modules\asset_cache\asset_list_items.dm"
#include "code\modules\asset_cache\assets\chat.dm"
#include "code\modules\asset_cache\assets\icon_ref_map.dm"
#include "code\modules\asset_cache\assets\sanity.dm"
#include "code\modules\asset_cache\assets\sheetmaterials.dm"
#include "code\modules\asset_cache\assets\stats.dm"
#include "code\modules\asset_cache\assets\tgfont.dm"
#include "code\modules\asset_cache\assets\tgui.dm"
#include "code\modules\asset_cache\spritesheet\batched\batched_spritesheet.dm"
#include "code\modules\asset_cache\spritesheet\batched\universal_icon.dm"
#include "code\modules\asset_cache\spritesheet\legacy\legacy_spritesheet.dm"
#include "code\modules\asset_cache\transports\asset_transport.dm"
#include "code\modules\asset_cache\transports\webroot_transport.dm"
#include "code\modules\biomatter_manipulation\biogenerator.dm"
#include "code\modules\biomatter_manipulation\solidifier.dm"
#include "code\modules\biomatter_manipulation\toxic_biomass.dm"
Expand Down Expand Up @@ -1539,6 +1602,7 @@
#include "code\modules\client\preference_setup\matchmaking\relations.dm"
#include "code\modules\client\preference_setup\matchmaking\relations_types.dm"
#include "code\modules\client\preference_setup\occupation\occupation.dm"
#include "code\modules\client\verbs\typing.dm"
#include "code\modules\clothing\chameleon.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\clothing_accessories.dm"
Expand Down Expand Up @@ -1630,7 +1694,6 @@
#include "code\modules\clothing\underwear\base.dm"
#include "code\modules\cooking_with_jane\cooking.dm"
#include "code\modules\cooking_with_jane\cooking_catalog.dm"
#include "code\modules\cooking_with_jane\cooking_init.dm"
#include "code\modules\cooking_with_jane\cooking_tracker.dm"
#include "code\modules\cooking_with_jane\food_overrides.dm"
#include "code\modules\cooking_with_jane\step_defines.dm"
Expand Down Expand Up @@ -1681,6 +1744,8 @@
#include "code\modules\core_implant\cruciform\rituals\inquisitor.dm"
#include "code\modules\core_implant\cruciform\rituals\machinery.dm"
#include "code\modules\core_implant\cruciform\rituals\priest.dm"
#include "code\modules\debugging\debugger.dm"
#include "code\modules\debugging\tracy.dm"
#include "code\modules\detectivework\footprints.dm"
#include "code\modules\detectivework\forensics.dm"
#include "code\modules\detectivework\microscope\dnascanner.dm"
Expand Down Expand Up @@ -1743,8 +1808,6 @@
#include "code\modules\genetics\stationary_scanner.dm"
#include "code\modules\genetics\stationary_scanner_console.dm"
#include "code\modules\ghosttrap\trap.dm"
#include "code\modules\goonchat\browserOutput.dm"
#include "code\modules\goonchat\helpers.dm"
#include "code\modules\hivemind\core.dm"
#include "code\modules\hivemind\machines.dm"
#include "code\modules\hivemind\mobs.dm"
Expand All @@ -1762,7 +1825,6 @@
#include "code\modules\hydroponics\grown_inedible.dm"
#include "code\modules\hydroponics\grown_predefined.dm"
#include "code\modules\hydroponics\seed.dm"
#include "code\modules\hydroponics\seed_controller.dm"
#include "code\modules\hydroponics\seed_datums.dm"
#include "code\modules\hydroponics\seed_gene_presets.dm"
#include "code\modules\hydroponics\seed_machines.dm"
Expand All @@ -1789,6 +1851,18 @@
#include "code\modules\lighting\lighting_setup.dm"
#include "code\modules\lighting\lighting_source.dm"
#include "code\modules\lighting\lighting_turf.dm"
#include "code\modules\logging\log_category.dm"
#include "code\modules\logging\log_entry.dm"
#include "code\modules\logging\log_holder.dm"
#include "code\modules\logging\categories\log_category_admin.dm"
#include "code\modules\logging\categories\log_category_compats.dm"
#include "code\modules\logging\categories\log_category_debug.dm"
#include "code\modules\logging\categories\log_category_game.dm"
#include "code\modules\logging\categories\log_category_internal.dm"
#include "code\modules\logging\categories\log_category_misc.dm"
#include "code\modules\logging\categories\log_category_pda.dm"
#include "code\modules\logging\categories\log_category_target_zone_switch.dm"
#include "code\modules\logging\categories\log_category_uplink.dm"
#include "code\modules\long_range_scanner\hull.dm"
#include "code\modules\long_range_scanner\long_range_scanner.dm"
#include "code\modules\maps\dmm_suite.dm"
Expand Down Expand Up @@ -2753,19 +2827,26 @@
#include "code\modules\telesci\telesci_computer.dm"
#include "code\modules\text_to_speech\tts_html.dm"
#include "code\modules\text_to_speech\tts_main.dm"
#include "code\modules\tgchat\message.dm"
#include "code\modules\tgchat\to_chat.dm"
#include "code\modules\tgs\includes.dm"
#include "code\modules\tgui\external.dm"
#include "code\modules\tgui\states.dm"
#include "code\modules\tgui\status_composers.dm"
#include "code\modules\tgui\tgui.dm"
#include "code\modules\tgui\tgui_window.dm"
#include "code\modules\tgui\states\admin.dm"
#include "code\modules\tgui\states\always.dm"
#include "code\modules\tgui\states\hands.dm"
#include "code\modules\tgui\states\holoposter.dm"
#include "code\modules\tgui\states\machinery.dm"
#include "code\modules\tgui\states\notcontained.dm"
#include "code\modules\tgui_input\alert.dm"
#include "code\modules\tgui_input\list.dm"
#include "code\modules\tgui_panel\audio.dm"
#include "code\modules\tgui_panel\external.dm"
#include "code\modules\tgui_panel\telemetry.dm"
#include "code\modules\tgui_panel\tgui_panel.dm"
#include "code\modules\tips_and_tricks\gameplay.dm"
#include "code\modules\tips_and_tricks\jobs.dm"
#include "code\modules\tips_and_tricks\mobs.dm"
Expand Down
6 changes: 3 additions & 3 deletions code/ZAS/Airflow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,15 @@ Contains helper procs for airflow, handled in /connection_group.
airflow_dest = null

/mob/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
for(var/mob/M in hearers(get_turf(src)))
M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
var/weak_amt = istype(A,/obj/item) ? A:w_class : rand(ITEM_SIZE_TINY,ITEM_SIZE_HUGE) //Heheheh
Weaken(weak_amt)
. = ..()

/obj/airflow_hit(atom/A)
for(var/mob/M in hearers(src))
for(var/mob/M in hearers(get_turf(src)))
M.show_message(span_danger("\The [src] slams into \a [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src.loc, "smash.ogg", 25, 1, -1)
. = ..()
Expand All @@ -219,7 +219,7 @@ Contains helper procs for airflow, handled in /connection_group.
airflow_dest = null

/mob/living/carbon/human/airflow_hit(atom/A)
// for(var/mob/M in hearers(src))
// for(var/mob/M in hearers(get_turf(src)))
// M.show_message(span_danger("[src] slams into [A]!"),1,span_danger("You hear a loud slam!"),2)
playsound(src.loc, "punch", 25, 1, -1)
if (prob(33))
Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/_bitfields.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#define DEFINE_BITFIELD(_variable, _flags) /datum/bitfield/##_variable { \
flags = ##_flags; \
variable = #_variable; \
}
Loading
Loading