diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 45ca127f13..7f1754b2bc 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -259,8 +259,9 @@
getFiles(
'html/search.js',
'html/panels.css',
- 'html/painew.png',
- 'html/loading.gif',
+ 'html/images/loading.gif',
+ 'html/images/ntlogo.png',
+ 'html/images/talisman.png',
'icons/pda_icons/pda_atmos.png',
'icons/pda_icons/pda_back.png',
'icons/pda_icons/pda_bell.png',
@@ -298,7 +299,5 @@
'icons/spideros_icons/sos_11.png',
'icons/spideros_icons/sos_12.png',
'icons/spideros_icons/sos_13.png',
- 'icons/spideros_icons/sos_14.png',
- 'html/images/ntlogo.png',
- 'html/images/talisman.png'
+ 'icons/spideros_icons/sos_14.png'
)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 00e49b659c..25c8f82701 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -101,7 +101,6 @@
/mob/living/silicon/pai/Login()
..()
- usr << browse_rsc('html/paigrid.png') // Go ahead and cache the interface resources as early as possible
// this function shows the information about being silenced as a pAI in the Status panel
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 0af4b0a235..14d53317b3 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -378,8 +378,6 @@
set name = "Changelog"
set category = "OOC"
getFiles(
- 'html/postcardsmall.jpg',
- 'html/somerights20.png',
'html/88x31.png',
'html/bug-minus.png',
'html/cross-circle.png',
diff --git a/html/80x15.png b/html/80x15.png
deleted file mode 100644
index ed028fed9d..0000000000
Binary files a/html/80x15.png and /dev/null differ
diff --git a/html/AddToChangelog.exe b/html/AddToChangelog.exe
deleted file mode 100644
index 3625bd27cc..0000000000
Binary files a/html/AddToChangelog.exe and /dev/null differ
diff --git a/html/admin_pm.html b/html/admin_pm.html
deleted file mode 100644
index 6993b21502..0000000000
--- a/html/admin_pm.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
Shittiest Player Ever - PM
-
-
-
-
- Badmin: Hey why the fuck are you killing that dude???
- Shittiest Player Ever: he tok ym baten n id and i ahd to use the lasre on his *ss
- Badmin: wow good fucking job, you are the best player ever!!!!!!
- Badmin: where the fuck did you learn english?
- Shittiest Player Ever: he tryed to k;ikll me
- Badmin: you are shit!!!!!
-
-
-
-
-
-
\ No newline at end of file
diff --git a/html/changelog.css b/html/changelog.css
index 1d2b6a6445..0637dffa67 100644
--- a/html/changelog.css
+++ b/html/changelog.css
@@ -1,36 +1,35 @@
-.top{font-family:Tahoma,sans-serif;font-size:12px;}
-h2{font-family:Tahoma,sans-serif;}
-a img {border:none;}
-.bgimages16 li {
- padding:2px 10px 2px 30px;
- background-position:6px center;
- background-repeat:no-repeat;
- border:1px solid #ddd;
- border-left:4px solid #999;
- margin-bottom:2px;
-}
-.bugfix {background-image:url(bug-minus.png)}
-.wip {background-image:url(hard-hat-exclamation.png)}
-.tweak {background-image:url(wrench-screwdriver.png)}
-.soundadd {background-image:url(music-plus.png)}
-.sounddel {background-image:url(music-minus.png)}
-.rscdel {background-image:url(cross-circle.png)}
-.rscadd {background-image:url(tick-circle.png)}
-.imageadd {background-image:url(image-plus.png)}
-.imagedel {background-image:url(image-minus.png)}
-.spellcheck {background-image:url(spell-check.png)}
-.experiment {background-image:url(burn-exclamation.png)}
-.tgs {background-image:url(tg-notif.png)}
-.sansserif {font-family:Tahoma,sans-serif;font-size:12px;}
-.commit {margin-bottom:20px;font-size:100%;font-weight:normal;}
-.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;}
-.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;}
-.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;}
-.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;}
-.hidden {display:none;}
-.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;}
-.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;}
-.indrop img {margin-right:5px;vertical-align:middle;}
-.closed {background:url(chevron-expand.png) right center no-repeat;}
-.open {background:url(chevron.png) right center no-repeat;}
+.top{font-family:Tahoma,sans-serif;font-size:12px;}
+h2{font-family:Tahoma,sans-serif;}
+a img {border:none;}
+.bgimages16 li {
+ padding:2px 10px 2px 30px;
+ background-position:6px center;
+ background-repeat:no-repeat;
+ border:1px solid #ddd;
+ border-left:4px solid #999;
+ margin-bottom:2px;
+}
+.bugfix {background-image:url(bug-minus.png)}
+.wip {background-image:url(hard-hat-exclamation.png)}
+.tweak {background-image:url(wrench-screwdriver.png)}
+.soundadd {background-image:url(music-plus.png)}
+.sounddel {background-image:url(music-minus.png)}
+.rscdel {background-image:url(cross-circle.png)}
+.rscadd {background-image:url(tick-circle.png)}
+.imageadd {background-image:url(image-plus.png)}
+.imagedel {background-image:url(image-minus.png)}
+.spellcheck {background-image:url(spell-check.png)}
+.experiment {background-image:url(burn-exclamation.png)}
+.sansserif {font-family:Tahoma,sans-serif;font-size:12px;}
+.commit {margin-bottom:20px;font-size:100%;font-weight:normal;}
+.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;}
+.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;}
+.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;}
+.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;}
+.hidden {display:none;}
+.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;}
+.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;}
+.indrop img {margin-right:5px;vertical-align:middle;}
+.closed {background:url(chevron-expand.png) right center no-repeat;}
+.open {background:url(chevron.png) right center no-repeat;}
.lic {font-size:9px;}
\ No newline at end of file
diff --git a/html/changelog.js b/html/changelog.js
index 4146d0f094..00db7fbc70 100644
--- a/html/changelog.js
+++ b/html/changelog.js
@@ -1,87 +1,87 @@
-/*
-function dropdowns() {
- var divs = document.getElementsByTagName('div');
- var headers = new Array();
- var links = new Array();
- for(var i=0;i=0) {
- elem.className = elem.className.replace('visible','hidden');
- this.className = this.className.replace('open','closed');
- }
- else {
- elem.className = elem.className.replace('hidden','visible');
- this.className = this.className.replace('closed','open');
- }
- return false;
- }
- })(links[i]);
- }
- }
-}
-*/
-/*
-function filterchanges(type){
- var lists = document.getElementsByTagName('ul');
- for(var i in lists){
- if(lists[i].className && lists[i].className.search('changes')>=0) {
- for(var j in lists[i].childNodes){
- if(lists[i].childNodes[j].nodeType == 1){
- if(!type){
- lists[i].childNodes[j].style.display = 'block';
- }
- else if(lists[i].childNodes[j].className!=type) {
- lists[i].childNodes[j].style.display = 'none';
- }
- else {
- lists[i].childNodes[j].style.display = 'block';
- }
- }
- }
- }
- }
-}
-*/
-function dropdowns() {
- var drops = $('div.drop');
- var indrops = $('div.indrop');
- if(drops.length!=indrops.length){
- alert("Some coder fucked up with dropdowns");
- }
- drops.each(function(index){
- $(this).toggleClass('closed');
- $(indrops[index]).hide();
- $(this).click(function(){
- $(this).toggleClass('closed');
- $(this).toggleClass('open');
- $(indrops[index]).toggle();
- });
- });
-}
-
-function filterchanges(type){
- $('ul.changes li').each(function(){
- if(!type || $(this).hasClass(type)){
- $(this).show();
- }
- else {
- $(this).hide();
- }
- });
-}
-
-$(document).ready(function(){
- dropdowns();
+/*
+function dropdowns() {
+ var divs = document.getElementsByTagName('div');
+ var headers = new Array();
+ var links = new Array();
+ for(var i=0;i=0) {
+ elem.className = elem.className.replace('visible','hidden');
+ this.className = this.className.replace('open','closed');
+ }
+ else {
+ elem.className = elem.className.replace('hidden','visible');
+ this.className = this.className.replace('closed','open');
+ }
+ return false;
+ }
+ })(links[i]);
+ }
+ }
+}
+*/
+/*
+function filterchanges(type){
+ var lists = document.getElementsByTagName('ul');
+ for(var i in lists){
+ if(lists[i].className && lists[i].className.search('changes')>=0) {
+ for(var j in lists[i].childNodes){
+ if(lists[i].childNodes[j].nodeType == 1){
+ if(!type){
+ lists[i].childNodes[j].style.display = 'block';
+ }
+ else if(lists[i].childNodes[j].className!=type) {
+ lists[i].childNodes[j].style.display = 'none';
+ }
+ else {
+ lists[i].childNodes[j].style.display = 'block';
+ }
+ }
+ }
+ }
+ }
+}
+*/
+function dropdowns() {
+ var drops = $('div.drop');
+ var indrops = $('div.indrop');
+ if(drops.length!=indrops.length){
+ alert("Some coder fucked up with dropdowns");
+ }
+ drops.each(function(index){
+ $(this).toggleClass('closed');
+ $(indrops[index]).hide();
+ $(this).click(function(){
+ $(this).toggleClass('closed');
+ $(this).toggleClass('open');
+ $(indrops[index]).toggle();
+ });
+ });
+}
+
+function filterchanges(type){
+ $('ul.changes li').each(function(){
+ if(!type || $(this).hasClass(type)){
+ $(this).show();
+ }
+ else {
+ $(this).hide();
+ }
+ });
+}
+
+$(document).ready(function(){
+ dropdowns();
});
\ No newline at end of file
diff --git a/html/changelogs/__CHANGELOG_README.txt b/html/changelogs/__CHANGELOG_README.txt
new file mode 100644
index 0000000000..08d3f11735
--- /dev/null
+++ b/html/changelogs/__CHANGELOG_README.txt
@@ -0,0 +1,19 @@
+Changelogs are included with commits as text .yml files created individually by the committer. If you want to create a changelog entry you create a .yml file in the /changelogs directory; nothing else needs to be touched unless you are a maintainer.
+
+#######################################################
+
+TO MAKE A CHANGELOG .YML ENTRRY
+
+1. Make a copy of the file example.yml in html/changelogs and rename it to [YOUR USERNAME]-PR-[YOUR PR NUMBER].yml (the pr and pr number are organizational and can be ignored if you so wish)
+
+2. Change the author to yourself
+
+3. Replace the changes text with a description of the changes in your PR, keep the double quotes to avoid errors (your changelog can be written ICly or OOCly, it doesn't matter)
+
+4. (Optional) set the change prefix (rscadd) to a different one listed above in example.yml (this affects what icon is used for your changelog entry)
+
+5. When commiting make sure your .yml file is included in the commit (it will usually be unticked as an unversioned file)
+
+#######################################################
+
+If you have trouble ask for help in #codershuttle on irc.sorcery.net or read https://tgstation13.org/wiki/Guide_to_Changelogs
diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml
new file mode 100644
index 0000000000..6b61a43693
--- /dev/null
+++ b/html/changelogs/example.yml
@@ -0,0 +1,36 @@
+################################
+# 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
+# spellcheck (typo fixes)
+# experiment
+#################################
+
+# Your name.
+author: N3X15
+
+# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps."
+ - rscdel: "Killed innocent kittens."
diff --git a/html/create_object.html b/html/create_object.html
index a1f115b783..f4e0aa8644 100644
--- a/html/create_object.html
+++ b/html/create_object.html
@@ -27,7 +27,7 @@
-
-
-
-
-
-
-
-
-