upstream pull changes

code/datums/tutorial/ss13/intents.dm

@@ -51,7 +51,7 @@
 	UnregisterSignal(tutorial_mob, COMSIG_LIVING_ATTACKHAND_HUMAN)
 	TUTORIAL_ATOM_FROM_TRACKING(/mob/living/carbon/human/dummy/tutorial, tutorial_dummy)
 	tutorial_dummy.status_flags = DEFAULT_MOB_STATUS_FLAGS
-	tutorial_dummy.frozen = FALSE
+	REMOVE_TRAIT(tutorial_dummy, TRAIT_IMMOBILIZED, TRAIT_SOURCE_TUTORIAL)
 	tutorial_dummy.anchored = FALSE
 
 	message_to_player("The second intent is <b>disarm</b>, selectable with <b>2</b>. Disarm is used to shove people, which can make them drop items or fall to the ground. Shove the <b>Test Dummy</b> until it falls over.")

code/game/machinery/vending/cm_vending.dm

@@ -1178,10 +1178,10 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list(
 		if(islist(prod_type))
 			for(var/each_type in prod_type)
 				vendor_successful_vend_one(each_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM)
-				SEND_SIGNAL(vendor, COMSIG_VENDOR_SUCCESSFUL_VEND, vendor, itemspec, user)
+				SEND_SIGNAL(src, COMSIG_VENDOR_SUCCESSFUL_VEND, src, itemspec, user)
 		else
 			vendor_successful_vend_one(prod_type, user, target_turf, itemspec[4] == MARINE_CAN_BUY_UNIFORM)
-			SEND_SIGNAL(vendor, COMSIG_VENDOR_SUCCESSFUL_VEND, vendor, itemspec, user)
+			SEND_SIGNAL(src, COMSIG_VENDOR_SUCCESSFUL_VEND, src, itemspec, user)
 
 		if(vend_flags & VEND_LIMITED_INVENTORY)
 			itemspec[2]--

code/modules/mob/living/carbon/human/human_dummy.dm

@@ -80,5 +80,5 @@ GLOBAL_LIST_EMPTY(dummy_mob_list)
 /mob/living/carbon/human/dummy/tutorial/Initialize(mapload)
 	. = ..()
 	status_flags = GODMODE
-	frozen = TRUE
+	ADD_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_SOURCE_TUTORIAL)
 	anchored = TRUE