Merge pull request #12316 from KorPhaeron/slip

Slipping tweaks
This commit is contained in:
Cheridan
2015-10-19 14:44:28 -05:00
2 changed files with 40 additions and 2 deletions
+3 -2
View File
@@ -265,8 +265,9 @@
spawn (i)
step(C, olddir)
C.spin(1,1)
if(C.lying != oldlying) //did we actually fall?
C.adjustBruteLoss(2)
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
/turf/singularity_act()
+37
View File
@@ -0,0 +1,37 @@
################################
# 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 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"