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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
Chinsky
2013-06-23 11:17:03 +04:00
parent b4822e1600 4341fcb207
commit c9f6894163
15 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/changelog.html
View File

@@ -58,6 +58,13 @@ Stuff which is in development and not yet visible to players or just code relate
should be listed in the changelog upon commit though. Thanks. -->
<div class="commit sansserif">
<h2 class="date">June 22nd 2013</h2>
<h3 class="author">Cael_Aislinn updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">The xenoarchaeology depth scanner will now tell you what energy field is required to safely extract a find.</li>
<li class="tweak">Excavation picks will now dig faster, and xenoarchaeology as a whole should be easier to do.</li>
</ul>
</div>
<h2 class="date">21.06.2013</h2>
<h3 class="author">Jupotter updated:</h3>
<ul class="changes bgimages16">