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 update-to-action-buttons

Browse Source
This commit is contained in:
SandPoot
2024-01-07 02:09:58 -03:00
parent 6d7321b0c4 ae557a1df5
commit 003eec1850
45 changed files with 291 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/cmp.dm
+7
View File
@@ -4,6 +4,13 @@
/proc/cmp_numeric_asc(a,b)
return a - b
// please don't ask
/proc/cmp_numeric_text_desc(a, b)
return text2num(b) - text2num(a)
/proc/cmp_numeric_text_asc(a, b)
return text2num(a) - text2num(b)
/proc/cmp_text_asc(a,b)
return sorttext(b,a)
code/__HELPERS/type2type.dm
+6
View File
@@ -689,5 +689,11 @@
return 'modular_citadel/icons/ui/screen_operative.dmi'
if('icons/mob/screen_clockwork.dmi')
return 'modular_citadel/icons/ui/screen_clockwork.dmi'
if('icons/mob/screen_glass.dmi')
return 'modular_citadel/icons/ui/screen_glass.dmi'
if('icons/mob/screen_trasenknox.dmi')
return 'modular_citadel/icons/ui/screen_trasenknox.dmi'
if('icons/mob/screen_detective.dmi')
return 'modular_citadel/icons/ui/screen_detective.dmi'
else
return 'modular_citadel/icons/ui/screen_midnight.dmi'