From 2d1fc15fc075553a12a705aa42de41a53aea927a Mon Sep 17 00:00:00 2001
From: KorPhaeron <kortgstation@gmail.com>
Date: Sun, 11 Oct 2015 08:17:35 -0500
Subject: [PATCH 1/3] Slipping

---
 code/game/turfs/turf.dm      |  3 ++-
 html/changelogs/Kor-slip.yml | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Kor-slip.yml

diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 7a0fcc06c18..89bb8e2ed7a 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -266,7 +266,8 @@
 					step(C, olddir)
 					C.spin(1,1)
 		if(C.lying != oldlying) //did we actually fall?
-			C.adjustBruteLoss(2)
+			var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
+			C.apply_damage(5, BRUTE, dam_zone)
 		return 1
 
 /turf/singularity_act()
diff --git a/html/changelogs/Kor-slip.yml b/html/changelogs/Kor-slip.yml
new file mode 100644
index 00000000000..edfe248321d
--- /dev/null
+++ b/html/changelogs/Kor-slip.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
+#   tgs (TG-ported fixes?)
+#################################
+
+# Your name.  
+author: Kor
+
+# 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: 
+  - tweak: "Slipping now deals slightly more damage, but is concentrated on a random body part, rather than spread to your entire body."

From b3cc782b582ad27cb01892a37c05e881a340ec1b Mon Sep 17 00:00:00 2001
From: KorPhaeron <KorPhaeron@users.noreply.github.com>
Date: Sat, 17 Oct 2015 05:11:53 -0500
Subject: [PATCH 2/3] Lube only

---
 code/game/turfs/turf.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 89bb8e2ed7a..c18f5a0d8c7 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -265,7 +265,7 @@
 				spawn (i)
 					step(C, olddir)
 					C.spin(1,1)
-		if(C.lying != oldlying) //did we actually fall?
+		if(C.lying != oldlying && lube) //did we actually fall?
 			var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
 			C.apply_damage(5, BRUTE, dam_zone)
 		return 1

From bfaebc3e0b2f3ee5d9b99021812f84bb47927d4f Mon Sep 17 00:00:00 2001
From: KorPhaeron <KorPhaeron@users.noreply.github.com>
Date: Sat, 17 Oct 2015 05:12:36 -0500
Subject: [PATCH 3/3] Changelog

---
 html/changelogs/Kor-slip.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/changelogs/Kor-slip.yml b/html/changelogs/Kor-slip.yml
index edfe248321d..d3495d728a9 100644
--- a/html/changelogs/Kor-slip.yml
+++ b/html/changelogs/Kor-slip.yml
@@ -33,4 +33,5 @@ delete-after: True
 # 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: 
-  - tweak: "Slipping now deals slightly more damage, but is concentrated on a random body part, rather than spread to your entire body."
+  - tweak: "Slipping on lube now deals slightly more damage, but is concentrated on a random body part, rather than spread to your entire body."
+  - tweak: "Slipping on water no longer deals damage"