diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm
index 4ec41080..895d1e0d 100644
--- a/code/__DEFINES/admin.dm
+++ b/code/__DEFINES/admin.dm
@@ -1,96 +1,97 @@
-//A set of constants used to determine which type of mute an admin wishes to apply:
-//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
-//Therefore there needs to be a gap between the flags for the automute flags
-#define MUTE_IC (1<<0)
-#define MUTE_OOC (1<<1)
-#define MUTE_PRAY (1<<2)
-#define MUTE_ADMINHELP (1<<3)
-#define MUTE_DEADCHAT (1<<4)
-#define MUTE_ALL (~0)
-
-//Some constants for DB_Ban
-#define BANTYPE_PERMA 1
-#define BANTYPE_TEMP 2
-#define BANTYPE_JOB_PERMA 3
-#define BANTYPE_JOB_TEMP 4
-#define BANTYPE_ANY_FULLBAN 5 //used to locate stuff to unban.
-
-#define BANTYPE_ADMIN_PERMA 7
-#define BANTYPE_ADMIN_TEMP 8
-#define BANTYPE_ANY_JOB 9 //used to remove jobbans
-
-//Admin Permissions
-#define R_BUILDMODE (1<<0)
-#define R_ADMIN (1<<1)
-#define R_BAN (1<<2)
-#define R_FUN (1<<3)
-#define R_SERVER (1<<4)
-#define R_DEBUG (1<<5)
-#define R_POSSESS (1<<6)
-#define R_PERMISSIONS (1<<7)
-#define R_STEALTH (1<<8)
-#define R_POLL (1<<9)
-#define R_VAREDIT (1<<10)
-#define R_SOUNDS (1<<11)
-#define R_SPAWN (1<<12)
-#define R_AUTOLOGIN (1<<13)
-#define R_DBRANKS (1<<14)
-
-#define R_DEFAULT R_AUTOLOGIN
-
-#define R_EVERYTHING ALL //the sum of all other rank permissions, used for +EVERYTHING
-
-#define ADMIN_QUE(user) "(?)"
-#define ADMIN_FLW(user) "(FLW)"
-#define ADMIN_PP(user) "(PP)"
-#define ADMIN_VV(atom) "(VV)"
-#define ADMIN_SM(user) "(SM)"
-#define ADMIN_TP(user) "(TP)"
-#define ADMIN_KICK(user) "(KICK)"
-#define ADMIN_CENTCOM_REPLY(user) "(RPLY)"
-#define ADMIN_SYNDICATE_REPLY(user) "(RPLY)"
-#define ADMIN_SC(user) "(SC)"
-#define ADMIN_SMITE(user) "(SMITE)"
-#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
-#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
-#define ADMIN_SET_SD_CODE "(SETCODE)"
-#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
-#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
-#define ADMIN_JMP(src) "(JMP)"
-#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
-#define AREACOORD(src) "[src ? "[get_area_name(src, TRUE)] ([src.x], [src.y], [src.z])" : "nonexistent location"]"
-#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
-#define ADMIN_VERBOSEJMP(src) "[src ? "[AREACOORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
-#define ADMIN_INDIVIDUALLOG(user) "(LOGS)"
-
-#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
-#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
-#define ADMIN_PUNISHMENT_GIB "Gib"
-#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
-#define ADMIN_PUNISHMENT_FIREBALL "Fireball"
-#define ADMIN_PUNISHMENT_CLUWNE "Floor Cluwne"
-#define ADMIN_PUNISHMENT_ROD "Immovable Rod"
-#define ADMIN_PUNISHMENT_SUPPLYPOD_QUICK "Supply Pod (Quick)"
-#define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
-#define ADMIN_PUNISHMENT_MAZING "Puzzle"
-#define ADMIN_PUNISHMENT_PIE "Cream Pie"
-#define ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE "Tabletide Stationwide"
-#define ADMIN_PUNISHMENT_FAKEBWOINK "Fake Bwoink"
-#define ADMIN_PUNISHMENT_NUGGET "Nugget"
-#define ADMIN_PUNISHMENT_BREADIFY ":b:read"
-
-#define AHELP_ACTIVE 1
-#define AHELP_CLOSED 2
-#define AHELP_RESOLVED 3
-
-#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 //Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
-
-#define SPAM_TRIGGER_WARNING 5 //Number of identical messages required before the spam-prevention will warn you to stfu
-#define SPAM_TRIGGER_AUTOMUTE 10 //Number of identical messages required before the spam-prevention will automute you
-
-///Max length of a keypress command before it's considered to be a forged packet/bogus command
-#define MAX_KEYPRESS_COMMANDLENGTH 16
-///Max amount of keypress messages per second over two seconds before client is autokicked
-#define MAX_KEYPRESS_AUTOKICK 100
-///Length of held key rolling buffer
-#define HELD_KEY_BUFFER_LENGTH 15
+//A set of constants used to determine which type of mute an admin wishes to apply:
+//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1)
+//Therefore there needs to be a gap between the flags for the automute flags
+#define MUTE_IC (1<<0)
+#define MUTE_OOC (1<<1)
+#define MUTE_PRAY (1<<2)
+#define MUTE_ADMINHELP (1<<3)
+#define MUTE_DEADCHAT (1<<4)
+#define MUTE_ALL (~0)
+
+//Some constants for DB_Ban
+#define BANTYPE_PERMA 1
+#define BANTYPE_TEMP 2
+#define BANTYPE_JOB_PERMA 3
+#define BANTYPE_JOB_TEMP 4
+#define BANTYPE_ANY_FULLBAN 5 //used to locate stuff to unban.
+
+#define BANTYPE_ADMIN_PERMA 7
+#define BANTYPE_ADMIN_TEMP 8
+#define BANTYPE_ANY_JOB 9 //used to remove jobbans
+
+//Admin Permissions
+#define R_BUILDMODE (1<<0)
+#define R_ADMIN (1<<1)
+#define R_BAN (1<<2)
+#define R_FUN (1<<3)
+#define R_SERVER (1<<4)
+#define R_DEBUG (1<<5)
+#define R_POSSESS (1<<6)
+#define R_PERMISSIONS (1<<7)
+#define R_STEALTH (1<<8)
+#define R_POLL (1<<9)
+#define R_VAREDIT (1<<10)
+#define R_SOUNDS (1<<11)
+#define R_SPAWN (1<<12)
+#define R_AUTOLOGIN (1<<13)
+#define R_DBRANKS (1<<14)
+
+#define R_DEFAULT R_AUTOLOGIN
+
+#define R_EVERYTHING ALL //the sum of all other rank permissions, used for +EVERYTHING
+
+#define ADMIN_QUE(user) "(?)"
+#define ADMIN_FLW(user) "(FLW)"
+#define ADMIN_PP(user) "(PP)"
+#define ADMIN_VV(atom) "(VV)"
+#define ADMIN_SM(user) "(SM)"
+#define ADMIN_TP(user) "(TP)"
+#define ADMIN_KICK(user) "(KICK)"
+#define ADMIN_CENTCOM_REPLY(user) "(RPLY)"
+#define ADMIN_SYNDICATE_REPLY(user) "(RPLY)"
+#define ADMIN_SC(user) "(SC)"
+#define ADMIN_SMITE(user) "(SMITE)"
+#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]"
+#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]"
+#define ADMIN_SET_SD_CODE "(SETCODE)"
+#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]"
+#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
+#define ADMIN_JMP(src) "(JMP)"
+#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
+#define AREACOORD(src) "[src ? "[get_area_name(src, TRUE)] ([src.x], [src.y], [src.z])" : "nonexistent location"]"
+#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
+#define ADMIN_VERBOSEJMP(src) "[src ? "[AREACOORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
+#define ADMIN_INDIVIDUALLOG(user) "(LOGS)"
+
+#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt"
+#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage"
+#define ADMIN_PUNISHMENT_GIB "Gib"
+#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
+#define ADMIN_PUNISHMENT_FIREBALL "Fireball"
+#define ADMIN_PUNISHMENT_CLUWNE "Floor Cluwne"
+#define ADMIN_PUNISHMENT_ROD "Immovable Rod"
+#define ADMIN_PUNISHMENT_SUPPLYPOD_QUICK "Supply Pod (Quick)"
+#define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
+#define ADMIN_PUNISHMENT_MAZING "Puzzle"
+#define ADMIN_PUNISHMENT_PIE "Cream Pie"
+#define ADMIN_PUNISHMENT_TABLETIDESTATIONWIDE "Tabletide Stationwide"
+#define ADMIN_PUNISHMENT_FAKEBWOINK "Fake Bwoink"
+#define ADMIN_PUNISHMENT_NUGGET "Nugget"
+#define ADMIN_PUNISHMENT_BREADIFY ":b:read"
+
+#define AHELP_ACTIVE 1
+#define AHELP_CLOSED 2
+#define AHELP_RESOLVED 3
+
+#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 //Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
+
+#define SPAM_TRIGGER_WARNING 5 //Number of identical messages required before the spam-prevention will warn you to stfu
+#define SPAM_TRIGGER_AUTOMUTE 10 //Number of identical messages required before the spam-prevention will automute you
+
+///Max length of a keypress command before it's considered to be a forged packet/bogus command
+#define MAX_KEYPRESS_COMMANDLENGTH 16
+///Max amount of keypress messages per second over two seconds before client is autokicked
+#define MAX_KEYPRESS_AUTOKICK 100
+///Length of held key rolling buffer
+#define HELD_KEY_BUFFER_LENGTH 15
+
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
index 75209dd5..311f220f 100644
--- a/code/__DEFINES/flags.dm
+++ b/code/__DEFINES/flags.dm
@@ -1,94 +1,95 @@
-/*
- These defines are specific to the atom/flags_1 bitmask
-*/
-#define ALL (~0) //For convenience.
-#define NONE 0
-
-//for convenience
-#define ENABLE_BITFIELD(variable, flag) (variable |= (flag))
-#define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag))
-#define CHECK_BITFIELD(variable, flag) (variable & (flag))
-#define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag))
-
-#define CHECK_MULTIPLE_BITFIELDS(flagvar, flags) (((flagvar) & (flags)) == (flags))
-
-GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
-
-// for /datum/var/datum_flags
-#define DF_USE_TAG (1<<0)
-#define DF_VAR_EDITED (1<<1)
-#define DF_ISPROCESSING (1<<2)
-
-//FLAGS BITMASK
-
-#define HEAR_1 (1<<3) // This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
-#define CHECK_RICOCHET_1 (1<<4) // Projectiels will check ricochet on things impacted that have this.
-#define CONDUCT_1 (1<<5) // conducts electricity (metal etc.)
-#define NODECONSTRUCT_1 (1<<7) // For machines and structures that should not break into parts, eg, holodeck stuff
-#define OVERLAY_QUEUED_1 (1<<8) // atom queued to SSoverlay
-#define ON_BORDER_1 (1<<9) // item has priority to check when entering or leaving
-#define PREVENT_CLICK_UNDER_1 (1<<11) //Prevent clicking things below it on the same turf eg. doors/ fulltile windows
-#define HOLOGRAM_1 (1<<12)
-#define TESLA_IGNORE_1 (1<<13) // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
-#define INITIALIZED_1 (1<<14) //Whether /atom/Initialize() has already run for the object
-#define ADMIN_SPAWNED_1 (1<<15) //was this spawned by an admin? used for stat tracking stuff.
-#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16) /// should not get harmed if this gets caught by an explosion?
-
-//turf-only flags
-#define NOJAUNT_1 (1<<0)
-#define UNUSED_RESERVATION_TURF_1 (1<<1)
-#define CAN_BE_DIRTY_1 (1<<2) // If a turf can be made dirty at roundstart. This is also used in areas.
-#define NO_LAVA_GEN_1 (1<<6) //Blocks lava rivers being generated on the turf
-#define NO_RUINS_1 (1<<10) //Blocks ruins spawning on the turf
-
-/*
- These defines are used specifically with the atom/pass_flags bitmask
- the atom/checkpass() proc uses them (tables will call movable atom checkpass(PASSTABLE) for example)
-*/
-//flags for pass_flags
-#define PASSTABLE (1<<0)
-#define PASSGLASS (1<<1)
-#define PASSGRILLE (1<<2)
-#define PASSBLOB (1<<3)
-#define PASSMOB (1<<4)
-#define PASSCLOSEDTURF (1<<5)
-#define LETPASSTHROW (1<<6)
-#define PASSMACHINES (1<<7)
-#define PASSCOMPUTER (1<<8)
-#define PASSDOOR (1<<13)
-
-//Movement Types
-#define GROUND (1<<0)
-#define FLYING (1<<1)
-#define VENTCRAWLING (1<<2)
-
-//Fire and Acid stuff, for resistance_flags
-#define LAVA_PROOF (1<<0)
-#define FIRE_PROOF (1<<1) //100% immune to fire damage (but not necessarily to lava or heat)
-#define FLAMMABLE (1<<2)
-#define ON_FIRE (1<<3)
-#define UNACIDABLE (1<<4) //acid can't even appear on it, let alone melt it.
-#define ACID_PROOF (1<<5) //acid stuck on it doesn't melt it.
-#define INDESTRUCTIBLE (1<<6) //doesn't take damage
-#define FREEZE_PROOF (1<<7) //can't be frozen
-#define GOLIATH_RESISTANCE (1<<8) //CIT CHANGE
-#define GOLIATH_WEAKNESS (1<<9) //CIT CHANGE
-
-//tesla_zap
-#define TESLA_MACHINE_EXPLOSIVE (1<<0)
-#define TESLA_ALLOW_DUPLICATES (1<<1)
-#define TESLA_OBJ_DAMAGE (1<<2)
-#define TESLA_MOB_DAMAGE (1<<3)
-#define TESLA_MOB_STUN (1<<4)
-
-#define TESLA_DEFAULT_FLAGS ALL
-#define TESLA_FUSION_FLAGS TESLA_OBJ_DAMAGE | TESLA_MOB_DAMAGE | TESLA_MOB_STUN
-
-//EMP protection
-#define EMP_PROTECT_SELF (1<<0)
-#define EMP_PROTECT_CONTENTS (1<<1)
-#define EMP_PROTECT_WIRES (1<<2)
-
-// radiation
-#define RAD_PROTECT_CONTENTS (1<<0)
-#define RAD_NO_CONTAMINATE (1<<1)
+/*
+ These defines are specific to the atom/flags_1 bitmask
+*/
+#define ALL (~0) //For convenience.
+#define NONE 0
+
+//for convenience
+#define ENABLE_BITFIELD(variable, flag) (variable |= (flag))
+#define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag))
+#define CHECK_BITFIELD(variable, flag) (variable & (flag))
+#define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag))
+
+#define CHECK_MULTIPLE_BITFIELDS(flagvar, flags) (((flagvar) & (flags)) == (flags))
+
+GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
+
+// for /datum/var/datum_flags
+#define DF_USE_TAG (1<<0)
+#define DF_VAR_EDITED (1<<1)
+#define DF_ISPROCESSING (1<<2)
+
+//FLAGS BITMASK
+
+#define HEAR_1 (1<<3) // This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
+#define CHECK_RICOCHET_1 (1<<4) // Projectiels will check ricochet on things impacted that have this.
+#define CONDUCT_1 (1<<5) // conducts electricity (metal etc.)
+#define NODECONSTRUCT_1 (1<<7) // For machines and structures that should not break into parts, eg, holodeck stuff
+#define OVERLAY_QUEUED_1 (1<<8) // atom queued to SSoverlay
+#define ON_BORDER_1 (1<<9) // item has priority to check when entering or leaving
+#define PREVENT_CLICK_UNDER_1 (1<<11) //Prevent clicking things below it on the same turf eg. doors/ fulltile windows
+#define HOLOGRAM_1 (1<<12)
+#define TESLA_IGNORE_1 (1<<13) // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
+#define INITIALIZED_1 (1<<14) //Whether /atom/Initialize() has already run for the object
+#define ADMIN_SPAWNED_1 (1<<15) //was this spawned by an admin? used for stat tracking stuff.
+#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16) /// should not get harmed if this gets caught by an explosion?
+
+//turf-only flags
+#define NOJAUNT_1 (1<<0)
+#define UNUSED_RESERVATION_TURF_1 (1<<1)
+#define CAN_BE_DIRTY_1 (1<<2) // If a turf can be made dirty at roundstart. This is also used in areas.
+#define NO_LAVA_GEN_1 (1<<6) //Blocks lava rivers being generated on the turf
+#define NO_RUINS_1 (1<<10) //Blocks ruins spawning on the turf
+
+/*
+ These defines are used specifically with the atom/pass_flags bitmask
+ the atom/checkpass() proc uses them (tables will call movable atom checkpass(PASSTABLE) for example)
+*/
+//flags for pass_flags
+#define PASSTABLE (1<<0)
+#define PASSGLASS (1<<1)
+#define PASSGRILLE (1<<2)
+#define PASSBLOB (1<<3)
+#define PASSMOB (1<<4)
+#define PASSCLOSEDTURF (1<<5)
+#define LETPASSTHROW (1<<6)
+#define PASSMACHINES (1<<7)
+#define PASSCOMPUTER (1<<8)
+#define PASSDOOR (1<<13)
+
+//Movement Types
+#define GROUND (1<<0)
+#define FLYING (1<<1)
+#define VENTCRAWLING (1<<2)
+
+//Fire and Acid stuff, for resistance_flags
+#define LAVA_PROOF (1<<0)
+#define FIRE_PROOF (1<<1) //100% immune to fire damage (but not necessarily to lava or heat)
+#define FLAMMABLE (1<<2)
+#define ON_FIRE (1<<3)
+#define UNACIDABLE (1<<4) //acid can't even appear on it, let alone melt it.
+#define ACID_PROOF (1<<5) //acid stuck on it doesn't melt it.
+#define INDESTRUCTIBLE (1<<6) //doesn't take damage
+#define FREEZE_PROOF (1<<7) //can't be frozen
+#define GOLIATH_RESISTANCE (1<<8) //CIT CHANGE
+#define GOLIATH_WEAKNESS (1<<9) //CIT CHANGE
+
+//tesla_zap
+#define TESLA_MACHINE_EXPLOSIVE (1<<0)
+#define TESLA_ALLOW_DUPLICATES (1<<1)
+#define TESLA_OBJ_DAMAGE (1<<2)
+#define TESLA_MOB_DAMAGE (1<<3)
+#define TESLA_MOB_STUN (1<<4)
+
+#define TESLA_DEFAULT_FLAGS ALL
+#define TESLA_FUSION_FLAGS TESLA_OBJ_DAMAGE | TESLA_MOB_DAMAGE | TESLA_MOB_STUN
+
+//EMP protection
+#define EMP_PROTECT_SELF (1<<0)
+#define EMP_PROTECT_CONTENTS (1<<1)
+#define EMP_PROTECT_WIRES (1<<2)
+
+// radiation
+#define RAD_PROTECT_CONTENTS (1<<0)
+#define RAD_NO_CONTAMINATE (1<<1)
+