cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit

Browse Source 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
This commit is contained in:
paprka
2015-01-26 15:37:33 -08:00
parent ee64679e8b b58ac02433
commit b830f77ea2
49 changed files with 439 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_notes.dm
+1 -1
View File
@@ -20,7 +20,7 @@
while(!notesfile.eof)
var/note
notesfile >> note
dat += note
dat += note + "<br>"
var/datum/browser/popup = new(usr, "player_notes", "Player Notes", 700, 400)
popup.set_content(dat)
popup.open()