Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

2019-10-30 00:14:11 -05:00
parent 4d4ff4239c d249a38489
commit f8188fd22b
2 changed files with 5 additions and 1 deletions
@@ -82,7 +82,7 @@
 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)

-	user.adjustStaminaLossBuffered(getweight())//CIT CHANGE - makes attacking things cause stamina loss
+	user.adjustStaminaLossBuffered(getweight()*0.8)//CIT CHANGE - makes attacking things cause stamina loss

 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
@@ -0,0 +1,4 @@
+author: "MrJWhit"
+delete-after: True
+changes: 
+  - balance: "rebalance melee stamloss"