cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10352 from Baystation12/dev-freeze

Browse Source 
Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-07-29 12:16:23 +02:00
parent 315d0f5071 34b4ce9d73
commit f49d8d5e54
3 changed files with 153 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/admin/player_notes.dm
View File

@@ -134,7 +134,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
qdel(info) qdel(info)
/proc/show_player_info_irc(var/key as text) /proc/show_player_info_irc(var/key as text)
var/dat = " Info on [key]%0D%0A" var/dat = " Info on [key]\n"
var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav") var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
var/list/infos var/list/infos
info >> infos info >> infos
@@ -142,6 +142,6 @@ datum/admins/proc/notes_gethtml(var/ckey)
dat = "No information found on the given key." dat = "No information found on the given key."
else else
for(var/datum/player_info/I in infos) for(var/datum/player_info/I in infos)
dat += "[I.content]%0D%0Aby [I.author] ([I.rank]) on [I.timestamp]%0D%0A%0D%0A" dat += "[I.content]\nby [I.author] ([I.rank]) on [I.timestamp]\n\n"
return dat return list2params(list(dat))

7
html/changelog.html
View File

@@ -56,6 +56,13 @@
--> -->
<div class="commit sansserif"> <div class="commit sansserif">
<h2 class="date">29 July 2015</h2>
<h3 class="author">Karolis2011 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Made tagger and sorting pipes dispensible.</li>
<li class="bugfix">Unwelding and welding sorting/tagger pipes, no longer delete data about them.</li>
</ul>
<h2 class="date">27 July 2015</h2> <h2 class="date">27 July 2015</h2>
<h3 class="author">Kelenius updated:</h3> <h3 class="author">Kelenius updated:</h3>
<ul class="changes bgimages16"> <ul class="changes bgimages16">

5
html/changelogs/.all_changelog.yml
View File

@@ -2090,3 +2090,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Borg shaker now works similarly to hypospray. It generates reagents that - tweak: Borg shaker now works similarly to hypospray. It generates reagents that
can be poured into glasses. can be poured into glasses.
- bugfix: Therefore, they can no longer duplicate rare reagents such as phoron. - bugfix: Therefore, they can no longer duplicate rare reagents such as phoron.
2015-07-29:
Karolis2011:
- rscadd: Made tagger and sorting pipes dispensible.
- bugfix: Unwelding and welding sorting/tagger pipes, no longer delete data about
them.