mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 16:44:43 +01:00
Grep for space indentation (#54850)
#54604 atomizing Since a lot of the space indents are in lists ill atomize those later
This commit is contained in:
TiviPlus
@@ -4,17 +4,17 @@
|
||||
#define PRIORITY_LOW 1000
|
||||
|
||||
/**
|
||||
* Client Colour Priority System By RemieRichards (then refactored by another contributor)
|
||||
* A System that gives finer control over which client.colour value to display on screen
|
||||
* so that the "highest priority" one is always displayed as opposed to the default of
|
||||
* "whichever was set last is displayed".
|
||||
*
|
||||
* Refactored to allow multiple overlapping client colours
|
||||
* (e.g. wearing blue glasses under a yellow visor, even though the result is a little unsatured.)
|
||||
* As well as some support for animated colour transitions.
|
||||
*
|
||||
* Define subtypes of this datum
|
||||
*/
|
||||
* Client Colour Priority System By RemieRichards (then refactored by another contributor)
|
||||
* A System that gives finer control over which client.colour value to display on screen
|
||||
* so that the "highest priority" one is always displayed as opposed to the default of
|
||||
* "whichever was set last is displayed".
|
||||
*
|
||||
* Refactored to allow multiple overlapping client colours
|
||||
* (e.g. wearing blue glasses under a yellow visor, even though the result is a little unsatured.)
|
||||
* As well as some support for animated colour transitions.
|
||||
*
|
||||
* Define subtypes of this datum
|
||||
*/
|
||||
/datum/client_colour
|
||||
///Any client.color-valid value
|
||||
var/colour = ""
|
||||
@@ -54,9 +54,9 @@
|
||||
owner.update_client_colour()
|
||||
|
||||
/**
|
||||
* Adds an instance of colour_type to the mob's client_colours list
|
||||
* colour_type - a typepath (subtyped from /datum/client_colour)
|
||||
*/
|
||||
* Adds an instance of colour_type to the mob's client_colours list
|
||||
* colour_type - a typepath (subtyped from /datum/client_colour)
|
||||
*/
|
||||
/mob/proc/add_client_colour(colour_type)
|
||||
if(!ispath(colour_type, /datum/client_colour) || QDELING(src))
|
||||
return
|
||||
@@ -70,9 +70,9 @@
|
||||
return colour
|
||||
|
||||
/**
|
||||
* Removes an instance of colour_type from the mob's client_colours list
|
||||
* colour_type - a typepath (subtyped from /datum/client_colour)
|
||||
*/
|
||||
* Removes an instance of colour_type from the mob's client_colours list
|
||||
* colour_type - a typepath (subtyped from /datum/client_colour)
|
||||
*/
|
||||
/mob/proc/remove_client_colour(colour_type)
|
||||
if(!ispath(colour_type, /datum/client_colour))
|
||||
return
|
||||
@@ -84,11 +84,11 @@
|
||||
break
|
||||
|
||||
/**
|
||||
* Gets the resulting colour/tone from client_colours.
|
||||
* In the case of multiple colours, they'll be converted to RGBA matrices for compatibility,
|
||||
* summed together, and then each element divided by the number of matrices. (except we do this with lists because byond)
|
||||
* target is the target variable.
|
||||
*/
|
||||
* Gets the resulting colour/tone from client_colours.
|
||||
* In the case of multiple colours, they'll be converted to RGBA matrices for compatibility,
|
||||
* summed together, and then each element divided by the number of matrices. (except we do this with lists because byond)
|
||||
* target is the target variable.
|
||||
*/
|
||||
#define MIX_CLIENT_COLOUR(target)\
|
||||
var/_our_colour;\
|
||||
var/_number_colours = 0;\
|
||||
@@ -125,9 +125,9 @@
|
||||
|
||||
|
||||
/**
|
||||
* Resets the mob's client.color to null, and then reapplies a new color based
|
||||
* on the client_colour datums it currently has.
|
||||
*/
|
||||
* Resets the mob's client.color to null, and then reapplies a new color based
|
||||
* on the client_colour datums it currently has.
|
||||
*/
|
||||
/mob/proc/update_client_colour()
|
||||
if(!client)
|
||||
return
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
show_verb_panel = FALSE
|
||||
///Contains admin info. Null if client is not an admin.
|
||||
var/datum/admins/holder = null
|
||||
///Needs to implement InterceptClickOn(user,params,atom) proc
|
||||
///Needs to implement InterceptClickOn(user,params,atom) proc
|
||||
var/datum/click_intercept = null
|
||||
///Used for admin AI interaction
|
||||
var/AI_Interact = FALSE
|
||||
|
||||
///Used to cache this client's bans to save on DB queries
|
||||
///Used to cache this client's bans to save on DB queries
|
||||
var/ban_cache = null
|
||||
///Contains the last message sent by this client - used to protect against copy-paste spamming.
|
||||
///Contains the last message sent by this client - used to protect against copy-paste spamming.
|
||||
var/last_message = ""
|
||||
///contins a number of how many times a message identical to last_message was sent.
|
||||
var/last_message_count = 0
|
||||
@@ -59,7 +59,7 @@
|
||||
////////////////////////////////////
|
||||
///Used to determine how old the account is - in days.
|
||||
var/player_age = -1
|
||||
///Date that this account was first seen in the server
|
||||
///Date that this account was first seen in the server
|
||||
var/player_join_date = null
|
||||
///So admins know why it isn't working - Used to determine what other accounts previously logged in from this ip
|
||||
var/related_accounts_ip = "Requires database"
|
||||
@@ -89,11 +89,11 @@
|
||||
var/lastping = 0
|
||||
///Average ping of the client
|
||||
var/avgping = 0
|
||||
///world.time they connected
|
||||
///world.time they connected
|
||||
var/connection_time
|
||||
///world.realtime they connected
|
||||
///world.realtime they connected
|
||||
var/connection_realtime
|
||||
///world.timeofday they connected
|
||||
///world.timeofday they connected
|
||||
var/connection_timeofday
|
||||
|
||||
///If the client is currently in player preferences
|
||||
@@ -103,10 +103,10 @@
|
||||
///Used for limiting the rate of clicks sends by the client to avoid abuse
|
||||
var/list/clicklimiter
|
||||
|
||||
///lazy list of all credit object bound to this client
|
||||
///lazy list of all credit object bound to this client
|
||||
var/list/credits
|
||||
|
||||
///these persist between logins/logouts during the same round.
|
||||
///these persist between logins/logouts during the same round.
|
||||
var/datum/player_details/player_details
|
||||
|
||||
///Should only be a key-value list of north/south/east/west = atom/movable/screen.
|
||||
@@ -200,9 +200,9 @@
|
||||
** These next two vars are to apply movement for keypresses and releases made while move delayed.
|
||||
** Because discarding that input makes the game less responsive.
|
||||
*/
|
||||
/// On next move, add this dir to the move that would otherwise be done
|
||||
/// On next move, add this dir to the move that would otherwise be done
|
||||
var/next_move_dir_add
|
||||
/// On next move, subtract this dir from the move that would otherwise be done
|
||||
/// On next move, subtract this dir from the move that would otherwise be done
|
||||
var/next_move_dir_sub
|
||||
|
||||
/// If the client is currently under the restrictions of the interview system
|
||||
|
||||
@@ -700,7 +700,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
|
||||
|
||||
sleep(15 SECONDS) //Longer sleep here since this would trigger if a client tries to reconnect manually because the inital reconnect failed
|
||||
|
||||
//we sleep after telling the client to reconnect, so if we still exist something is up
|
||||
//we sleep after telling the client to reconnect, so if we still exist something is up
|
||||
log_access("Forced disconnect: [key] [computer_id] [address] - CID randomizer check")
|
||||
|
||||
qdel(src)
|
||||
@@ -919,14 +919,14 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
|
||||
view_size.setTo(clamp(change, min, max), clamp(change, min, max))
|
||||
|
||||
/**
|
||||
* Updates the keybinds for special keys
|
||||
*
|
||||
* Handles adding macros for the keys that need it
|
||||
* And adding movement keys to the clients movement_keys list
|
||||
* At the time of writing this, communication(OOC, Say, IC) require macros
|
||||
* Arguments:
|
||||
* * direct_prefs - the preference we're going to get keybinds from
|
||||
*/
|
||||
* Updates the keybinds for special keys
|
||||
*
|
||||
* Handles adding macros for the keys that need it
|
||||
* And adding movement keys to the clients movement_keys list
|
||||
* At the time of writing this, communication(OOC, Say, IC) require macros
|
||||
* Arguments:
|
||||
* * direct_prefs - the preference we're going to get keybinds from
|
||||
*/
|
||||
/client/proc/update_special_keybinds(datum/preferences/direct_prefs)
|
||||
var/datum/preferences/D = prefs || direct_prefs
|
||||
if(!D?.key_bindings)
|
||||
@@ -1046,8 +1046,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
|
||||
to_chat(src, "<span class='userdanger'>Statpanel failed to load, click <a href='?src=[REF(src)];reload_statbrowser=1'>here</a> to reload the panel </span>")
|
||||
|
||||
/**
|
||||
* Initializes dropdown menus on client
|
||||
*/
|
||||
* Initializes dropdown menus on client
|
||||
*/
|
||||
/client/proc/initialize_menus()
|
||||
var/list/topmenus = GLOB.menulist[/datum/verbs/menu]
|
||||
for (var/thing in topmenus)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* Manually clears any held keys, in case due to lag or other undefined behavior a key gets stuck.
|
||||
*
|
||||
* Hardcoded to the ESC key.
|
||||
*/
|
||||
* Manually clears any held keys, in case due to lag or other undefined behavior a key gets stuck.
|
||||
*
|
||||
* Hardcoded to the ESC key.
|
||||
*/
|
||||
/client/verb/reset_held_keys()
|
||||
set name = "Reset Held Keys"
|
||||
set hidden = TRUE
|
||||
|
||||
@@ -95,15 +95,15 @@
|
||||
var/obj/item/organ/brain/userbrain = getorgan(/obj/item/organ/brain)
|
||||
if(userbrain?.damage >= 75)
|
||||
suicide_message = "[src] pulls both arms outwards in front of [p_their()] chest and pumps them behind [p_their()] back, repeats this motion in a smaller range of motion \
|
||||
down to [p_their()] hips two times once more all while sliding [p_their()] legs in a faux walking motion, claps [p_their()] hands together \
|
||||
in front of [p_them()] while both [p_their()] knees knock together, pumps [p_their()] arms downward, pronating [p_their()] wrists and abducting \
|
||||
[p_their()] fingers outward while crossing [p_their()] legs back and forth, repeats this motion again two times while keeping [p_their()] shoulders low\
|
||||
and hunching over, does finger guns with right hand and left hand bent on [p_their()] hip while looking directly forward and putting [p_their()] left leg forward then\
|
||||
crossing [p_their()] arms and leaning back a little while bending [p_their()] knees at an angle! It looks like [p_theyre()] trying to commit suicide."
|
||||
down to [p_their()] hips two times once more all while sliding [p_their()] legs in a faux walking motion, claps [p_their()] hands together \
|
||||
in front of [p_them()] while both [p_their()] knees knock together, pumps [p_their()] arms downward, pronating [p_their()] wrists and abducting \
|
||||
[p_their()] fingers outward while crossing [p_their()] legs back and forth, repeats this motion again two times while keeping [p_their()] shoulders low\
|
||||
and hunching over, does finger guns with right hand and left hand bent on [p_their()] hip while looking directly forward and putting [p_their()] left leg forward then\
|
||||
crossing [p_their()] arms and leaning back a little while bending [p_their()] knees at an angle! It looks like [p_theyre()] trying to commit suicide."
|
||||
else
|
||||
suicide_message = pick("[src] is hugging [p_them()]self to death! It looks like [p_theyre()] trying to commit suicide.", \
|
||||
"[src] is high-fiving [p_them()]self to death! It looks like [p_theyre()] trying to commit suicide.", \
|
||||
"[src] is getting too high on life! It looks like [p_theyre()] trying to commit suicide.")
|
||||
"[src] is high-fiving [p_them()]self to death! It looks like [p_theyre()] trying to commit suicide.", \
|
||||
"[src] is getting too high on life! It looks like [p_theyre()] trying to commit suicide.")
|
||||
else
|
||||
suicide_message = pick("[src] is attempting to bite [p_their()] tongue off! It looks like [p_theyre()] trying to commit suicide.", \
|
||||
"[src] is jamming [p_their()] thumbs into [p_their()] eye sockets! It looks like [p_theyre()] trying to commit suicide.", \
|
||||
@@ -197,7 +197,7 @@
|
||||
if(confirm == "Yes")
|
||||
var/turf/T = get_turf(src.loc)
|
||||
T.visible_message("<span class='notice'>[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"</span>", null, \
|
||||
"<span class='notice'>[src] bleeps electronically.</span>")
|
||||
"<span class='notice'>[src] bleeps electronically.</span>")
|
||||
|
||||
suicide_log()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user