From c0b2b24e424d48c787eed955e0d856b5dad033e6 Mon Sep 17 00:00:00 2001
From: lavillastrangiato <63124803+lavillastrangiato@users.noreply.github.com>
Date: Fri, 15 Dec 2023 01:39:48 -0700
Subject: [PATCH] Nerfs Punji Trap Damage and Fertilizer Injection (#17936)

* b

* salt pr for tol

* them changes(logs)

* json setting fix

* a quick edit
---
 .vscode/settings.json                         |  2 +-
 code/game/objects/items/weapons/traps.dm      |  5 +--
 .../changelogs/Lavillastrangiato - saltpr.yml | 41 +++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/Lavillastrangiato - saltpr.yml

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d523b4efb27..f0b8888fb92 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,7 +9,7 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "true"
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
diff --git a/code/game/objects/items/weapons/traps.dm b/code/game/objects/items/weapons/traps.dm
index f20e1dc2490..929fbd88f44 100644
--- a/code/game/objects/items/weapons/traps.dm
+++ b/code/game/objects/items/weapons/traps.dm
@@ -753,7 +753,7 @@
 		target_zone = pick(BP_L_FOOT, BP_R_FOOT, BP_L_LEG, BP_R_LEG)
 
 	//Try to apply the damage
-	var/success = L.apply_damage(60, DAMAGE_BRUTE, target_zone, used_weapon = src, armor_pen = activated_armor_penetration)
+	var/success = L.apply_damage(50, DAMAGE_BRUTE, target_zone, used_weapon = src, armor_pen = activated_armor_penetration)
 
 	//If successfully applied, give the message
 	if(success)
@@ -785,9 +785,6 @@
 
 			organ.germ_level += INFECTION_LEVEL_THREE
 
-			//Add some fertilizer to poison the target whole, not only the external organ (leg/foot)
-			L.reagents.add_reagent(/singleton/reagent/toxin/fertilizer, 10)
-
 /obj/item/trap/punji/proc/reveal_message(mob/living/victim)
 	if(!message)
 		return
diff --git a/html/changelogs/Lavillastrangiato - saltpr.yml b/html/changelogs/Lavillastrangiato - saltpr.yml
new file mode 100644
index 00000000000..95a1314b27a
--- /dev/null
+++ b/html/changelogs/Lavillastrangiato - saltpr.yml	
@@ -0,0 +1,41 @@
+################################
+# 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
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Lavillastrangiato
+
+# 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:
+  - balance: "Gets rid of fertilizer injection and slightly lowers damage on punji traps."