Skip to content
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

Revert "feat(TGUI Stat Panel): we are doomed" #11253

Merged
merged 1 commit into from
Dec 20, 2023
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "code\__defines\__initialization.dm"
#include "code\__defines\__qdel.dm"
#include "code\__defines\__renderer.dm"
#include "code\__defines\_click.dm"
#include "code\__defines\_compile_options.dm"
#include "code\__defines\_economy_defines.dm"
#include "code\__defines\_render.dm"
Expand All @@ -34,7 +33,6 @@
#include "code\__defines\atmos.dm"
#include "code\__defines\atmospherics.dm"
#include "code\__defines\borer.dm"
#include "code\__defines\byond_compat.dm"
#include "code\__defines\callback.dm"
#include "code\__defines\chat.dm"
#include "code\__defines\chemistry.dm"
Expand Down Expand Up @@ -73,7 +71,6 @@
#include "code\__defines\preferences.dm"
#include "code\__defines\proc_presets.dm"
#include "code\__defines\process_scheduler.dm"
#include "code\__defines\procpath.dm"
#include "code\__defines\radiation.dm"
#include "code\__defines\research.dm"
#include "code\__defines\shields.dm"
Expand All @@ -89,7 +86,6 @@
#include "code\__defines\topic.dm"
#include "code\__defines\traits.dm"
#include "code\__defines\turfs.dm"
#include "code\__defines\verbs.dm"
#include "code\__defines\virus.dm"
#include "code\__defines\warnings.dm"
#include "code\__defines\xenoarcheaology.dm"
Expand Down Expand Up @@ -251,7 +247,6 @@
#include "code\controllers\subsystems\radiation.dm"
#include "code\controllers\subsystems\shuttle.dm"
#include "code\controllers\subsystems\skybox.dm"
#include "code\controllers\subsystems\statpanel.dm"
#include "code\controllers\subsystems\sun.dm"
#include "code\controllers\subsystems\supply.dm"
#include "code\controllers\subsystems\tgui.dm"
Expand All @@ -273,7 +268,6 @@
#include "code\controllers\subsystems\processing\mobs.dm"
#include "code\controllers\subsystems\processing\movable_physics.dm"
#include "code\controllers\subsystems\processing\nano.dm"
#include "code\controllers\subsystems\processing\obj_tab_items.dm"
#include "code\controllers\subsystems\processing\processing.dm"
#include "code\controllers\subsystems\processing\projectiles.dm"
#include "code\controllers\subsystems\processing\think.dm"
Expand Down Expand Up @@ -318,7 +312,6 @@
#include "code\datums\communication\~defines.dm"
#include "code\datums\components\_component.dm"
#include "code\datums\components\cardborg.dm"
#include "code\datums\components\connect_mob_behalf.dm"
#include "code\datums\components\label.dm"
#include "code\datums\components\mind_linker.dm"
#include "code\datums\components\movable_physics.dm"
Expand Down
2 changes: 0 additions & 2 deletions code/__defines/MC.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
Master.current_ticklimit = original_tick_limit;\
}

#define MAPTICK_LAST_TICK_USAGE world.map_cpu

// Used to smooth out costs to try and avoid oscillation.
#define MC_AVERAGE_FAST(average, current) (0.7 * (average) + 0.3 * (current))
#define MC_AVERAGE(average, current) (0.8 * (average) + 0.2 * (current))
Expand Down
45 changes: 0 additions & 45 deletions code/__defines/_click.dm

This file was deleted.

3 changes: 0 additions & 3 deletions code/__defines/admin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,3 @@
#define TICKET_CLOSED 0 // Ticket has been resolved or declined
#define TICKET_OPEN 1 // Ticket has been created, but not responded to
#define TICKET_ASSIGNED 2 // An admin has assigned themself to the ticket and will respond

#define ADMIN_JMP(src) "(<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)"
#define COORD(src) "[src ? src.Admin_Coordinates_Readable() : "nonexistent location"]"
57 changes: 0 additions & 57 deletions code/__defines/byond_compat.dm

This file was deleted.

3 changes: 0 additions & 3 deletions code/__defines/ces/signals_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@

// Called on '/mob/proc/add_spell' (/mob, )
#define SIGNAL_MOB_SPELL_LEARNED "mob_spell_learned"

/// from mob/get_status_tab_items(): (list/items)
#define SIGNAL_MOB_GET_STATUS_TAB_ITEMS "mob_get_status_tab_items"
18 changes: 7 additions & 11 deletions code/__defines/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,20 @@
#define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (istype(I, /client) ? I : (istype(I, /datum/mind) ? I:current?:client : null)))
#define GRAYSCALE list(0.3,0.3,0.3,0,0.59,0.59,0.59,0,0.11,0.11,0.11,0,0,0,0,1,0,0,0,0)

#define ADD_VERB_IN(the_atom,time,verb) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), verb), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
#define ADD_VERB_IN_IF(the_atom,time,verb,callback) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), verb, callback), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
#define ADD_VERB_IN(the_atom,time,verb) addtimer(CALLBACK(the_atom, nameof(/atom.proc/add_verb), verb), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
#define ADD_VERB_IN_IF(the_atom,time,verb,callback) addtimer(CALLBACK(the_atom, nameof(/atom.proc/add_verb), verb, callback), time, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)

//Wiki book styles
#define WIKI_FULL 1 // This is a standart web page. Beware, navigaton throw the internet is allowed!
#define WIKI_MINI 2 // This is a beautiful copy of wiki topic. Beware, font is really small!
#define WIKI_MOBILE 3 // This is a highly visible variantion. Beware, decoration elements are lost!
#define WIKI_TEXT 4 // This is a distorted version. Everything is lost except unformatted text!

//https://secure.byond.com/docs/ref/info.html#/atom/var/mouse_opacity
#define MOUSE_OPACITY_TRANSPARENT 0
#define MOUSE_OPACITY_ICON 1
#define MOUSE_OPACITY_OPAQUE 2

//How pulling an object affects mob's movement speed.
#define PULL_SLOWDOWN_WEIGHT -1 // Default value, slowdown's handled by an object's w_class.
#define PULL_SLOWDOWN_EXTREME 4.5
Expand Down Expand Up @@ -312,12 +317,3 @@

// Shortcut for image_repository.overlay_image(...)
#define OVERLAY(args...) image_repository.overlay_image(args)

// Defines for formatting cooldown actions for the stat panel.
/// The stat panel the action is displayed in.
#define PANEL_DISPLAY_PANEL "panel"
/// The status shown in the stat panel.
/// Can be stuff like "ready", "on cooldown", "active", "charges", "charge cost", etc.
#define PANEL_DISPLAY_STATUS "status"
/// The name shown in the stat panel.
#define PANEL_DISPLAY_NAME "name"
26 changes: 0 additions & 26 deletions code/__defines/procpath.dm

This file was deleted.

1 change: 0 additions & 1 deletion code/__defines/subsystem-priority.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

// SS_TICKER
#define SS_PRIORITY_CHAT 100
#define SS_PRIORITY_STATPANELS 95 // Statpanels.
#define SS_PRIORITY_THINK 90 // Datums thinking.
#define SS_PRIORITY_OVERLAYS 20
#define SS_PRIORITY_ICON_UPDATE 10 // Queued icon updates. Mostly used by APCs and tables.
Expand Down
1 change: 0 additions & 1 deletion code/__defines/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
// Subsystems shutdown in the reverse of the order they initialize in
// The numbers just define the ordering, they are meaningless otherwise.

#define SS_INIT_MISC_FIRST 25
#define SS_INIT_GARBAGE 16
#define SS_INIT_EAMS 15
#define SS_INIT_CHAR_SETUP 14
Expand Down
93 changes: 0 additions & 93 deletions code/__defines/verbs.dm

This file was deleted.

15 changes: 0 additions & 15 deletions code/_helpers/files.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,3 @@
for(var/file in .)
if(copytext("[file]", -1) == "/")
. -= file

/// Returns the md5 of a file at a given path.
/proc/md5filepath(path)
. = md5(file(path))

/// Save file as an external file then md5 it.
/// Used because md5ing files stored in the rsc sometimes gives incorrect md5 results.
/proc/md5asfile(file)
var/static/notch = 0
// its importaint this code can handle md5filepath sleeping instead of hard blocking, if it's converted to use rust_g.
var/filename = "tmp/md5asfile.[world.realtime].[world.timeofday].[world.time].[world.tick_usage].[notch]"
notch = Wrap(notch+1, 0, 2**15)
fcopy(file, filename)
. = md5filepath(filename)
fdel(filename)
Loading
Loading