cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 21:49:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update preferences.dm

Browse Source
This commit is contained in:
Novacat
2019-03-28 21:34:11 -04:00
committed by GitHub
parent e2557228dc
commit 3129c2a85b
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
-3
View File
@@ -341,8 +341,6 @@ datum/preferences
/datum/preferences/proc/close_load_dialog(mob/user)
//user << browse(null, "window=saves")
panel.close()
<<<<<<< HEAD
=======
/datum/preferences/proc/open_copy_dialog(mob/user)
var/dat = "<body>"
@@ -366,4 +364,3 @@ datum/preferences
panel = new(user, "Character Slots", "Character Slots", 300, 390, src)
panel.set_content(dat)
panel.open()
>>>>>>> 6927ca1... Merge pull request #5988 from PrismaticGynoid/charactercopy