diff --git a/code/__defines/admin.dm b/code/__defines/admin.dm
index 84e0656c97..0e8730bae8 100644
--- a/code/__defines/admin.dm
+++ b/code/__defines/admin.dm
@@ -46,26 +46,26 @@
#define SMITE_SPONTANEOUSCOMBUSTION "Spontaneous Combustion"
#define SMITE_LIGHTNINGBOLT "Lightning Bolt"
-#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_BSA(user) "(BSA)"
-#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_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_BSA(user) "(BSA)"
+#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_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)]"
#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]"
-#define ADMIN_JMP(src) "(JMP)"
+#define ADMIN_JMP(src) "(JMP)"
#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]"
#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]"
#define AHELP_ACTIVE 1
#define AHELP_CLOSED 2
-#define AHELP_RESOLVED 3
\ No newline at end of file
+#define AHELP_RESOLVED 3
diff --git a/code/__defines/procpath.dm b/code/__defines/procpath.dm
new file mode 100644
index 0000000000..e58a2a48b2
--- /dev/null
+++ b/code/__defines/procpath.dm
@@ -0,0 +1,25 @@
+/// Represents a proc or verb path.
+///
+/// Despite having no DM-defined static type, proc paths have some variables,
+/// listed below. These are not modifiable, but for a given procpath P,
+/// `new P(null, "Name", "Desc")` can be used to create a new procpath with the
+/// same code but new `name` and `desc` values. The other variables cannot be
+/// changed in this way.
+///
+/// This type exists only to act as an annotation, providing reasonable static
+/// typing for procpaths. Previously, types like `/atom/verb` were used, with
+/// the `name` and `desc` vars of `/atom` thus being accessible. Proc and verb
+/// paths will fail `istype` and `ispath` checks against `/procpath`.
+/procpath
+ // Although these variables are effectively const, if they are marked const
+ // below, their accesses are optimized away.
+ /// A text string of the verb's name.
+ var/name as text
+ /// The verb's help text or description.
+ var/desc as text
+ /// The category or tab the verb will appear in.
+ var/category as text
+ /// Only clients/mobs with `see_invisibility` higher can use the verb.
+ var/invisibility as num
+ /// Whether or not the verb appears in statpanel and commandbar when you press space
+ var/hidden as num
diff --git a/code/_helpers/files.dm b/code/_helpers/files.dm
index d6603e4275..9468becf8b 100644
--- a/code/_helpers/files.dm
+++ b/code/_helpers/files.dm
@@ -58,3 +58,18 @@
fileaccess_timer = world.time + FTPDELAY
return 0
#undef FTPDELAY
+
+/// 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)
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 15d29eb1f0..22e8d9a4b2 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -186,7 +186,7 @@ var/savefile/Banlist
if(!expiry) expiry = "Removal Pending"
else expiry = "Permaban"
- dat += text("| (U)(E) Key: [key] | ComputerID: [id] | IP: [ip] | [expiry] | (By: [by]) | (Reason: [reason]) |
")
+ dat += text("| (U)(E) Key: [key] | ComputerID: [id] | IP: [ip] | [expiry] | (By: [by]) | (Reason: [reason]) |
")
dat += ""
dat = "
Bans: (U) = Unban , (E) = Edit Ban - ([count] Bans)
[dat]"
@@ -227,4 +227,3 @@ var/savefile/Banlist
Banlist.cd = "/base"
for (var/A in Banlist.dir)
RemoveBan(A)
-
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 31773e10b4..30acc8dd3a 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -43,12 +43,12 @@ var/global/floorIsLava = 0
body += "Options panel for [M]"
if(M.client)
body += " played by [M.client] "
- body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]"
+ body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]"
if(istype(M, /mob/new_player))
body += " Hasn't Entered Game "
else
- body += " \[Heal\] "
+ body += " \[Heal\] "
if(M.client)
body += "
First connection: [M.client.player_age] days ago"
@@ -57,41 +57,41 @@ var/global/floorIsLava = 0
body += {"
\[
- VV -
- TP -
- PM -
- SM -
+ VV -
+ TP -
+ PM -
+ SM -
[admin_jump_link(M, src)]\]
Mob type: [M.type]
Inactivity time: [M.client ? "[M.client.inactivity/600] minutes" : "Logged out"]
- Kick |
- Warn |
- Ban |
- Jobban |
- Notes
+ Kick |
+ Warn |
+ Ban |
+ Jobban |
+ Notes
"}
if(M.client)
- body += "| Prison | "
- body += "\ Send back to Lobby | "
+ body += "| Prison | "
+ body += "\ Send back to Lobby | "
var/muted = M.client.prefs.muted
body += {"
Mute:
- \[IC |
- OOC |
- PRAY |
- ADMINHELP |
- DEADCHAT\]
- (toggle all)
+ \[IC |
+ OOC |
+ PRAY |
+ ADMINHELP |
+ DEADCHAT\]
+ (toggle all)
"}
body += {"
- Jump to |
- Get |
- Send To
+ Jump to |
+ Get |
+ Send To
- [check_rights(R_ADMIN|R_MOD|R_EVENT,0) ? "Traitor panel | " : "" ]
- Narrate to |
- Subtle message
+ [check_rights(R_ADMIN|R_MOD|R_EVENT,0) ? "Traitor panel | " : "" ]
+ Narrate to |
+ Subtle message
"}
if (M.client)
@@ -104,30 +104,30 @@ var/global/floorIsLava = 0
if(issmall(M))
body += "Monkeyized | "
else
- body += "Monkeyize | "
+ body += "Monkeyize | "
//Corgi
if(iscorgi(M))
body += "Corgized | "
else
- body += "Corgize | "
+ body += "Corgize | "
//AI / Cyborg
if(isAI(M))
body += "Is an AI "
else if(ishuman(M))
- body += {"Make AI |
- Make Robot |
- Make Alien
+ body += {"Make AI |
+ Make Robot |
+ Make Alien
"}
//Simple Animals
if(isanimal(M))
- body += "Re-Animalize | "
+ body += "Re-Animalize | "
else
- body += "Animalize | "
+ body += "Animalize | "
- body += "Respawn | "
+ body += "Respawn | "
// DNA2 - Admin Hax
if(M.dna && iscarbon(M))
@@ -142,7 +142,7 @@ var/global/floorIsLava = 0
if(bname)
var/bstate=M.dna.GetSEState(block)
var/bcolor="[(bstate)?"#006600":"#ff0000"]"
- body += "[bname][block]"
+ body += "[bname][block]"
else
body += "[block]"
body+=""
@@ -150,45 +150,45 @@ var/global/floorIsLava = 0
body += {"
Rudimentary transformation:
These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.
- Observer |
- \[ Xenos: Larva
- Drone
- Hunter
- Sentinel
- Queen \] |
- \[ Crew: Human
- Unathi
- Tajaran
- Skrell \] | \[
- Nymph
- Diona \] |
- \[ slime: Baby,
- Adult \]
- Monkey |
- Cyborg |
- Cat |
- Runtime |
- Corgi |
- Ian |
- Crab |
- Coffee |
- \[ Construct: Armoured ,
- Builder ,
- Wraith \]
- Shade
+ Observer |
+ \[ Xenos: Larva
+ Drone
+ Hunter
+ Sentinel
+ Queen \] |
+ \[ Crew: Human
+ Unathi
+ Tajaran
+ Skrell \] | \[
+ Nymph
+ Diona \] |
+ \[ slime: Baby,
+ Adult \]
+ Monkey |
+ Cyborg |
+ Cat |
+ Runtime |
+ Corgi |
+ Ian |
+ Crab |
+ Coffee |
+ \[ Construct: Armoured ,
+ Builder ,
+ Wraith \]
+ Shade
"}
body += {"
Other actions:
- Forcesay
+ Forcesay
"}
if (M.client)
body += {" |
- Thunderdome 1 |
- Thunderdome 2 |
- Thunderdome Admin |
- Thunderdome Observer |
+ Thunderdome 1 |
+ Thunderdome 2 |
+ Thunderdome Admin |
+ Thunderdome Observer |
"}
// language toggles
body += "
Languages:
"
@@ -199,9 +199,9 @@ var/global/floorIsLava = 0
if(!f) body += " | "
else f = 0
if(L in M.languages)
- body += "[k]"
+ body += "[k]"
else
- body += "[k]"
+ body += "[k]"
body += {"