Merge remote-tracking branch 'origin/master' into TGUI-4

code/modules/events/immovable_rod.dm

@@ -143,7 +143,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 	if(L && (L.density || prob(10)))
 		L.ex_act(EXPLODE_HEAVY)
 
-obj/effect/immovablerod/attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
+obj/effect/immovablerod/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(ishuman(user))
 		var/mob/living/carbon/human/U = user
 		if(U.job in list("Research Director"))

code/modules/events/spacevine.dm

@@ -324,7 +324,7 @@
 		damage_dealt *= 4
 	if(I.damtype == BURN)
 		damage_dealt *= 4
-
+	user.DelayNextAction()
 	for(var/datum/spacevine_mutation/SM in mutations)
 		damage_dealt = SM.on_hit(src, user, I, damage_dealt) //on_hit now takes override damage as arg and returns new value for other mutations to permutate further
 	take_damage(damage_dealt, I.damtype, "melee", 1)
@@ -345,8 +345,7 @@
 	for(var/datum/spacevine_mutation/SM in mutations)
 		SM.on_cross(src, AM)
 
-//ATTACK HAND IGNORING PARENT RETURN VALUE
-/obj/structure/spacevine/attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
+/obj/structure/spacevine/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	for(var/datum/spacevine_mutation/SM in mutations)
 		SM.on_hit(src, user)
 	user_unbuckle_mob(user, user)
@@ -356,6 +355,7 @@
 	for(var/datum/spacevine_mutation/SM in mutations)
 		SM.on_hit(src, user)
 	user_unbuckle_mob(user,user)
+	return ..()
 
 /obj/structure/spacevine/attack_alien(mob/living/user)
 	eat(user)

code/modules/events/travelling_trader.dm

@@ -60,7 +60,7 @@
 		input_speech = replacetext(input_speech, "given_item", given_item.name)
 	return input_speech
 
-/mob/living/carbon/human/dummy/travelling_trader/attack_hand(mob/living/carbon/human/H)
+/mob/living/carbon/human/dummy/travelling_trader/on_attack_hand(mob/living/carbon/human/H)
 	if(active && last_speech + 3 < world.realtime) //can only talk once per 3 seconds, to avoid spam
 		last_speech = world.realtime
 		if(initial_speech)
@@ -282,6 +282,7 @@ mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
 	..()
 
 /datum/outfit/artifact_dealer
+	name = "Artifact Dealer"
 	uniform = /obj/item/clothing/under/suit/black_really
 	shoes = /obj/item/clothing/shoes/combat
 	head = /obj/item/clothing/head/that
@@ -323,6 +324,7 @@ mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
 	reward.insert_organ(new_implant)
 
 /datum/outfit/otherworldly_surgeon
+	name = "Otherworldly Surgeon"
 	uniform = /obj/item/clothing/under/pants/white
 	shoes = /obj/item/clothing/shoes/sneakers/white
 	gloves = /obj/item/clothing/gloves/color/latex