Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nerfs force glove damage amplification to melee weapons. #5265

Closed
wants to merge 7 commits into from
Closed

nerfs force glove damage amplification to melee weapons. #5265

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc1146e
Update item_attack.dm
scheveningensun Sep 10, 2018
7bd7de3
Create scheveningen-forcegloveschange.yml
scheveningensun Sep 10, 2018
1ada0b6
undoing removal
scheveningensun Sep 11, 2018
7d549b7
damage tune down from 2.5 to 1.5
scheveningensun Sep 11, 2018
ce972b6
Update scheveningen-forcegloveschange.yml
scheveningensun Sep 11, 2018
bb4d9ae
Update highly visible and dangerous weapons.dm
scheveningensun Sep 11, 2018
2437f78
Update scheveningen-forcegloveschange.yml
scheveningensun Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions code/_onclick/item_attack.dm
View file
Open in desktop
Expand Up @@ -91,10 +91,10 @@ avoid code duplication. This includes items that may sometimes act as a standard
var/power = force
if(HULK in user.mutations)
power *= 2
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/X = user
if(X.gloves && istype(X.gloves,/obj/item/clothing/gloves/force))
var/obj/item/clothing/gloves/force/G = X.gloves
power *= G.amplification
//if(istype(user, /mob/living/carbon/human)) //Removed.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be removed properly and not just commented out.
If someone wants to restore it, they can just look up how it was previously (thanks to git)

// var/mob/living/carbon/human/X = user
// if(X.gloves && istype(X.gloves,/obj/item/clothing/gloves/force))
// var/obj/item/clothing/gloves/force/G = X.gloves
// power *= G.amplification
return target.hit_with_weapon(src, user, power, hit_zone)

37 changes: 37 additions & 0 deletions html/changelogs/scheveningen-forcegloveschange.yml
View file
Open in desktop
@@ -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
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
#################################

# 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:
- rscdel: "Force gloves no longer amplify damage with melee weapons."