cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 05:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update create_object.dm

Browse Source
This commit is contained in:
Novacat
2020-07-05 15:20:08 -04:00
committed by GitHub
parent 14484a2d83
commit a82c815a4f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/create_object.dm
-4
View File
@@ -26,8 +26,4 @@
quick_create_object_html = file2text('html/create_object.html')
quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"")
<<<<<<< HEAD
user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475")
=======
user << browse(replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=680x600")
>>>>>>> 65a0d26... Merge pull request #7307 from Verkister/patch-40