shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks

Browse Source
This commit is contained in:
SandPoot
2023-12-29 23:16:11 -03:00
parent 7533d51ae4 ce1d757159
commit 6733de69bd
154 changed files with 1419 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/verbs/who.dm
+5 -5
View File
@@ -38,7 +38,7 @@
var/client/C = X
if(C && C.holder && !C.holder.fakekey)
assembled += "\t <font color='#FF0000'>[C.key]</font>[admin_mode? "[show_admin_info(C)]":""] ([round(C.avgping, 1)]ms)"
Lines += sortList(assembled)
Lines += sort_list(assembled)
assembled.len = 0
if(length(GLOB.mentors))
Lines += "<b>Mentors:</b>"
@@ -46,10 +46,10 @@
var/client/C = X
if(C && (!C.holder || (C.holder && !C.holder.fakekey))) //>using stuff this complex instead of just using if/else lmao
assembled += "\t <font color='#0033CC'>[C.key]</font>[admin_mode? "[show_admin_info(C)]":""] ([round(C.avgping, 1)]ms)"
Lines += sortList(assembled)
Lines += sort_list(assembled)
assembled.len = 0
Lines += "<b>Players:</b>"
for(var/X in sortList(GLOB.clients))
for(var/X in sort_list(GLOB.clients))
var/client/C = X
if(!C)
continue
@@ -57,8 +57,8 @@
if(C.holder && C.holder.fakekey)
key = C.holder.fakekey
assembled += "\t [key][admin_mode? "[show_admin_info(C)]":""] ([round(C.avgping, 1)]ms)"
Lines += sortList(assembled)
Lines += sort_list(assembled)
for(var/line in Lines)
msg += "[line]\n"
modular_citadel/code/modules/mentor/mentorpm.dm
+1 -1
View File
@@ -9,7 +9,7 @@
for(var/client/T)
targets["[T]"] = T
var/list/sorted = sortList(targets)
var/list/sorted = sort_list(targets)
var/target = input(src,"To whom shall we send a message?","Mentor PM",null) in sorted|null
cmd_mentor_pm(targets[target],null)
SSblackbox.record_feedback("tally", "Mentor_verb", 1, "APM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
modular_citadel/code/modules/vectorcrafts/vectorcraft.dm
+2 -2
View File
@@ -133,10 +133,10 @@
check_boost()
if(driver.m_intent == MOVE_INTENT_WALK)
var/deceleration = max_deceleration
if(driver.in_throw_mode)
if(driver.throw_mode)
deceleration *= 1.5
friction(deceleration, TRUE)
else if(driver.in_throw_mode)
else if(driver.throw_mode)
friction(max_deceleration*1.2, TRUE)
friction(max_deceleration/4)