Removes datum redeclares (#23950)

* Removes datum redeclares

* conflicts

* thanks vsc

* compile fix
This commit is contained in:
GDN
2024-03-10 12:55:29 -05:00
committed by GitHub
parent 01226e123a
commit 6b5de292dc
72 changed files with 381 additions and 350 deletions
+57 -5
View File
@@ -1,7 +1,5 @@
/client
//////////////////////
//BLACK MAGIC THINGS//
//////////////////////
/// Client is casted to /datum so that we're able to use datum variables, search for clients through datums, and not need to duplicate code for GCing
parent_type = /datum
////////////////
//ADMIN THINGS//
@@ -41,7 +39,7 @@
//SECURITY//
////////////
///Used for limiting the rate of topic sends by the client to avoid abuse
/// Used for limiting the rate of topic sends by the client to avoid abuse
var/list/topiclimiter
// comment out the line below when debugging locally to enable the options & messages menu
@@ -137,12 +135,66 @@
/// The client's currently moused over datum, limited to movable and stored as UID
var/atom/movable/moused_over
/// A lazy list of atoms we've examined in the last RECENT_EXAMINE_MAX_WINDOW (default 2) seconds, so that we will call [/atom/proc/examine_more] instead of [/atom/proc/examine] on them when examining
/// A lazy list of atoms we've examined in the last RECENT_EXAMINE_MAX_WINDOW (default 2) seconds, so that we will call [/atom/proc/examine_more] instead of [/atom/proc/examine] on them when examining
var/list/recent_examines
/// When to next alert admins that mouse macro use was attempted
/// Used to throw an admin warning if someone used a mouse macro. Also stores the world time so we can send funny noises to them
var/next_mouse_macro_warning
/*
DEPRECIATED VIEWMODS
*/
/// Was used to handle view modifications. Now only used for a mecha module. Please just edit the string in the future
var/list/ViewMods = list()
/// Stores the viewmod we set using this system. Only used for a mecha module
var/ViewModsActive = FALSE
/// Stores the icon size we use for skins. As the server has control freak enabled, this is always static
var/ViewPreferedIconSize = 0
/// Basically a local variable on a client datum. Used when setting macros and nowhere else
var/list/macro_sets
/// List of all asset filenames sent to this client by the asset cache, along with their assoicated md5s
var/list/sent_assets = list()
/// List of all completed blocking send jobs awaiting acknowledgement by send_asset
var/list/completed_asset_jobs = list()
/*
ASSET SENDING
*/
/// The ID of the last asset job
var/last_asset_job = 0
/// The ID of the last asset job that was properly finished
var/last_completed_asset_job = 0
/*
PARALAX RELATED VARIABLES
*/
/// List of parallax layers a client is viewing. Accessed when paralax is updated
var/list/parallax_layers
/// A cached list of available parallax layers. This may potentially be changeable to a static variable. Updated upon changing parallax prefs
var/list/parallax_layers_cached
/// Added to parallax layers when parallax settings are changed
var/static/list/parallax_static_layers_tail = newlist(/atom/movable/screen/parallax_pmaster, /atom/movable/screen/parallax_space_whitifier)
/// Used with parallax to update the parallax offsets when the subsystem fires. Compared to the clients Eye variable
var/atom/movable/movingmob
/// Used with parallax to grab the offset needed. Uses the X and Y coords of the turf stored here
var/turf/previous_turf
/// Stored world.tim of the last parallax update. Used to make sure parallax isn't updated too often
var/last_parallax_shift
/// Deciseconds of added delay to parallax by client preferences
var/parallax_throttle = 0
/// The direction parallax will be moved it. References parallax_move_direction on areas
var/parallax_movedir = 0
/// The amount of parallax layers that will exist on your screen. Affected by the parallax preference
var/parallax_layers_max = 4
/// Handles how parallax loops in situations like shuttles leaving. Stores the timer that handles that
var/parallax_animate_timer
/// Used with the camera console to clear out the screen objects it adds to the client when the console is deleted
var/list/screen_maps = list()
/// Assigned say modal of the client
var/datum/tgui_say/tgui_say
-6
View File
@@ -7,12 +7,6 @@
/* Defines */
#define CUSTOM_VIEWRANGES list(1, 2, 3, 4, 5, 6, "RESET")
/* Viewmods */
/client
var/list/ViewMods = list()
var/ViewModsActive = FALSE
var/ViewPreferedIconSize = 0
/client/proc/AddViewMod(id, size)
var/datum/viewmod/V = new /datum/viewmod(id, size)
ViewMods[V.id] = V