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

2020-06-23 03:12:49 +02:00
parent a7934f3f88 a0a4007332
commit ae053a9a08
736 changed files with 240884 additions and 242590 deletions
@@ -330,8 +330,8 @@
 	if(!override)
 		qdel(src)

-/obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user)
-	var/damage_dealt = I.force
+/obj/structure/spacevine/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
+	var/damage_dealt = I.force * damage_multiplier
 	if(I.get_sharpness())
 		damage_dealt *= 4
 	if(I.damtype == BURN)