cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZomgPonies/Paradise

Browse Source 
Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm
This commit is contained in:
Markolie
2014-11-27 21:39:01 +01:00
parent e6cf333e4e c9b6d7197a
commit 3b1dc8e487
80 changed files with 1491 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+1 -1
View File
@@ -304,7 +304,7 @@ var/list/admin_verbs_mod = list(
/client/proc/colorooc()
set category = "Admin"
set name = "OOC Text Color"
set name = "Personal OOC Text Color"
if(!holder) return
var/new_ooccolor = input(src, "Please select your OOC colour.", "OOC colour") as color|null
if(new_ooccolor)