+
+
14 January 2015
+
Boggart updated:
+
+ - Adds a new spell: Repulse. (Cooldown: 40 seconds, 15 at max upgrade.) Repulse throws objects and creatures within 5 tiles of the caster away and stuns them for a very short time. Distance thrown decreases as the distance from the caster increases. (Max of 5, minimum of 3) Casting it while standing over someone will stun them for longer and cause brute damage but will not throw them.
+ - Fixes the Exosuit Control Console having the unpowered icon state while powered.
+
+
Iamgootball updated:
+
+ - Added Goonstation Chemistry!
+ - Adds 14 medicines!
+ - Adds 3 pyrotechnics!
+ - Adds 3 drugs with actual gameplay uses!
+ - Adds 7 toxins!
+ - Adds a Chemical Heater for some new recipes!
+ - Adds Chemical Patches for touch based applications!
+ - Adds a Traitor Poison Kit!
+ - Adds Morphine Medipens!
+ - Adds Morphine bottles to Cargo!
+
+
+
13 January 2015
+
Dannno updated:
+
+ - Adds a bandanas in basic colors to lockers in the station. Activate in hand to switch between head and mask modes.
+ - Adds more colored jumpsuits to the mixed locker.
+
+
Incoming5643 updated:
+
+ - Player controlled slimes can now change their face to match AI controlled slimes in kawaiiness. use *help as a slime to find the commands.
+
+
Studley updated:
+
+ - Fixed NTSL division.
+ - Added new NTSL math functions, including 'sin,' 'cos,' 'asin,' 'acos,' and 'log.'
+
+
06 January 2015
JJRcop, Nienhaus updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index efcd2c9516c..c6fe77f8dee 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2232,3 +2232,35 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2015-01-06:
JJRcop, Nienhaus:
- rscadd: Adds emoji to OOC chat.
+2015-01-13:
+ Dannno:
+ - rscadd: Adds a bandanas in basic colors to lockers in the station. Activate in
+ hand to switch between head and mask modes.
+ - rscadd: Adds more colored jumpsuits to the mixed locker.
+ Incoming5643:
+ - bugfix: Player controlled slimes can now change their face to match AI controlled
+ slimes in kawaiiness. use *help as a slime to find the commands.
+ Studley:
+ - bugfix: Fixed NTSL division.
+ - rscadd: Added new NTSL math functions, including 'sin,' 'cos,' 'asin,' 'acos,'
+ and 'log.'
+2015-01-14:
+ Boggart:
+ - rscadd: 'Adds a new spell: Repulse. (Cooldown: 40 seconds, 15 at max upgrade.)
+ Repulse throws objects and creatures within 5 tiles of the caster away and stuns
+ them for a very short time. Distance thrown decreases as the distance from the
+ caster increases. (Max of 5, minimum of 3) Casting it while standing over someone
+ will stun them for longer and cause brute damage but will not throw them.'
+ - bugfix: Fixes the Exosuit Control Console having the unpowered icon state while
+ powered.
+ Iamgootball:
+ - rscadd: Added Goonstation Chemistry!
+ - rscadd: Adds 14 medicines!
+ - rscadd: Adds 3 pyrotechnics!
+ - rscadd: Adds 3 drugs with actual gameplay uses!
+ - rscadd: Adds 7 toxins!
+ - rscadd: Adds a Chemical Heater for some new recipes!
+ - rscadd: Adds Chemical Patches for touch based applications!
+ - rscadd: Adds a Traitor Poison Kit!
+ - rscadd: Adds Morphine Medipens!
+ - rscadd: Adds Morphine bottles to Cargo!
diff --git a/html/changelogs/Cheridan.yml b/html/changelogs/Cheridan.yml
index d26cc7b9ac2..809e6fef1c4 100644
--- a/html/changelogs/Cheridan.yml
+++ b/html/changelogs/Cheridan.yml
@@ -1,2 +1,5 @@
author: Cheridan
-changes: []
+changes:
+ - tweak: "The lockbox system for R&D has been replaced with a firing pin system. Ask the Warden or HoS for firing pins to allow normal operation of your firearms. Want to test them out at the range? Try printing a test-range pin.
+ - tweak: "Nuke Ops have used this new technology to lock some of their heavier weapons so that crew cannot use them. These implants replace their explosive implants.
+ - rscadd: "Explosive implants are now purchasable in the uplink, and are much stronger."
diff --git a/html/changelogs/INCOMING5643-PR-6887.yml b/html/changelogs/INCOMING5643-PR-6887.yml
deleted file mode 100644
index 6794b5124f2..00000000000
--- a/html/changelogs/INCOMING5643-PR-6887.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Incoming5643
-
-delete-after: True
-
-changes:
- - bugfix: "Player controlled slimes can now change their face to match AI controlled slimes in kawaiiness. use *help as a slime to find the commands."
\ No newline at end of file
diff --git a/html/changelogs/Steelpoint-PR-6966.yml b/html/changelogs/Steelpoint-PR-6966.yml
new file mode 100644
index 00000000000..9af7ada7f75
--- /dev/null
+++ b/html/changelogs/Steelpoint-PR-6966.yml
@@ -0,0 +1,38 @@
+################################
+# 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
+# rscdel (general adding of nice things)
+# rscadd (general deleting of nice things)
+# imageadd
+# imagedel
+# spellcheck (typo fixes)
+# experiment
+# tgs (TG-ported fixes?)
+#################################
+
+# Your name.
+author: Steelpoint
+
+# 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 single (') or 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: "The Emergency Response Team project has been activated by Nanotrasen. The ERT are a seven man squad that can be deployed by the Central Command (admins) to attempt to rescue the station from a overwhelming threat, or to render assistance in dealing with a significant problem."
+ - rscadd: "The ERT consists of a single Commander, two Security Officers, two Engineering Officers and two Medical Officers. The Commander is preselected when the squad is being spawned in, however the remaining six officers are free to select their role in the squad."
+ - rscadd: "Two new Pulse gun variants have been added to the game. They are the Pulse Carbine and the Pulse Pistol, both have significantly smaller ammunition capacities than the Pulse Rifle, however they both can fit in a backpack and the pistol can fit in a pocket. All ERT Officers have a Pulse Pistol for a sidearm, however the Security Officers get a Pulse Carbine as their primary longarm."
diff --git a/html/changelogs/Studley.yml b/html/changelogs/Studley.yml
deleted file mode 100644
index 03f2481434c..00000000000
--- a/html/changelogs/Studley.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Studley
-delete-after: True
-changes:
- - bugfix: "Fixed NTSL division."
- - rscadd: "Added new NTSL math functions, including 'sin,' 'cos,' 'asin,' 'acos,' and 'log.'"
diff --git a/html/changelogs/phil235 - LibraryComputer.yml b/html/changelogs/phil235 - LibraryComputer.yml
new file mode 100644
index 00000000000..c90c604a43f
--- /dev/null
+++ b/html/changelogs/phil235 - LibraryComputer.yml
@@ -0,0 +1,7 @@
+author: phil235
+delete-after: True
+
+
+changes:
+
+ - rscadd: "The two library consoles are now real buildable computers. The circuitboard design is available in R&D."
\ No newline at end of file
diff --git a/icons/mecha/mech_construct.dmi b/icons/mecha/mech_construct.dmi
index 7f275a113f5..6d48367f2a3 100644
Binary files a/icons/mecha/mech_construct.dmi and b/icons/mecha/mech_construct.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index b10bcfce92b..5c3f4f14fa1 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index b532ceacfdb..111bdc0b9bd 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 371d18c3e6e..c0b2de054c7 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index af5e4e68ac5..382ea940eaf 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 24f9048fc45..7e6dcb6a65d 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 1dc7469059e..ccd6cd42102 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 6a5fbe0e916..1767a121202 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi
index b97f74ca676..4a7846286da 100644
Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 819d09b6313..b359a653969 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 04fb1cbd3bb..ddd3ba2a812 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index ac7af348b0f..166062cd3be 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index f51e7402e03..a1610b9e284 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index eb8b0429b53..a0ecfa42024 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1241,6 +1241,7 @@
#include "code\modules\projectiles\ammunition.dm"
#include "code\modules\projectiles\firing.dm"
#include "code\modules\projectiles\gun.dm"
+#include "code\modules\projectiles\pins.dm"
#include "code\modules\projectiles\projectile.dm"
#include "code\modules\projectiles\ammunition\ammo_casings.dm"
#include "code\modules\projectiles\ammunition\boxes.dm"
@@ -1269,6 +1270,12 @@
#include "code\modules\projectiles\projectile\magic.dm"
#include "code\modules\projectiles\projectile\special.dm"
#include "code\modules\reagents\Chemistry-Colours.dm"
+#include "code\modules\reagents\Chemistry-Goon-420BlazeIt.dm"
+#include "code\modules\reagents\Chemistry-Goon-Medicine.dm"
+#include "code\modules\reagents\Chemistry-Goon-Other.dm"
+#include "code\modules\reagents\Chemistry-Goon-Pyrotechnics.dm"
+#include "code\modules\reagents\Chemistry-Goon-Readme.dm"
+#include "code\modules\reagents\Chemistry-Goon-Toxins.dm"
#include "code\modules\reagents\Chemistry-Holder.dm"
#include "code\modules\reagents\Chemistry-Machinery.dm"
#include "code\modules\reagents\Chemistry-Readme.dm"
@@ -1288,6 +1295,7 @@
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
+#include "code\modules\reagents\reagent_containers\patch.dm"
#include "code\modules\reagents\reagent_containers\pill.dm"
#include "code\modules\reagents\reagent_containers\spray.dm"
#include "code\modules\reagents\reagent_containers\syringes.dm"