diff --git a/html/changelog.html b/html/changelog.html index 2f6cde5c9e6..397a5656e6d 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -63,6 +63,10 @@
  • Modular guns can now be used for turret construction.
  • Magnetic locks now properly drop from user inventory when activated.
  • +

    Scheveningen updated:

    +

    04 July 2019

    Alberyk updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 0bb47dc7069..83135e2abfe 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -8313,3 +8313,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 0 capacity. - bugfix: Modular guns can now be used for turret construction. - bugfix: Magnetic locks now properly drop from user inventory when activated. + Scheveningen: + - rscadd: Adds the mesmetron pocketwatch, a trauma plushie and the psych manual + to the chaplain's locker. Primarily intended for chaplains/counsellors/etc trying + to counsel. Power creep ahoy. diff --git a/html/changelogs/schev-unapologeticchaplainbuffs-02jul2019.yml b/html/changelogs/schev-unapologeticchaplainbuffs-02jul2019.yml deleted file mode 100644 index 989f91ce6e2..00000000000 --- a/html/changelogs/schev-unapologeticchaplainbuffs-02jul2019.yml +++ /dev/null @@ -1,41 +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 -# balance -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: Scheveningen - -# 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: "Adds the mesmetron pocketwatch, a trauma plushie and the psych manual to the chaplain's locker. Primarily intended for chaplains/counsellors/etc trying to counsel. Power creep ahoy."