diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index 163e7ac5c8..d60a6b542d 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -141,10 +141,11 @@
if("finalise_create_account")
var/account_name = href_list["holder_name"]
var/starting_funds = max(text2num(href_list["starting_funds"]), 0)
- create_account(account_name, starting_funds, src)
starting_funds = Clamp(starting_funds, 0, station_account.money) // Not authorized to put the station in debt.
- starting_funds = min(starting_funds, fund_cap) // Not authrorized to give more than the fund cap.
+ starting_funds = min(starting_funds, fund_cap) // Not authorized to give more than the fund cap.
+
+ create_account(account_name, starting_funds, src)
if(starting_funds > 0)
//subtract the money
station_account.money -= starting_funds
diff --git a/html/changelog.html b/html/changelog.html
index 60302614fe..9169105593 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
-->
+
09 May 2015
+
Yoshax updated:
+
+ - Maps in the top mounted 9mm practice rounds, .45 practice rounds, and practice shotgun shells into the armory.
+
+
07 May 2015
HarpyEagle updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index f8a02b045c..f51f13ea81 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1727,3 +1727,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
RavingManiac:
- rscadd: Muzzle-flash lighting effect for guns
- rscadd: Energy guns now display shots remaining on examine
+2015-05-09:
+ Yoshax:
+ - rscadd: Maps in the top mounted 9mm practice rounds, .45 practice rounds, and
+ practice shotgun shells into the armory.
diff --git a/html/changelogs/Yoshax - Practiceshellmapping.YML b/html/changelogs/Yoshax - Practiceshellmapping.YML
deleted file mode 100644
index 83e9751b33..0000000000
--- a/html/changelogs/Yoshax - Practiceshellmapping.YML
+++ /dev/null
@@ -1,37 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes:
-# bugfix
-# wip (For works in progress)
-# tweak
-# soundadd
-# sounddel
-# rscadd (general adding of nice things)
-# rscdel (general deleting of nice things)
-# imageadd
-# imagedel
-# maptweak
-# spellcheck (typo fixes)
-# experiment
-#################################
-
-# Your name.
-author: Yoshax
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Maps in the top mounted 9mm practice rounds, .45 practice rounds, and practice shotgun shells into the armory."
-