Merge pull request #4796 from Anewbe/charger_radiation

Cyborg charger lessens FBP radiation.

code/game/machinery/rechargestation.dm

@@ -105,16 +105,25 @@
 		var/mob/living/carbon/human/H = occupant
 
 		// In case they somehow end up with positive values for otherwise unobtainable damage...
-		if(H.getToxLoss()>0)   H.adjustToxLoss(-(rand(1,3)))
+		if(H.getToxLoss() > 0)
-		if(H.getOxyLoss()>0)   H.adjustOxyLoss(-(rand(1,3)))
+			H.adjustToxLoss(-(rand(1,3)))
-		if(H.getCloneLoss()>0) H.adjustCloneLoss(-(rand(1,3)))
+		if(H.getOxyLoss() > 0)
-		if(H.getBrainLoss()>0) H.adjustBrainLoss(-(rand(1,3)))
+			H.adjustOxyLoss(-(rand(1,3)))
+		if(H.getCloneLoss() > 0)
+			H.adjustCloneLoss(-(rand(1,3)))
+		if(H.getBrainLoss() > 0)
+			H.adjustBrainLoss(-(rand(1,3)))
 
 		// Also recharge their internal battery.
 		if(!isnull(H.internal_organs_by_name["cell"]) && H.nutrition < 450)
 			H.nutrition = min(H.nutrition+10, 450)
 			cell.use(7000/450*10)
 
+		// And clear up radiation
+		if(H.radiation > 0)
+			H.radiation = max(H.radiation - rand(5, 15), 0)
+
+
 /obj/machinery/recharge_station/examine(mob/user)
 	..(user)
 	user << "The charge meter reads: [round(chargepercentage())]%"

html/changelogs/Anewbe- Various.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
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Anewbe
+
+# 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: 
+  - rscadd: "Cyborg Chargers now decrease radiation on FBPs."
+  - tweak: "Falling one floor now does a lot less damage, on average."
+  - bugfix: "Falling one floor in a Mech no longer hurts the occupant."